fix BUILD_NUM

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

@@ -2,6 +2,7 @@ version: 0.2
 env:
   variables:
     DOCKER_BUILDKIT: 1
+    BUILD_NUM: 0
     IMAGE_NAME: weseek/growi
     TAG_VERSION: latest
     TAG_SUFFIX: amd64
@@ -17,8 +18,8 @@ phases:
       - echo ${DOCKER_REGISTRY_ON_GITHUB_PASSWORD} | docker login --username wsmoogle --password-stdin ghcr.io
   build:
     commands:
-      - export IMAGE_TAG="${IMAGE_NAME}:${TAG_VERSION}.BUILD.${CODEBUILD_BUILD_NUMBER}${TAG_SUFFIX+-}${TAG_SUFFIX}"
-      - export IMAGE_TAG_GHCR="ghcr.io/${IMAGE_NAME}:${TAG_VERSION}.BUILD.${CODEBUILD_BUILD_NUMBER}${TAG_SUFFIX+-}${TAG_SUFFIX}"
+      - export IMAGE_TAG="${IMAGE_NAME}:${TAG_VERSION}.BUILD.${BUILD_NUM}${TAG_SUFFIX+-}${TAG_SUFFIX}"
+      - export IMAGE_TAG_GHCR="ghcr.io/${IMAGE_NAME}:${TAG_VERSION}.BUILD.${BUILD_NUM}${TAG_SUFFIX+-}${TAG_SUFFIX}"
       - docker build -t $IMAGE_TAG -f ./packages/app/docker/Dockerfile .
       - docker tag $IMAGE_TAG $IMAGE_TAG_GHCR
 
@@ -26,4 +27,4 @@ phases:
     commands:
       - docker push $IMAGE_TAG
       - docker push $IMAGE_TAG_GHCR
-      
+

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

@@ -1,6 +1,7 @@
 version: 0.2
 env:
   variables:
+    BUILD_NUM: 0
     IMAGE_HOST: ''
     IMAGE_NAME: weseek/growi
     TAG_VERSION: latest
@@ -14,10 +15,10 @@ phases:
   build:
     commands:
       - export IMAGE_TAG="${IMAGE_HOST}${IMAGE_HOST:+/}${IMAGE_NAME}:${TAG_VERSION}"
-      - export IMAGE_TAG_AMD64="${IMAGE_HOST}${IMAGE_HOST:+/}${IMAGE_NAME}:${TAG_VERSION}.BUILD.${CODEBUILD_BUILD_NUMBER}-amd64"
-      - export IMAGE_TAG_ARM64="${IMAGE_HOST}${IMAGE_HOST:+/}${IMAGE_NAME}:${TAG_VERSION}.BUILD.${CODEBUILD_BUILD_NUMBER}-arm64"
+      - export IMAGE_TAG_AMD64="${IMAGE_HOST}${IMAGE_HOST:+/}${IMAGE_NAME}:${TAG_VERSION}.BUILD.${BUILD_NUM}-amd64"
+      - export IMAGE_TAG_ARM64="${IMAGE_HOST}${IMAGE_HOST:+/}${IMAGE_NAME}:${TAG_VERSION}.BUILD.${BUILD_NUM}-arm64"
       - docker manifest create $IMAGE_TAG $IMAGE_TAG_AMD64 $IMAGE_TAG_ARM64
 
   post_build:
     commands:
-      - docker manifest push $IMAGE_TAG
+      - docker manifest push $IMAGE_TAG

packages/app/docker/codebuild/buildspec.yml

@@ -10,6 +10,7 @@ batch:
         type: LINUX_CONTAINER
         variables:
           TAG_SUFFIX: amd64
+          BUILD_NUM: ${CODEBUILD_BUILD_NUMBER}
     - identifier: build_arm64
       buildspec: buildspec-image.yml
       env:
@@ -17,12 +18,14 @@ batch:
         type: ARM_CONTAINER
         variables:
           TAG_SUFFIX: arm64
+          BUILD_NUM: ${CODEBUILD_BUILD_NUMBER}
     # create manifest
     - identifier: create_manifest_dockerhub
       buildspec: buildspec-manifest.yml
       env:
         variables:
           SECRETS_JSON_KEY: DOCKER_REGISTRY_PASSWORD
+          BUILD_NUM: ${CODEBUILD_BUILD_NUMBER}
       depend-on:
         - build_amd64
         - build_arm64
@@ -31,6 +34,7 @@ batch:
       env:
         variables:
           SECRETS_JSON_KEY: DOCKER_REGISTRY_ON_GITHUB_PASSWORD
+          BUILD_NUM: ${CODEBUILD_BUILD_NUMBER}
       depend-on:
         - build_amd64
-        - build_arm64
+        - build_arm64