build: Reuse IMAGE_OS instead of hard-coded linux (argoproj#4519)

Signed-off-by: terrytangyuan <[email protected]>

Dockerfile

@@ -34,9 +34,9 @@ ENV DOCKER_VERSION 18.09.1
 RUN if [ "${IMAGE_OS}" = "linux" ]; then \
  export IMAGE_ARCH=`uname -m`; \
  if [ "${IMAGE_ARCH}" = "ppc64le" ] ||[ "${IMAGE_ARCH}" = "s390x" ]; then \
- wget -O docker.tgz https://download.docker.com/linux/static/${DOCKER_CHANNEL}/${IMAGE_ARCH}/docker-18.06.3-ce.tgz; \
+ wget -O docker.tgz https://download.docker.com/${IMAGE_OS}/static/${DOCKER_CHANNEL}/${IMAGE_ARCH}/docker-18.06.3-ce.tgz; \
  else \
- wget -O docker.tgz https://download.docker.com/linux/static/${DOCKER_CHANNEL}/${IMAGE_ARCH}/docker-${DOCKER_VERSION}.tgz; \
+ wget -O docker.tgz https://download.docker.com/${IMAGE_OS}/static/${DOCKER_CHANNEL}/${IMAGE_ARCH}/docker-${DOCKER_VERSION}.tgz; \
  fi \
  fi && \
  tar --extract --file docker.tgz --strip-components 1 --directory /usr/local/bin/ && \
@@ -66,7 +66,7 @@ RUN apt-get update && \
 
 ADD hack/recurl.sh .
 ADD hack/image_arch.sh .
-RUN . ./image_arch.sh && ./recurl.sh /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/${IMAGE_ARCH}/kubectl
+RUN . ./image_arch.sh && ./recurl.sh /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/${IMAGE_OS}/${IMAGE_ARCH}/kubectl
 RUN ./recurl.sh /usr/local/bin/jq https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64
 RUN rm recurl.sh
 
@@ -98,27 +98,27 @@ COPY . .
 RUN git rev-parse HEAD
 
 # controller image
-RUN . hack/image_arch.sh && make dist/workflow-controller-linux-${IMAGE_ARCH}
-RUN . hack/image_arch.sh && ./dist/workflow-controller-linux-${IMAGE_ARCH} version | grep clean
+RUN . hack/image_arch.sh && make dist/workflow-controller-${IMAGE_OS}-${IMAGE_ARCH}
+RUN . hack/image_arch.sh && ./dist/workflow-controller-${IMAGE_OS}-${IMAGE_ARCH} version | grep clean
 
 # executor image
-RUN . hack/image_arch.sh && make dist/argoexec-linux-${IMAGE_ARCH}
-RUN . hack/image_arch.sh && ./dist/argoexec-linux-${IMAGE_ARCH} version | grep clean
+RUN . hack/image_arch.sh && make dist/argoexec-${IMAGE_OS}-${IMAGE_ARCH}
+RUN . hack/image_arch.sh && ./dist/argoexec-${IMAGE_OS}-${IMAGE_ARCH} version | grep clean
 
 # cli image
 RUN mkdir -p ui/dist
 COPY --from=argo-ui ui/dist/app ui/dist/app
 # stop make from trying to re-build this without yarn installed
 RUN touch ui/dist/node_modules.marker
 RUN touch ui/dist/app/index.html
-RUN . hack/image_arch.sh && make argo-server.crt argo-server.key dist/argo-linux-${IMAGE_ARCH}
-RUN . hack/image_arch.sh && ./dist/argo-linux-${IMAGE_ARCH} version 2>&1 | grep clean
+RUN . hack/image_arch.sh && make argo-server.crt argo-server.key dist/argo-${IMAGE_OS}-${IMAGE_ARCH}
+RUN . hack/image_arch.sh && ./dist/argo-${IMAGE_OS}-${IMAGE_ARCH} version 2>&1 | grep clean
 
 ####################################################################################################
 # argoexec
 ####################################################################################################
 FROM argoexec-base as argoexec
-COPY --from=argo-build /go/src/github.com/argoproj/argo/dist/argoexec-linux-* /usr/local/bin/argoexec
+COPY --from=argo-build /go/src/github.com/argoproj/argo/dist/argoexec-${IMAGE_OS}-* /usr/local/bin/argoexec
 ENTRYPOINT [ "argoexec" ]
 
 ####################################################################################################
@@ -128,7 +128,7 @@ FROM scratch as workflow-controller
 USER 8737
 # Add timezone data
 COPY --from=argo-build /usr/share/zoneinfo /usr/share/zoneinfo
-COPY --from=argo-build /go/src/github.com/argoproj/argo/dist/workflow-controller-linux-* /bin/workflow-controller
+COPY --from=argo-build /go/src/github.com/argoproj/argo/dist/workflow-controller-${IMAGE_OS}-* /bin/workflow-controller
 ENTRYPOINT [ "workflow-controller" ]
 
 ####################################################################################################
@@ -141,5 +141,5 @@ COPY --from=argoexec-base /etc/nsswitch.conf /etc/nsswitch.conf
 COPY --from=argoexec-base /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=argo-build /go/src/github.com/argoproj/argo/argo-server.crt argo-server.crt
 COPY --from=argo-build /go/src/github.com/argoproj/argo/argo-server.key argo-server.key
-COPY --from=argo-build /go/src/github.com/argoproj/argo/dist/argo-linux-* /bin/argo
+COPY --from=argo-build /go/src/github.com/argoproj/argo/dist/argo-${IMAGE_OS}-* /bin/argo
 ENTRYPOINT [ "argo" ]