plain progress. tag during build

BallAerospace · Apr 28, 2022 · 6dbe7ed · 6dbe7ed
1 parent a5f7bf2
commit 6dbe7ed
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 7 deletions.
diff --git a/compose-build.yaml b/compose-build.yaml
@@ -38,6 +38,7 @@ services:
       network: host
       args:
         COSMOS_REGISTRY: ${COSMOS_REGISTRY}
+        COSMOS_TAG: ${COSMOS_TAG}
     image: "${COSMOS_REGISTRY}/ballaerospace/cosmosc2-node:${COSMOS_TAG}"
     depends_on:
       - "cosmos-ruby"
@@ -48,6 +49,7 @@ services:
       network: host
       args:
         COSMOS_REGISTRY: ${COSMOS_REGISTRY}
+        COSMOS_TAG: ${COSMOS_TAG}
     image: "${COSMOS_REGISTRY}/ballaerospace/cosmosc2-base:${COSMOS_TAG}"
     depends_on:
       - "cosmos-ruby"
@@ -72,6 +74,7 @@ services:
       network: host
       args:
         COSMOS_REGISTRY: ${COSMOS_REGISTRY}
+        COSMOS_TAG: ${COSMOS_TAG}
     depends_on:
       - "cosmos-base"
 
@@ -81,6 +84,7 @@ services:
       network: host
       args:
         COSMOS_REGISTRY: ${COSMOS_REGISTRY}
+        COSMOS_TAG: ${COSMOS_TAG}
     depends_on:
       - "cosmos-base"
 
@@ -90,6 +94,7 @@ services:
       network: host
       args:
         COSMOS_REGISTRY: ${COSMOS_REGISTRY}
+        COSMOS_TAG: ${COSMOS_TAG}
     depends_on:
       - "cosmos-base"
 
@@ -107,6 +112,7 @@ services:
       args:
         NPM_URL: ${NPM_URL}
         COSMOS_REGISTRY: ${COSMOS_REGISTRY}
+        COSMOS_TAG: ${COSMOS_TAG}
     depends_on:
       - "cosmos-node"
       - "cosmos-base"
diff --git a/cosmos-cmd-tlm-api/Dockerfile b/cosmos-cmd-tlm-api/Dockerfile
@@ -1,6 +1,7 @@
 ARG COSMOS_REGISTRY=docker.io
+ARG COSMOS_TAG=latest
 
-FROM ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-base
+FROM ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-base:${COSMOS_TAG}
 
 WORKDIR /src/
 COPY Gemfile ./

diff --git a/cosmos-init/Dockerfile b/cosmos-init/Dockerfile
@@ -1,6 +1,7 @@
 ARG COSMOS_REGISTRY=docker.io
+ARG COSMOS_TAG=latest
 
-FROM ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-node AS cosmos-frontend-tmp
+FROM ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-node:${COSMOS_TAG} AS cosmos-frontend-tmp
 
 WORKDIR /cosmos/plugins/
 
@@ -99,7 +100,7 @@ COPY --from=cosmos-tmp2 /cosmos/plugins/gems/* /cosmos/plugins/gems/
 COPY --from=cosmos-tmp3 /cosmos/plugins/gems/* /cosmos/plugins/gems/
 COPY --from=cosmos-tmp4 /cosmos/plugins/gems/* /cosmos/plugins/gems/
 
-FROM ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-base
+FROM ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-base:${COSMOS_TAG}
 
 COPY --from=cosmos-frontend-base-tmp --chown=${IMAGE_USER}:${IMAGE_GROUP} /cosmos/plugins/gems/* /cosmos/plugins/gems/
 COPY --chown=${IMAGE_USER}:${IMAGE_GROUP} ./init.sh /cosmos/

diff --git a/cosmos-node/Dockerfile b/cosmos-node/Dockerfile
@@ -1,6 +1,7 @@
 ARG COSMOS_REGISTRY=docker.io
+ARG COSMOS_TAG=latest
 
-FROM ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-ruby
+FROM ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-ruby:${COSMOS_TAG}
 
 USER root
 

diff --git a/cosmos-operator/Dockerfile b/cosmos-operator/Dockerfile
@@ -1,6 +1,7 @@
 ARG COSMOS_REGISTRY=docker.io
+ARG COSMOS_TAG=latest
 
-FROM ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-base
+FROM ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-base:${COSMOS_TAG}
 
 WORKDIR /cosmos/lib/cosmos/operators/
 

diff --git a/cosmos-script-runner-api/Dockerfile b/cosmos-script-runner-api/Dockerfile
@@ -1,6 +1,7 @@
 ARG COSMOS_REGISTRY=docker.io
+ARG COSMOS_TAG=latest
 
-FROM ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-base
+FROM ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-base:${COSMOS_TAG}
 
 WORKDIR /src/
 COPY Gemfile ./

diff --git a/cosmos/Dockerfile b/cosmos/Dockerfile
@@ -1,6 +1,7 @@
 ARG COSMOS_REGISTRY=docker.io
+ARG COSMOS_TAG=latest
 
-FROM ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-ruby
+FROM ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-ruby:${COSMOS_TAG}
 
 WORKDIR /cosmos/
 

diff --git a/scripts/release/build_multi_arch.sh b/scripts/release/build_multi_arch.sh
@@ -25,6 +25,7 @@ fi
 cd cosmos-ruby
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --build-arg ALPINE_VERSION=${ALPINE_VERSION} \
   --build-arg ALPINE_BUILD=${ALPINE_BUILD} \
   --build-arg APK_URL=${APK_URL} \
@@ -35,6 +36,7 @@ if [ $COSMOS_UPDATE_LATEST = true ]
 then
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --build-arg ALPINE_VERSION=${ALPINE_VERSION} \
   --build-arg ALPINE_BUILD=${ALPINE_BUILD} \
   --build-arg APK_URL=${APK_URL} \
@@ -45,124 +47,154 @@ fi
 cd ../cosmos-node
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --build-arg COSMOS_REGISTRY=${COSMOS_REGISTRY} \
+  --build-arg COSMOS_TAG=${COSMOS_RELEASE_VERSION} \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-node:${COSMOS_RELEASE_VERSION} .
 
 if [ $COSMOS_UPDATE_LATEST = true ]
 then
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --build-arg COSMOS_REGISTRY=${COSMOS_REGISTRY} \
+  --build-arg COSMOS_TAG=${COSMOS_RELEASE_VERSION} \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-node:latest .
 fi
 
 cd ../cosmos
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --build-arg COSMOS_REGISTRY=${COSMOS_REGISTRY} \
+  --build-arg COSMOS_TAG=${COSMOS_RELEASE_VERSION} \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-base:${COSMOS_RELEASE_VERSION} .
 
 if [ $COSMOS_UPDATE_LATEST = true ]
 then
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --build-arg COSMOS_REGISTRY=${COSMOS_REGISTRY} \
+  --build-arg COSMOS_TAG=${COSMOS_RELEASE_VERSION} \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-base:latest .
 fi
 
 # Note: Missing COSMOS_REGISTRY build-arg intentionally to default to docker.io
 cd ../cosmos-minio-init
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-minio-init:${COSMOS_RELEASE_VERSION} .
 
 if [ $COSMOS_UPDATE_LATEST = true ]
 then
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-minio-init:latest .
 fi
 
 # Note: Missing COSMOS_REGISTRY build-arg intentionally to default to docker.io
 cd ../cosmos-redis
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-redis:${COSMOS_RELEASE_VERSION} .
 
 if [ $COSMOS_UPDATE_LATEST = true ]
 then
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-redis:latest .
 fi
 
 cd ../cosmos-cmd-tlm-api
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --build-arg COSMOS_REGISTRY=${COSMOS_REGISTRY} \
+  --build-arg COSMOS_TAG=${COSMOS_RELEASE_VERSION} \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-cmd-tlm-api:${COSMOS_RELEASE_VERSION} .
 
 if [ $COSMOS_UPDATE_LATEST = true ]
 then
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --build-arg COSMOS_REGISTRY=${COSMOS_REGISTRY} \
+  --build-arg COSMOS_TAG=${COSMOS_RELEASE_VERSION} \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-cmd-tlm-api:latest .
 fi
 
 cd ../cosmos-script-runner-api
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --build-arg COSMOS_REGISTRY=${COSMOS_REGISTRY} \
+  --build-arg COSMOS_TAG=${COSMOS_RELEASE_VERSION} \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-script-runner-api:${COSMOS_RELEASE_VERSION} .
 
 if [ $COSMOS_UPDATE_LATEST = true ]
 then
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --build-arg COSMOS_REGISTRY=${COSMOS_REGISTRY} \
+  --build-arg COSMOS_TAG=${COSMOS_RELEASE_VERSION} \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-script-runner-api:latest .
 fi
 
 cd ../cosmos-operator
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --build-arg COSMOS_REGISTRY=${COSMOS_REGISTRY} \
+  --build-arg COSMOS_TAG=${COSMOS_RELEASE_VERSION} \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-operator:${COSMOS_RELEASE_VERSION} .
 
 if [ $COSMOS_UPDATE_LATEST = true ]
 then
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --build-arg COSMOS_REGISTRY=${COSMOS_REGISTRY} \
+  --build-arg COSMOS_TAG=${COSMOS_RELEASE_VERSION} \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-operator:latest .
 fi
 
 # Note: Missing COSMOS_REGISTRY build-arg intentionally to default to docker.io
 cd ../cosmos-traefik
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-traefik:${COSMOS_RELEASE_VERSION} .
 
 if [ $COSMOS_UPDATE_LATEST = true ]
 then
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-traefik:latest .
 fi
 
 cd ../cosmos-init
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --build-arg COSMOS_REGISTRY=${COSMOS_REGISTRY} \
+  --build-arg COSMOS_TAG=${COSMOS_RELEASE_VERSION} \
   --build-arg NPM_URL=${NPM_URL} \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-init:${COSMOS_RELEASE_VERSION} .
 
 if [ $COSMOS_UPDATE_LATEST = true ]
 then
 docker buildx build \
   --platform ${COSMOS_PLATFORMS} \
+  --progress plain \
   --build-arg COSMOS_REGISTRY=${COSMOS_REGISTRY} \
+  --build-arg COSMOS_TAG=${COSMOS_RELEASE_VERSION} \
   --build-arg NPM_URL=${NPM_URL} \
   --push -t ${COSMOS_REGISTRY}/ballaerospace/cosmosc2-init:latest .
 fi