fix image tag

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

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

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

@@ -1,7 +1,6 @@
 version: 0.2
 env:
   variables:
-    BUILD_NUM: 0
     IMAGE_HOST: ''
     IMAGE_NAME: weseek/growi
     TAG_VERSION: latest
@@ -15,8 +14,8 @@ 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.${BUILD_NUM}-amd64"
-      - export IMAGE_TAG_ARM64="${IMAGE_HOST}${IMAGE_HOST:+/}${IMAGE_NAME}:${TAG_VERSION}.BUILD.${BUILD_NUM}-arm64"
+      - export IMAGE_TAG_AMD64="${IMAGE_HOST}${IMAGE_HOST:+/}${IMAGE_NAME}:${TAG_VERSION}-amd64"
+      - export IMAGE_TAG_ARM64="${IMAGE_HOST}${IMAGE_HOST:+/}${IMAGE_NAME}:${TAG_VERSION}-arm64"
       - docker manifest create $IMAGE_TAG $IMAGE_TAG_AMD64 $IMAGE_TAG_ARM64
 
   post_build:

packages/app/docker/codebuild/buildspec.yml

@@ -1,7 +1,4 @@
 version: 0.2
-env:
-  variables:
-    BUILD_NUM: $CODEBUILD_BUILD_NUMBER
 batch:
   fast-fail: true
   build-graph:
@@ -12,7 +9,6 @@ batch:
         image: aws/codebuild/standard:6.0
         type: LINUX_CONTAINER
         variables:
-          BUILD_NUM: $BUILD_NUM
           TAG_SUFFIX: amd64
     - identifier: build_arm64
       buildspec: packages/app/docker/codebuild/buildspec-image.yml
@@ -20,14 +16,12 @@ batch:
         image: aws/codebuild/amazonlinux2-aarch64-standard:2.0
         type: ARM_CONTAINER
         variables:
-          BUILD_NUM: $BUILD_NUM
           TAG_SUFFIX: arm64
     # create manifest
     - identifier: create_manifest_dockerhub
       buildspec: packages/app/docker/codebuild/buildspec-manifest.yml
       env:
         variables:
-          BUILD_NUM: $BUILD_NUM
           SECRETS_JSON_KEY: DOCKER_REGISTRY_PASSWORD
       depend-on:
         - build_amd64