refactor buildspec

packages/app/docker/codebuild/buildspec-image.yml

@@ -5,8 +5,8 @@ env:
     DOCKER_BUILDKIT: 1
     # IMAGE_NAME: weseek/growi
     IMAGE_NAME: weseek/growi-codebuild-test
-    TAG: latest
-    TAG_SUFFIX: amd64
+    TAG_VERSION: latest
+    TAG_SUFFIX: ''
   secrets-manager:
     DOCKER_REGISTRY_PASSWORD: growi/official-image-builder:DOCKER_REGISTRY_PASSWORD
     DOCKER_REGISTRY_ON_GITHUB_PAT: growi/official-image-builder:DOCKER_REGISTRY_ON_GITHUB_PAT
@@ -20,8 +20,8 @@ phases:
       - echo ${DOCKER_REGISTRY_ON_GITHUB_PAT} | docker login ghcr.io --username wsmoogle --password-stdin
   build:
     commands:
-      - export TAG="${IMAGE_NAME}:${TAG_TMP}${TAG_SUFFIX+-}${TAG_SUFFIX}"
-      - export TAG_GHCR="ghcr.io/${IMAGE_NAME}:${TAG_TMP}${TAG_SUFFIX+-}${TAG_SUFFIX}"
+      - export TAG="${IMAGE_NAME}:${TAG_VERSION}${TAG_SUFFIX+-}${TAG_SUFFIX}"
+      - export TAG_GHCR="ghcr.io/${IMAGE_NAME}:${TAG_VERSION}${TAG_SUFFIX+-}${TAG_SUFFIX}"
       # - docker build -t $TAG -f ./packages/app/docker/Dockerfile .
       - docker build -t $TAG -f ./packages/app/docker/Dockerfile.nginx .
       - docker tag $TAG $TAG_GHCR

packages/app/docker/codebuild/buildspec-manifest.yml

@@ -4,8 +4,7 @@ env:
     IMAGE_HOST: ''
     # IMAGE_NAME: weseek/growi
     IMAGE_NAME: weseek/growi-codebuild-test
-    TAG_AMD64: latest-amd64
-    TAG_ARM64: latest-arm64
+    SOURCE_MANIFESTS: ${IMAGE_NAME}:latest
     TAGS: latest
     SECRETS_JSON_KEY: DOCKER_REGISTRY_PASSWORD # DOCKER_REGISTRY_PASSWORD or DOCKER_REGISTRY_ON_GITHUB_PASSWORD
   secrets-manager:
@@ -17,9 +16,7 @@ phases:
   build:
     commands:
       - export IMAGE="${IMAGE_HOST}${IMAGE_HOST:+/}${IMAGE_NAME}"
-      - export MANIFEST_AMD64="${IMAGE}:${TAG_AMD64}"
-      - export MANIFEST_ARM64="${IMAGE}:${TAG_ARM64}"
       - bash ./packages/app/docker/codebuild/create-manifests.sh
           --target-image "${IMAGE}"
           --tags "${TAGS}"
-          --source-manifests "${MANIFEST_AMD64} ${MANIFEST_ARM64}"
+          --source-manifests "${SOURCE_MANIFESTS}"

packages/app/docker/codebuild/buildspec.yml

@@ -9,7 +9,7 @@ batch:
         image: aws/codebuild/standard:6.0
         type: LINUX_CONTAINER
         variables:
-          TAG_TMP: codebuildtmp
+          TAG_VERSION: latest
           TAG_SUFFIX: amd64
     - identifier: build_arm64
       buildspec: packages/app/docker/codebuild/buildspec-image.yml
@@ -17,15 +17,16 @@ batch:
         image: aws/codebuild/amazonlinux2-aarch64-standard:2.0
         type: ARM_CONTAINER
         variables:
-          TAG_TMP: codebuildtmp
+          TAG_VERSION: latest
           TAG_SUFFIX: arm64
     # create manifest
     - identifier: create_manifest_dockerhub
       buildspec: packages/app/docker/codebuild/buildspec-manifest.yml
       env:
         variables:
-          TAG_VERSION: codebuildtmp
           SECRETS_JSON_KEY: DOCKER_REGISTRY_PASSWORD
+          SOURCE_MANIFESTS: weseek/growi/latest-amd64 weseek/growi/latest-arm64
+          TAGS: latest
       depend-on:
         - build_amd64
         - build_arm64
@@ -34,8 +35,9 @@ batch:
     #   env:
     #     variables:
     #       IMAGE_HOST: ghcr.io
-    #       TAG_VERSION: codebuildtmp
     #       SECRETS_JSON_KEY: DOCKER_REGISTRY_ON_GITHUB_PASSWORD
+    #       SOURCE_MANIFESTS: ghcr.io/weseek/growi/latest-amd64 ghcr.io/weseek/growi/latest-arm64
+    #       TAGS: latest
     #   depend-on:
     #     - build_amd64
     #     - build_arm64