Yuki Takei 3 лет назад
Родитель
Сommit
eeddff5de4

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

@@ -21,7 +21,7 @@ phases:
     commands:
       - export TAG="${IMAGE_NAME}:${TAG_TMP}${TAG_SUFFIX+-}${TAG_SUFFIX}"
       - export TAG_GHCR="ghcr.io/${IMAGE_NAME}:${TAG_TMP}${TAG_SUFFIX+-}${TAG_SUFFIX}"
-      - docker build -t $IMAGE_TAG -f ./packages/app/docker/Dockerfile .
+      - docker build -t $TAG -f ./packages/app/docker/Dockerfile .
       - docker tag $TAG $GHCR
 
   post_build:

+ 7 - 5
packages/app/docker/codebuild/buildspec-manifest.yml

@@ -14,14 +14,16 @@ phases:
       - echo ${DOCKER_REGISTRY_PASSWORD} | docker login --username wsmoogle --password-stdin ${IMAGE_HOST}
   build:
     commands:
-      - export TMP_TAG="${IMAGE_HOST}${IMAGE_HOST:+/}${IMAGE_NAME}:${TAG_TMP}"
-      - export TMP_TAG_AMD64="${IMAGE_HOST}${IMAGE_HOST:+/}${IMAGE_NAME}:${TAG_TMP}-amd64"
-      - export TMP_TAG_ARM64="${IMAGE_HOST}${IMAGE_HOST:+/}${IMAGE_NAME}:${TAG_TMP}-arm64"
+      - export IMAGE="${IMAGE_HOST}${IMAGE_HOST:+/}${IMAGE_NAME}"
+      - export TMP_TAG="${IMAGE}:${TAG_TMP}"
+      - export TMP_TAG_AMD64="${IMAGE}:${TAG_TMP}-amd64"
+      - export TMP_TAG_ARM64="${IMAGE}:${TAG_TMP}-arm64"
       - docker manifest create ${TMP_TAG} ${TMP_TAG_AMD64} ${TMP_TAG_ARM64}
-      - bash ./tagging.sh --source-image "${TAG_TMP}" --target-image "${IMAGE_HOST}${IMAGE_HOST:+/}${IMAGE_NAME}" --tags "${TAGS}"
+      - bash ./tagging.sh --source-image "${TAG_TMP}" --target-image "${IMAGE}" --tags "${TAGS}"
 
   post_build:
     commands:
-      - docker manifest push ${IMAGE_TAG}
+      - docker image push--all-tags ${IMAGE}
+      # - docker manifest push ${TMP_TAG}
       # remove 
       # - docker run --rm -it lumir/remove-dockerhub-tag --user wsmoogle --pass ${DOCKER_REGISTRY_PASSWORD} ${TMP_TAG} ${TMP_TAG_AMD64} ${TMP_TAG_ARM64}