fix envvar

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

@@ -15,7 +15,7 @@ phases:
       # login to docker.io
       - echo ${DOCKER_REGISTRY_PASSWORD} | docker login --username wsmoogle --password-stdin
       # login to ghcr.io
-      - echo ${DOCKER_REGISTRY_ON_GITHUB_PASSWORD} | docker login --username wsmoogle --password-stdin ghcr.io
+      - echo ${DOCKER_REGISTRY_ON_GITHUB_PASSWORD} | docker login ghcr.io --username wsmoogle --password-stdin
   build:
     commands:
       - export IMAGE_TAG="${IMAGE_NAME}:${TAG_VERSION}.BUILD.${BUILD_NUM}${TAG_SUFFIX+-}${TAG_SUFFIX}"

packages/app/docker/codebuild/buildspec.yml

@@ -1,7 +1,7 @@
 version: 0.2
 env:
   variables:
-    BUILD_NUM: 0
+    BUILD_NUM: $CODEBUILD_BUILD_NUMBER
 batch:
   fast-fail: true
   build-graph:
@@ -12,7 +12,7 @@ batch:
         image: aws/codebuild/standard:6.0
         type: LINUX_CONTAINER
         variables:
-          BUILD_NUM: $CODEBUILD_BUILD_NUMBER
+          BUILD_NUM: $BUILD_NUM
           TAG_SUFFIX: amd64
     - identifier: build_arm64
       buildspec: packages/app/docker/codebuild/buildspec-image.yml
@@ -20,14 +20,14 @@ batch:
         image: aws/codebuild/amazonlinux2-aarch64-standard:2.0
         type: ARM_CONTAINER
         variables:
-          BUILD_NUM: $CODEBUILD_BUILD_NUMBER
+          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: $CODEBUILD_BUILD_NUMBER
+          BUILD_NUM: $BUILD_NUM
           SECRETS_JSON_KEY: DOCKER_REGISTRY_PASSWORD
       depend-on:
         - build_amd64
@@ -36,7 +36,8 @@ batch:
       buildspec: packages/app/docker/codebuild/buildspec-manifest.yml
       env:
         variables:
-          BUILD_NUM: $CODEBUILD_BUILD_NUMBER
+          BUILD_NUM: $BUILD_NUM
+          IMAGE_HOST: ghcr.io
           SECRETS_JSON_KEY: DOCKER_REGISTRY_ON_GITHUB_PASSWORD
       depend-on:
         - build_amd64