Skip to content

Commit

Permalink
Merge pull request #2533 from mansikulkarni96/WINC-1352
Browse files Browse the repository at this point in the history 
WINC-1352: Build CNI plugins with CGO_ENABLED
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Nov 19, 2024
2 parents 852418f + 2d793f8 commit 0ceb106
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
3 changes: 1 addition & 2 deletions build/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ RUN env -u VERSION GOOS=windows make ecr-credential-provider
# Build CNI plugins
WORKDIR /build/windows-machine-config-operator/containernetworking-plugins/
COPY containernetworking-plugins/ .
ENV CGO_ENABLED=0
RUN ./build_windows.sh
RUN CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc ./build_windows.sh

# Build csi-proxy
WORKDIR /build/windows-machine-config-operator/csi-proxy
Expand Down
3 changes: 1 addition & 2 deletions build/Dockerfile.base
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ RUN env -u VERSION GOOS=windows make ecr-credential-provider
# Build CNI plugins
WORKDIR /build/windows-machine-config-operator/containernetworking-plugins/
COPY containernetworking-plugins/ .
ENV CGO_ENABLED=0
RUN ./build_windows.sh
RUN CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc ./build_windows.sh

# Build csi-proxy
WORKDIR /build/windows-machine-config-operator/csi-proxy
Expand Down
3 changes: 1 addition & 2 deletions build/Dockerfile.ci
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ RUN env -u VERSION GOOS=windows make ecr-credential-provider
# Build CNI plugins
WORKDIR /build/windows-machine-config-operator/containernetworking-plugins/
COPY containernetworking-plugins/ .
ENV CGO_ENABLED=0
RUN ./build_windows.sh
RUN CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc ./build_windows.sh

# Build csi-proxy
WORKDIR /build/windows-machine-config-operator/csi-proxy
Expand Down
3 changes: 1 addition & 2 deletions build/Dockerfile.konflux
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ RUN env -u VERSION GOOS=windows make ecr-credential-provider
# Build CNI plugins
WORKDIR /build/windows-machine-config-operator/containernetworking-plugins/
COPY containernetworking-plugins/ .
ENV CGO_ENABLED=0
RUN ./build_windows.sh
RUN CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc ./build_windows.sh

# Build csi-proxy
WORKDIR /build/windows-machine-config-operator/csi-proxy
Expand Down

0 comments on commit 0ceb106

Please sign in to comment.