get secret name from env

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

@@ -3,12 +3,13 @@ env:
   variables:
     DOCKER_BUILDKIT: 1
     BUILD_NUM: 0
+    SECRETS_NAME: ''
     IMAGE_NAME: weseek/growi
     TAG_VERSION: latest
     TAG_SUFFIX: amd64
   secrets-manager:
-    DOCKER_REGISTRY_PASSWORD: growi/buildspec-secrets:DOCKER_REGISTRY_PASSWORD
-    DOCKER_REGISTRY_ON_GITHUB_PASSWORD: growi/buildspec-secrets:DOCKER_REGISTRY_ON_GITHUB_PASSWORD
+    DOCKER_REGISTRY_PASSWORD: ${SECRETS_NAME}:DOCKER_REGISTRY_PASSWORD
+    DOCKER_REGISTRY_ON_GITHUB_PASSWORD: ${SECRETS_NAME}:DOCKER_REGISTRY_ON_GITHUB_PASSWORD
 phases:
   pre_build:
     commands:

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

@@ -2,12 +2,13 @@ version: 0.2
 env:
   variables:
     BUILD_NUM: 0
+    SECRETS_NAME: ''
     IMAGE_HOST: ''
     IMAGE_NAME: weseek/growi
     TAG_VERSION: latest
     SECRETS_JSON_KEY: DOCKER_REGISTRY_PASSWORD # DOCKER_REGISTRY_PASSWORD or DOCKER_REGISTRY_ON_GITHUB_PASSWORD
   secrets-manager:
-    DOCKER_REGISTRY_PASSWORD: growi/buildspec-secrets:${SECRETS_JSON_KEY}
+    DOCKER_REGISTRY_PASSWORD: ${SECRETS_NAME}:${SECRETS_JSON_KEY}
 phases:
   pre_build:
     commands:

packages/app/docker/codebuild/buildspec.yml

@@ -1,6 +1,9 @@
 version: 0.2
 batch:
   fast-fail: true
+  env:
+    BUILD_NUM: ${CODEBUILD_BUILD_NUMBER}
+    SECRETS_NAME: ${SECRETS_NAME}
   build-graph:
     # build
     - identifier: build_amd64
@@ -10,7 +13,6 @@ batch:
         type: LINUX_CONTAINER
         variables:
           TAG_SUFFIX: amd64
-          BUILD_NUM: ${CODEBUILD_BUILD_NUMBER}
     - identifier: build_arm64
       buildspec: packages/app/docker/codebuild/buildspec-image.yml
       env:
@@ -18,14 +20,12 @@ batch:
         type: ARM_CONTAINER
         variables:
           TAG_SUFFIX: arm64
-          BUILD_NUM: ${CODEBUILD_BUILD_NUMBER}
     # create manifest
     - identifier: create_manifest_dockerhub
       buildspec: packages/app/docker/codebuild/buildspec-manifest.yml
       env:
         variables:
           SECRETS_JSON_KEY: DOCKER_REGISTRY_PASSWORD
-          BUILD_NUM: ${CODEBUILD_BUILD_NUMBER}
       depend-on:
         - build_amd64
         - build_arm64
@@ -34,7 +34,6 @@ batch:
       env:
         variables:
           SECRETS_JSON_KEY: DOCKER_REGISTRY_ON_GITHUB_PASSWORD
-          BUILD_NUM: ${CODEBUILD_BUILD_NUMBER}
       depend-on:
         - build_amd64
         - build_arm64