nice bug in docker: moby/moby#34129 :(

solosTec · Aug 8, 2020 · 12b9ba7 · 12b9ba7
1 parent 5d6b3af
commit 12b9ba7
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 17 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -160,7 +160,7 @@ jobs:
           steps:
             - checkout
             - run: echo "$DOCKER_PASSWORD" | docker login --username $DOCKER_USERNAME --password-stdin
-            - run: cd master && docker build . -t seemann/master:<<pipeline.parameters.branch>> --build-arg BASE_TAG=<<pipeline.parameters.branch>> --build-arg BRANCH=<<pipeline.parameters.branch>>
+            - run: cd master && docker build . -t seemann/master:<<pipeline.parameters.branch>> --build-arg BASE_TAG=<<pipeline.parameters.branch>>
             - run: docker push seemann/master:<<pipeline.parameters.branch>>
 
 workflows:

diff --git a/crypto/Dockerfile b/crypto/Dockerfile
@@ -1,8 +1,8 @@
 ARG BASE_TAG
-ARG BRANCH
-
 FROM seemann/cyng:${BASE_TAG} AS build
 
+ARG BRANCH
+
 WORKDIR /src
 
 RUN git clone https://github.com/solosTec/crypto

diff --git a/cyng/Dockerfile b/cyng/Dockerfile
@@ -1,15 +1,15 @@
 ARG BASE_TAG
-ARG BRANCH
-
 FROM seemann/cpp-build-base:${BASE_TAG} AS build
 
+ARG BRANCH
+
 WORKDIR /src
 
 RUN git clone https://github.com/solosTec/cyng && cd cyng
 
 WORKDIR /src/cyng
 
-RUN git checkout '${BRANCH}'
+RUN git checkout ${BRANCH}
 
 RUN git submodule update --init --recursive
 

diff --git a/master/Dockerfile b/master/Dockerfile
@@ -1,6 +1,4 @@
 ARG BASE_TAG
-ARG BRANCH
-
 FROM seemann/node:${BASE_TAG} AS build
 
 FROM ubuntu:bionic

diff --git a/node/Dockerfile b/node/Dockerfile
@@ -1,8 +1,8 @@
 ARG BASE_TAG
-ARG BRANCH
-
 FROM seemann/crypto:${BASE_TAG} AS build
 
+ARG BRANCH
+
 WORKDIR /src
 
 RUN git clone https://github.com/solosTec/node && cd node

diff --git a/oecp-crypto/Dockerfile b/oecp-crypto/Dockerfile
@@ -1,8 +1,8 @@
 ARG BASE_TAG
-ARG BRANCH
-
 FROM seemann/oecp-cyng:${BASE_TAG} AS build
 
+ARG BRANCH
+
 WORKDIR /src
 
 RUN git clone https://github.com/solosTec/crypto

diff --git a/oecp-cyng/Dockerfile b/oecp-cyng/Dockerfile
@@ -1,15 +1,15 @@
 ARG BASE_TAG
-ARG BRANCH
-
 FROM seemann/oecp-base:${BASE_TAG} AS build
 
+ARG BRANCH
+
 WORKDIR /src
 
 RUN git clone https://github.com/solosTec/cyng
 
 WORKDIR /src/cyng
 
-RUN git checkout '${BRANCH}'
+RUN git checkout ${BRANCH}
 
 RUN git submodule update --init --recursive
 

diff --git a/oecp-node/Dockerfile b/oecp-node/Dockerfile
@@ -1,8 +1,8 @@
 ARG BASE_TAG
-ARG BRANCH
-
 FROM seemann/oecp-crypto:${BASE_TAG} AS build
 
+ARG BRANCH
+
 WORKDIR /src
 
 RUN git clone https://github.com/solosTec/node