Commit 8b902377 authored by Kevin Daudt's avatar Kevin Daudt

merge: docker-image: use scripts provided by docker-cli

See merge request !2
parents 4ec9cd5e f86a473f
Pipeline #120 passed with stage
in 26 seconds
......@@ -30,11 +30,18 @@ build-x86_64:
stage: upload
only:
- master
- tags
before_script:
- docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
script:
- docker tag $CI_PROJECT_NAME:latest-$ARCH alpinelinux/$CI_PROJECT_NAME:latest-$ARCH
- docker push alpinelinux/$CI_PROJECT_NAME:latest-$ARCH
- >
docker-push-image
$CI_PROJECT_NAME:latest-$ARCH $DOCKER_NAMESPACE/$CI_PROJECT_NAME:latest-$ARCH
- >
if [ -n "$CI_COMMIT_TAG" ]; then
docker-push-image
$CI_PROJECT_NAME:latest-$ARCH $DOCKER_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_TAG-$ARCH;
fi
upload-s390x:
extends: .upload
......@@ -58,13 +65,21 @@ create-manifest:
DOCKER_CLI_EXPERIMENTAL: enabled
only:
- master
- tags
tags:
- docker-alpine
before_script:
- docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
script:
- >
docker manifest create --amend alpinelinux/$CI_PROJECT_NAME:latest
alpinelinux/$CI_PROJECT_NAME:latest-s390x
alpinelinux/$CI_PROJECT_NAME:latest-x86_64
- docker manifest push --purge alpinelinux/$CI_PROJECT_NAME:latest
docker-push-manifest $DOCKER_NAMESPACE/$CI_PROJECT_NAME:latest
$DOCKER_NAMESPACE/$CI_PROJECT_NAME:latest-
s390x
x86_64
- >
if [ -n "$CI_COMMIT_TAG" ]; then
docker-push-manifest $DOCKER_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_TAG
$DOCKER_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_TAG-
s390x
x86_64;
fi
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