⚡ Revise build command for multiplatforms (#890)

Signed-off-by: Rintaro Okamura <rintaro.okamura@gmail.com> Co-authored-by: Yusuke Kato <kpango@vdaas.org>
vdaas · Jan 20, 2021 · 88a8de3 · 88a8de3
1 parent 13ab059
commit 88a8de3
Show file tree

Hide file tree

Showing 19 changed files with 257 additions and 126 deletions.
diff --git a/.github/workflows/dockers-agent-ngt-image.yml b/.github/workflows/dockers-agent-ngt-image.yml
@@ -89,13 +89,17 @@ jobs:
         id: image_name
         run: |
           image_name=`make docker/name/agent-ngt`
+          alter_org=`make docker/name/org/alter`
+          alter_image_name=`make ORG="${alter_org}" docker/name/agent-ngt`
           base_platforms=`make docker/platforms`
           echo "IMAGE_NAME=${image_name}" >> $GITHUB_ENV
+          echo "ALTER_IMAGE_NAME=${alter_image_name}" >> $GITHUB_ENV
           echo "::set-output name=IMAGE_NAME::${image_name}"
           echo "::set-output name=BASE_PLATFORMS::${base_platforms}"
       - name: Determine tag name (master)
         if: github.ref == 'refs/heads/master'
         run: |
+          echo "nightly" > versions/VALD_VERSION
           echo "PRIMARY_TAG=nightly" >> $GITHUB_ENV
           echo "PLATFORMS=${PLATFORMS}" >> $GITHUB_ENV
         env:
@@ -119,17 +123,20 @@ jobs:
           echo "PLATFORMS=${PLATFORMS}" >> $GITHUB_ENV
         env:
           PLATFORMS: ${{ steps.image_name.outputs.BASE_PLATFORMS }}
+      - name: Add extra tags
+        run: |
+          EXTRA_TAGS="-t ${ALTER_IMAGE_NAME}:${PRIMARY_TAG}"
+          echo "EXTRA_TAGS=${EXTRA_TAGS}" >> $GITHUB_ENV
+      - name: Add latest tags
+        if: startsWith( github.ref, 'refs/tags/')
+        run: |
+          LATEST_TAGS="-t ${IMAGE_NAME}:latest -t ${ALTER_IMAGE_NAME}:latest"
+          echo "LATEST_TAGS=${LATEST_TAGS}" >> $GITHUB_ENV
       - name: Build and Push
         run: |
           make \
             DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
-            TAG="${PRIMARY_TAG}" \
-            docker/build/agent-ngt
-          make \
-            ORG="ghcr.io/vdaas/vald" \
-            DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
+            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} ${EXTRA_TAGS} ${LATEST_TAGS} --push" \
             TAG="${PRIMARY_TAG}" \
             docker/build/agent-ngt
         env:

diff --git a/.github/workflows/dockers-agent-sidecar-image.yml b/.github/workflows/dockers-agent-sidecar-image.yml
@@ -89,13 +89,17 @@ jobs:
         id: image_name
         run: |
           image_name=`make docker/name/agent-sidecar`
+          alter_org=`make docker/name/org/alter`
+          alter_image_name=`make ORG="${alter_org}" docker/name/agent-sidecar`
           base_platforms=`make docker/platforms`
           echo "IMAGE_NAME=${image_name}" >> $GITHUB_ENV
+          echo "ALTER_IMAGE_NAME=${alter_image_name}" >> $GITHUB_ENV
           echo "::set-output name=IMAGE_NAME::${image_name}"
           echo "::set-output name=BASE_PLATFORMS::${base_platforms}"
       - name: Determine tag name (master)
         if: github.ref == 'refs/heads/master'
         run: |
+          echo "nightly" > versions/VALD_VERSION
           echo "PRIMARY_TAG=nightly" >> $GITHUB_ENV
           echo "PLATFORMS=${PLATFORMS}" >> $GITHUB_ENV
         env:
@@ -119,17 +123,20 @@ jobs:
           echo "PLATFORMS=${PLATFORMS}" >> $GITHUB_ENV
         env:
           PLATFORMS: ${{ steps.image_name.outputs.BASE_PLATFORMS }}
+      - name: Add extra tags
+        run: |
+          EXTRA_TAGS="-t ${ALTER_IMAGE_NAME}:${PRIMARY_TAG}"
+          echo "EXTRA_TAGS=${EXTRA_TAGS}" >> $GITHUB_ENV
+      - name: Add latest tags
+        if: startsWith( github.ref, 'refs/tags/')
+        run: |
+          LATEST_TAGS="-t ${IMAGE_NAME}:latest -t ${ALTER_IMAGE_NAME}:latest"
+          echo "LATEST_TAGS=${LATEST_TAGS}" >> $GITHUB_ENV
       - name: Build and Push
         run: |
           make \
             DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
-            TAG="${PRIMARY_TAG}" \
-            docker/build/agent-sidecar
-          make \
-            ORG="ghcr.io/vdaas/vald" \
-            DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
+            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} ${EXTRA_TAGS} ${LATEST_TAGS} --push" \
             TAG="${PRIMARY_TAG}" \
             docker/build/agent-sidecar
         env:

diff --git a/.github/workflows/dockers-backup-manager-cassandra-image.yml b/.github/workflows/dockers-backup-manager-cassandra-image.yml
@@ -91,13 +91,17 @@ jobs:
         id: image_name
         run: |
           image_name=`make docker/name/backup-manager-cassandra`
+          alter_org=`make docker/name/org/alter`
+          alter_image_name=`make ORG="${alter_org}" docker/name/backup-manager-cassandra`
           base_platforms=`make docker/platforms`
           echo "IMAGE_NAME=${image_name}" >> $GITHUB_ENV
+          echo "ALTER_IMAGE_NAME=${alter_image_name}" >> $GITHUB_ENV
           echo "::set-output name=IMAGE_NAME::${image_name}"
           echo "::set-output name=BASE_PLATFORMS::${base_platforms}"
       - name: Determine tag name (master)
         if: github.ref == 'refs/heads/master'
         run: |
+          echo "nightly" > versions/VALD_VERSION
           echo "PRIMARY_TAG=nightly" >> $GITHUB_ENV
           echo "PLATFORMS=${PLATFORMS}" >> $GITHUB_ENV
         env:
@@ -121,17 +125,20 @@ jobs:
           echo "PLATFORMS=${PLATFORMS}" >> $GITHUB_ENV
         env:
           PLATFORMS: ${{ steps.image_name.outputs.BASE_PLATFORMS }}
+      - name: Add extra tags
+        run: |
+          EXTRA_TAGS="-t ${ALTER_IMAGE_NAME}:${PRIMARY_TAG}"
+          echo "EXTRA_TAGS=${EXTRA_TAGS}" >> $GITHUB_ENV
+      - name: Add latest tags
+        if: startsWith( github.ref, 'refs/tags/')
+        run: |
+          LATEST_TAGS="-t ${IMAGE_NAME}:latest -t ${ALTER_IMAGE_NAME}:latest"
+          echo "LATEST_TAGS=${LATEST_TAGS}" >> $GITHUB_ENV
       - name: Build and Push
         run: |
           make \
             DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
-            TAG="${PRIMARY_TAG}" \
-            docker/build/backup-manager-cassandra
-          make \
-            ORG="ghcr.io/vdaas/vald" \
-            DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
+            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} ${EXTRA_TAGS} ${LATEST_TAGS} --push" \
             TAG="${PRIMARY_TAG}" \
             docker/build/backup-manager-cassandra
         env:

diff --git a/.github/workflows/dockers-backup-manager-mysql-image.yml b/.github/workflows/dockers-backup-manager-mysql-image.yml
@@ -89,13 +89,17 @@ jobs:
         id: image_name
         run: |
           image_name=`make docker/name/backup-manager-mysql`
+          alter_org=`make docker/name/org/alter`
+          alter_image_name=`make ORG="${alter_org}" docker/name/backup-manager-mysql`
           base_platforms=`make docker/platforms`
           echo "IMAGE_NAME=${image_name}" >> $GITHUB_ENV
+          echo "ALTER_IMAGE_NAME=${alter_image_name}" >> $GITHUB_ENV
           echo "::set-output name=IMAGE_NAME::${image_name}"
           echo "::set-output name=BASE_PLATFORMS::${base_platforms}"
       - name: Determine tag name (master)
         if: github.ref == 'refs/heads/master'
         run: |
+          echo "nightly" > versions/VALD_VERSION
           echo "PRIMARY_TAG=nightly" >> $GITHUB_ENV
           echo "PLATFORMS=${PLATFORMS}" >> $GITHUB_ENV
         env:
@@ -119,17 +123,20 @@ jobs:
           echo "PLATFORMS=${PLATFORMS}" >> $GITHUB_ENV
         env:
           PLATFORMS: ${{ steps.image_name.outputs.BASE_PLATFORMS }}
+      - name: Add extra tags
+        run: |
+          EXTRA_TAGS="-t ${ALTER_IMAGE_NAME}:${PRIMARY_TAG}"
+          echo "EXTRA_TAGS=${EXTRA_TAGS}" >> $GITHUB_ENV
+      - name: Add latest tags
+        if: startsWith( github.ref, 'refs/tags/')
+        run: |
+          LATEST_TAGS="-t ${IMAGE_NAME}:latest -t ${ALTER_IMAGE_NAME}:latest"
+          echo "LATEST_TAGS=${LATEST_TAGS}" >> $GITHUB_ENV
       - name: Build and Push
         run: |
           make \
             DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
-            TAG="${PRIMARY_TAG}" \
-            docker/build/backup-manager-mysql
-          make \
-            ORG="ghcr.io/vdaas/vald" \
-            DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
+            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} ${EXTRA_TAGS} ${LATEST_TAGS} --push" \
             TAG="${PRIMARY_TAG}" \
             docker/build/backup-manager-mysql
         env:

diff --git a/.github/workflows/dockers-base-image.yml b/.github/workflows/dockers-base-image.yml
@@ -68,8 +68,11 @@ jobs:
         id: image_name
         run: |
           image_name=`make docker/name/base`
+          alter_org=`make docker/name/org/alter`
+          alter_image_name=`make ORG="${alter_org}" docker/name/base`
           base_platforms=`make docker/platforms`
           echo "IMAGE_NAME=${image_name}" >> $GITHUB_ENV
+          echo "ALTER_IMAGE_NAME=${alter_image_name}" >> $GITHUB_ENV
           echo "::set-output name=IMAGE_NAME::${image_name}"
           echo "::set-output name=BASE_PLATFORMS::${base_platforms}"
       - name: Determine tag name (master)
@@ -89,17 +92,20 @@ jobs:
           tag_name=`echo $GITHUB_REF | sed -e 's:^refs/tags/::'`
           echo "::set-output name=TAG_NAME::${tag_name}"
           echo "PRIMARY_TAG=${tag_name}" >> $GITHUB_ENV
+      - name: Add extra tags
+        run: |
+          EXTRA_TAGS="-t ${ALTER_IMAGE_NAME}:${PRIMARY_TAG}"
+          echo "EXTRA_TAGS=${EXTRA_TAGS}" >> $GITHUB_ENV
+      - name: Add latest tags
+        if: startsWith( github.ref, 'refs/tags/')
+        run: |
+          LATEST_TAGS="-t ${IMAGE_NAME}:latest -t ${ALTER_IMAGE_NAME}:latest"
+          echo "LATEST_TAGS=${LATEST_TAGS}" >> $GITHUB_ENV
       - name: Build and Push
         run: |
           make \
             DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
-            TAG="${PRIMARY_TAG}" \
-            docker/build/base
-          make \
-            ORG="ghcr.io/vdaas/vald" \
-            DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
+            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} ${EXTRA_TAGS} ${LATEST_TAGS} --push" \
             TAG="${PRIMARY_TAG}" \
             docker/build/base
         env:

diff --git a/.github/workflows/dockers-ci-container-image.yml b/.github/workflows/dockers-ci-container-image.yml
@@ -64,7 +64,10 @@ jobs:
         id: image_name
         run: |
           image_name=`make docker/name/ci-container`
+          alter_org=`make docker/name/org/alter`
+          alter_image_name=`make ORG="${alter_org}" docker/name/ci-container`
           echo "IMAGE_NAME=${image_name}" >> $GITHUB_ENV
+          echo "ALTER_IMAGE_NAME=${alter_image_name}" >> $GITHUB_ENV
           echo "::set-output name=IMAGE_NAME::${image_name}"
       - name: Determine tag name (master)
         if: github.ref == 'refs/heads/master'
@@ -83,17 +86,20 @@ jobs:
           tag_name=`echo $GITHUB_REF | sed -e 's:^refs/tags/::'`
           echo "::set-output name=TAG_NAME::${tag_name}"
           echo "PRIMARY_TAG=${tag_name}" >> $GITHUB_ENV
+      - name: Add extra tags
+        run: |
+          EXTRA_TAGS="-t ${ALTER_IMAGE_NAME}:${PRIMARY_TAG}"
+          echo "EXTRA_TAGS=${EXTRA_TAGS}" >> $GITHUB_ENV
+      - name: Add latest tags
+        if: startsWith( github.ref, 'refs/tags/')
+        run: |
+          LATEST_TAGS="-t ${IMAGE_NAME}:latest -t ${ALTER_IMAGE_NAME}:latest"
+          echo "LATEST_TAGS=${LATEST_TAGS}" >> $GITHUB_ENV
       - name: Build and Push
         run: |
           make \
             DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
-            TAG="${PRIMARY_TAG}" \
-            docker/build/ci-container
-          make \
-            ORG="ghcr.io/vdaas/vald" \
-            DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
+            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} ${EXTRA_TAGS} ${LATEST_TAGS} --push" \
             TAG="${PRIMARY_TAG}" \
             docker/build/ci-container
         env:

diff --git a/.github/workflows/dockers-dev-container-image.yml b/.github/workflows/dockers-dev-container-image.yml
@@ -64,7 +64,10 @@ jobs:
         id: image_name
         run: |
           image_name=`make docker/name/dev-container`
+          alter_org=`make docker/name/org/alter`
+          alter_image_name=`make ORG="${alter_org}" docker/name/dev-container`
           echo "IMAGE_NAME=${image_name}" >> $GITHUB_ENV
+          echo "ALTER_IMAGE_NAME=${alter_image_name}" >> $GITHUB_ENV
           echo "::set-output name=IMAGE_NAME::${image_name}"
       - name: Determine tag name (master)
         if: github.ref == 'refs/heads/master'
@@ -83,17 +86,20 @@ jobs:
           tag_name=`echo $GITHUB_REF | sed -e 's:^refs/tags/::'`
           echo "::set-output name=TAG_NAME::${tag_name}"
           echo "PRIMARY_TAG=${tag_name}" >> $GITHUB_ENV
+      - name: Add extra tags
+        run: |
+          EXTRA_TAGS="-t ${ALTER_IMAGE_NAME}:${PRIMARY_TAG}"
+          echo "EXTRA_TAGS=${EXTRA_TAGS}" >> $GITHUB_ENV
+      - name: Add latest tags
+        if: startsWith( github.ref, 'refs/tags/')
+        run: |
+          LATEST_TAGS="-t ${IMAGE_NAME}:latest -t ${ALTER_IMAGE_NAME}:latest"
+          echo "LATEST_TAGS=${LATEST_TAGS}" >> $GITHUB_ENV
       - name: Build and Push
         run: |
           make \
             DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
-            TAG="${PRIMARY_TAG}" \
-            docker/build/dev-container
-          make \
-            ORG="ghcr.io/vdaas/vald" \
-            DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
+            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} ${EXTRA_TAGS} ${LATEST_TAGS} --push" \
             TAG="${PRIMARY_TAG}" \
             docker/build/dev-container
         env:

diff --git a/.github/workflows/dockers-discoverer-k8s-image.yml b/.github/workflows/dockers-discoverer-k8s-image.yml
@@ -85,13 +85,17 @@ jobs:
         id: image_name
         run: |
           image_name=`make docker/name/discoverer-k8s`
+          alter_org=`make docker/name/org/alter`
+          alter_image_name=`make ORG="${alter_org}" docker/name/discoverer-k8s`
           base_platforms=`make docker/platforms`
           echo "IMAGE_NAME=${image_name}" >> $GITHUB_ENV
+          echo "ALTER_IMAGE_NAME=${alter_image_name}" >> $GITHUB_ENV
           echo "::set-output name=IMAGE_NAME::${image_name}"
           echo "::set-output name=BASE_PLATFORMS::${base_platforms}"
       - name: Determine tag name (master)
         if: github.ref == 'refs/heads/master'
         run: |
+          echo "nightly" > versions/VALD_VERSION
           echo "PRIMARY_TAG=nightly" >> $GITHUB_ENV
           echo "PLATFORMS=${PLATFORMS}" >> $GITHUB_ENV
         env:
@@ -115,17 +119,20 @@ jobs:
           echo "PLATFORMS=${PLATFORMS}" >> $GITHUB_ENV
         env:
           PLATFORMS: ${{ steps.image_name.outputs.BASE_PLATFORMS }}
+      - name: Add extra tags
+        run: |
+          EXTRA_TAGS="-t ${ALTER_IMAGE_NAME}:${PRIMARY_TAG}"
+          echo "EXTRA_TAGS=${EXTRA_TAGS}" >> $GITHUB_ENV
+      - name: Add latest tags
+        if: startsWith( github.ref, 'refs/tags/')
+        run: |
+          LATEST_TAGS="-t ${IMAGE_NAME}:latest -t ${ALTER_IMAGE_NAME}:latest"
+          echo "LATEST_TAGS=${LATEST_TAGS}" >> $GITHUB_ENV
       - name: Build and Push
         run: |
           make \
             DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
-            TAG="${PRIMARY_TAG}" \
-            docker/build/discoverer-k8s
-          make \
-            ORG="ghcr.io/vdaas/vald" \
-            DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
+            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} ${EXTRA_TAGS} ${LATEST_TAGS} --push" \
             TAG="${PRIMARY_TAG}" \
             docker/build/discoverer-k8s
         env:

diff --git a/.github/workflows/dockers-gateway-backup-image.yml b/.github/workflows/dockers-gateway-backup-image.yml
@@ -91,13 +91,17 @@ jobs:
         id: image_name
         run: |
           image_name=`make docker/name/gateway-backup`
+          alter_org=`make docker/name/org/alter`
+          alter_image_name=`make ORG="${alter_org}" docker/name/gateway-backup`
           base_platforms=`make docker/platforms`
           echo "IMAGE_NAME=${image_name}" >> $GITHUB_ENV
+          echo "ALTER_IMAGE_NAME=${alter_image_name}" >> $GITHUB_ENV
           echo "::set-output name=IMAGE_NAME::${image_name}"
           echo "::set-output name=BASE_PLATFORMS::${base_platforms}"
       - name: Determine tag name (master)
         if: github.ref == 'refs/heads/master'
         run: |
+          echo "nightly" > versions/VALD_VERSION
           echo "PRIMARY_TAG=nightly" >> $GITHUB_ENV
           echo "PLATFORMS=${PLATFORMS}" >> $GITHUB_ENV
         env:
@@ -121,17 +125,20 @@ jobs:
           echo "PLATFORMS=${PLATFORMS}" >> $GITHUB_ENV
         env:
           PLATFORMS: ${{ steps.image_name.outputs.BASE_PLATFORMS }}
+      - name: Add extra tags
+        run: |
+          EXTRA_TAGS="-t ${ALTER_IMAGE_NAME}:${PRIMARY_TAG}"
+          echo "EXTRA_TAGS=${EXTRA_TAGS}" >> $GITHUB_ENV
+      - name: Add latest tags
+        if: startsWith( github.ref, 'refs/tags/')
+        run: |
+          LATEST_TAGS="-t ${IMAGE_NAME}:latest -t ${ALTER_IMAGE_NAME}:latest"
+          echo "LATEST_TAGS=${LATEST_TAGS}" >> $GITHUB_ENV
       - name: Build and Push
         run: |
           make \
             DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
-            TAG="${PRIMARY_TAG}" \
-            docker/build/gateway-backup
-          make \
-            ORG="ghcr.io/vdaas/vald" \
-            DOCKER="docker buildx" \
-            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} --push" \
+            DOCKER_OPTS="--platform ${PLATFORMS} --builder ${BUILDER} ${CACHE_OPTS} ${LABEL_OPTS} ${EXTRA_TAGS} ${LATEST_TAGS} --push" \
             TAG="${PRIMARY_TAG}" \
             docker/build/gateway-backup
         env: