Skip to content

[build] Use golang 1.13 for builder #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aravindhp merged 1 commit into from
Feb 27, 2020
Merged

[build] Use golang 1.13 for builder #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
# build stage for building binaries
FROM registry.access.redhat.com/ubi8/go-toolset:1.12.8-32 as build
FROM golang:1.13.8 as build
LABEL stage=build

# Build WMCB
# WORKDIR is not resulting in creating this directory, so we are forcing it to happen. The image does not allow us to
# create /build/, forcing us to use $HOME which is /opt/app-root/src/
RUN mkdir $HOME/build/
WORKDIR $HOME/build/
RUN mkdir /build/
WORKDIR /build/
RUN git clone https://github.com/openshift/windows-machine-config-bootstrapper.git
WORKDIR windows-machine-config-bootstrapper
RUN make build

# Build hybrid-overlay
WORKDIR $HOME/build/
WORKDIR /build/
RUN git clone https://github.com/openshift/ovn-kubernetes/
WORKDIR ovn-kubernetes/go-controller/
RUN make windows
Expand Down Expand Up @@ -56,10 +54,10 @@ LABEL stage=operator

# Copy wmcb.exe
WORKDIR /payload/
COPY --from=build /opt/app-root/src/build/windows-machine-config-bootstrapper/wmcb.exe .
COPY --from=build /build/windows-machine-config-bootstrapper/wmcb.exe .

# Copy hybrid-overlay.exe
COPY --from=build /opt/app-root/src/build/ovn-kubernetes/go-controller/_output/go/bin/windows/hybrid-overlay.exe .
COPY --from=build /build/ovn-kubernetes/go-controller/_output/go/bin/windows/hybrid-overlay.exe .

# Copy kubelet.exe and kube-proxy.exe
WORKDIR /payload/kube-node/
Expand Down
14 changes: 6 additions & 8 deletions build/Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,19 @@
# NOTE: RUN mkdir <dir> is being used in cases where a directory needs to be created as CI image builds does not seem to
# be creating the directory as a result of the WORKDIR directive.
# build stage for building binaries
FROM registry.access.redhat.com/ubi8/go-toolset:1.12.8-32 as build
FROM golang:1.13.8 as build
LABEL stage=build

# Build WMCB
# WORKDIR is not resulting in creating this directory, so we are forcing it to happen. The image does not allow us to
# create /build/, forcing us to use $HOME which is /opt/app-root/src/
RUN mkdir $HOME/build/
WORKDIR $HOME/build/
RUN mkdir /build/
WORKDIR /build/
# Pin this to a release branch once branching has ocurred and master is no longer fast forwarded.
RUN git clone https://github.com/openshift/windows-machine-config-bootstrapper.git
WORKDIR windows-machine-config-bootstrapper
RUN make build

# Build hybrid-overlay
WORKDIR $HOME/build/
WORKDIR /build/
RUN git clone https://github.com/openshift/ovn-kubernetes/
WORKDIR ovn-kubernetes/go-controller/
RUN make windows
Expand Down Expand Up @@ -70,10 +68,10 @@ LABEL stage=operator
# Copy wmcb.exe
RUN mkdir /payload/
WORKDIR /payload/
COPY --from=build /opt/app-root/src/build/windows-machine-config-bootstrapper/wmcb.exe .
COPY --from=build /build/windows-machine-config-bootstrapper/wmcb.exe .

# Copy hybrid-overlay.exe
COPY --from=build /opt/app-root/src/build/ovn-kubernetes/go-controller/_output/go/bin/windows/hybrid-overlay.exe .
COPY --from=build /build/ovn-kubernetes/go-controller/_output/go/bin/windows/hybrid-overlay.exe .

# Copy kubelet.exe and kube-proxy.exe
RUN mkdir /payload/kube-node/
Expand Down