Fix build kite docker build (cadence-workflow#2478)

* Fix docker userns remapping issue, i.e. `Container ID cannot be mapped to a host ID` * Fix docker cli build
gaecom · Aug 29, 2019 · 05b4197 · 05b4197
1 parent b01d8a9
commit 05b4197
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -29,8 +29,9 @@ RUN apk add --no-cache openssl
 ENV DOCKERIZE_VERSION v0.6.1
 RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
-
+    && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+    && echo "**** fix for host id mapping error ****" \
+    && chown root:root /usr/local/bin/dockerize
 
 # Alpine base image
 FROM alpine:3.10 AS alpine

diff --git a/scripts/buildkite/docker-push.sh b/scripts/buildkite/docker-push.sh
@@ -26,5 +26,5 @@ docker push ubercadence/server:master
 docker build . -f Dockerfile -t ubercadence/server:master-auto-setup --build-arg TARGET=auto-setup
 docker push ubercadence/server:master-auto-setup
 
-docker build . -f Dockerfile-cli -t ubercadence/cli:master --build-arg TARGET=cli
+docker build . -f Dockerfile -t ubercadence/cli:master --build-arg TARGET=cli
 docker push ubercadence/cli:master