Commit e53f596e authored by nanahira's avatar nanahira

improve

parent de3f46d7
Pipeline #4789 passed with stages
in 43 seconds
...@@ -37,19 +37,26 @@ combine: ...@@ -37,19 +37,26 @@ combine:
stage: combine stage: combine
tags: tags:
- docker - docker
variables:
SOURCE_IMAGE_1: $CONTAINER_TEST_X86_IMAGE
SOURCE_IMAGE_2: $CONTAINER_TEST_ARM_IMAGE
TARGET_IMAGE: $CONTAINER_TEST_IMAGE
script: script:
- docker pull $CONTAINER_TEST_X86_IMAGE - docker pull $SOURCE_IMAGE_1
- docker pull $CONTAINER_TEST_ARM_IMAGE - docker pull $SOURCE_IMAGE_2
- docker manifest create $CONTAINER_TEST_IMAGE --amend $CONTAINER_TEST_X86_IMAGE --amend $CONTAINER_TEST_ARM_IMAGE - docker manifest create $TARGET_IMAGE --amend $SOURCE_IMAGE_1 --amend $SOURCE_IMAGE_2
- docker manifest push $CONTAINER_TEST_IMAGE - docker manifest push $TARGET_IMAGE
deploy_latest: deploy_latest:
stage: deploy stage: deploy
tags: tags:
- docker - docker
variables:
SOURCE_IMAGE: $CONTAINER_TEST_IMAGE
TARGET_IMAGE: $CONTAINER_RELEASE_IMAGE
script: script:
- docker pull $CONTAINER_TEST_IMAGE - docker pull $SOURCE_IMAGE
- docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE - docker tag $SOURCE_IMAGE $TARGET_IMAGE
- docker push $CONTAINER_RELEASE_IMAGE - docker push $CONTAINER_RELEASE_IMAGE
only: only:
- master - master
...@@ -59,10 +66,11 @@ deploy_tag: ...@@ -59,10 +66,11 @@ deploy_tag:
tags: tags:
- docker - docker
variables: variables:
CONTAINER_TAG_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG SOURCE_IMAGE: $CONTAINER_TEST_IMAGE
TARGET_IMAGE: $$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
script: script:
- docker pull $CONTAINER_TEST_IMAGE - docker pull $SOURCE_IMAGE
- docker tag $CONTAINER_TEST_IMAGE $CONTAINER_TAG_IMAGE - docker tag $SOURCE_IMAGE $TARGET_IMAGE
- docker push $CONTAINER_TAG_IMAGE - docker push $CONTAINER_RELEASE_IMAGE
only: only:
- tags - tags
...@@ -37,19 +37,26 @@ combine: ...@@ -37,19 +37,26 @@ combine:
stage: combine stage: combine
tags: tags:
- docker - docker
variables:
SOURCE_IMAGE_1: $CONTAINER_TEST_X86_IMAGE
SOURCE_IMAGE_2: $CONTAINER_TEST_ARM_IMAGE
TARGET_IMAGE: $CONTAINER_TEST_IMAGE
script: script:
- docker pull $CONTAINER_TEST_X86_IMAGE - docker pull $SOURCE_IMAGE_1
- docker pull $CONTAINER_TEST_ARM_IMAGE - docker pull $SOURCE_IMAGE_2
- docker manifest create $CONTAINER_TEST_IMAGE --amend $CONTAINER_TEST_X86_IMAGE --amend $CONTAINER_TEST_ARM_IMAGE - docker manifest create $TARGET_IMAGE --amend $SOURCE_IMAGE_1 --amend $SOURCE_IMAGE_2
- docker manifest push $CONTAINER_TEST_IMAGE - docker manifest push $TARGET_IMAGE
deploy_latest: deploy_latest:
stage: deploy stage: deploy
tags: tags:
- docker - docker
variables:
SOURCE_IMAGE: $CONTAINER_TEST_IMAGE
TARGET_IMAGE: $CONTAINER_RELEASE_IMAGE
script: script:
- docker pull $CONTAINER_TEST_IMAGE - docker pull $SOURCE_IMAGE
- docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE - docker tag $SOURCE_IMAGE $TARGET_IMAGE
- docker push $CONTAINER_RELEASE_IMAGE - docker push $CONTAINER_RELEASE_IMAGE
only: only:
- master - master
...@@ -59,10 +66,11 @@ deploy_tag: ...@@ -59,10 +66,11 @@ deploy_tag:
tags: tags:
- docker - docker
variables: variables:
CONTAINER_TAG_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG SOURCE_IMAGE: $CONTAINER_TEST_IMAGE
TARGET_IMAGE: $$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
script: script:
- docker pull $CONTAINER_TEST_IMAGE - docker pull $SOURCE_IMAGE
- docker tag $CONTAINER_TEST_IMAGE $CONTAINER_TAG_IMAGE - docker tag $SOURCE_IMAGE $TARGET_IMAGE
- docker push $CONTAINER_TAG_IMAGE - docker push $CONTAINER_RELEASE_IMAGE
only: only:
- tags - tags
...@@ -37,19 +37,26 @@ combine: ...@@ -37,19 +37,26 @@ combine:
stage: combine stage: combine
tags: tags:
- docker - docker
variables:
SOURCE_IMAGE_1: $CONTAINER_TEST_X86_IMAGE
SOURCE_IMAGE_2: $CONTAINER_TEST_ARM_IMAGE
TARGET_IMAGE: $CONTAINER_TEST_IMAGE
script: script:
- docker pull $CONTAINER_TEST_X86_IMAGE - docker pull $SOURCE_IMAGE_1
- docker pull $CONTAINER_TEST_ARM_IMAGE - docker pull $SOURCE_IMAGE_2
- docker manifest create $CONTAINER_TEST_IMAGE --amend $CONTAINER_TEST_X86_IMAGE --amend $CONTAINER_TEST_ARM_IMAGE - docker manifest create $TARGET_IMAGE --amend $SOURCE_IMAGE_1 --amend $SOURCE_IMAGE_2
- docker manifest push $CONTAINER_TEST_IMAGE - docker manifest push $TARGET_IMAGE
deploy_latest: deploy_latest:
stage: deploy stage: deploy
tags: tags:
- docker - docker
variables:
SOURCE_IMAGE: $CONTAINER_TEST_IMAGE
TARGET_IMAGE: $CONTAINER_RELEASE_IMAGE
script: script:
- docker pull $CONTAINER_TEST_IMAGE - docker pull $SOURCE_IMAGE
- docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE - docker tag $SOURCE_IMAGE $TARGET_IMAGE
- docker push $CONTAINER_RELEASE_IMAGE - docker push $CONTAINER_RELEASE_IMAGE
only: only:
- master - master
...@@ -59,10 +66,11 @@ deploy_tag: ...@@ -59,10 +66,11 @@ deploy_tag:
tags: tags:
- docker - docker
variables: variables:
CONTAINER_TAG_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG SOURCE_IMAGE: $CONTAINER_TEST_IMAGE
TARGET_IMAGE: $$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
script: script:
- docker pull $CONTAINER_TEST_IMAGE - docker pull $SOURCE_IMAGE
- docker tag $CONTAINER_TEST_IMAGE $CONTAINER_TAG_IMAGE - docker tag $SOURCE_IMAGE $TARGET_IMAGE
- docker push $CONTAINER_TAG_IMAGE - docker push $CONTAINER_RELEASE_IMAGE
only: only:
- tags - tags
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment