Commit 9bb9d579 authored by Kevin Daudt's avatar Kevin Daudt 💻

merge: docker-image: add support for x86

See merge request !3
parents 8b902377 df8921f2
Pipeline #180 passed with stage
in 23 seconds
...@@ -10,6 +10,11 @@ stages: ...@@ -10,6 +10,11 @@ stages:
script: script:
- docker build -t $CI_PROJECT_NAME:latest-$ARCH . - docker build -t $CI_PROJECT_NAME:latest-$ARCH .
.build_with_arch:
stage: build
script:
- docker build --build-arg ARCH=$DOCKER_ARCH/ -t $CI_PROJECT_NAME:latest-$ARCH .
build-s390x: build-s390x:
extends: .build extends: .build
variables: variables:
...@@ -26,6 +31,18 @@ build-x86_64: ...@@ -26,6 +31,18 @@ build-x86_64:
- docker-alpine - docker-alpine
- x86_64 - x86_64
build-x86:
extends: .build_with_arch
image:
name: alpinelinux/docker-cli:latest-x86
entrypoint: ["linux32", "sh", "-c"]
variables:
ARCH: x86
DOCKER_ARCH: i386
tags:
- docker-alpine
- x86
.upload: .upload:
stage: upload stage: upload
only: only:
...@@ -59,6 +76,16 @@ upload-x86_64: ...@@ -59,6 +76,16 @@ upload-x86_64:
- docker-alpine - docker-alpine
- x86_64 - x86_64
upload-x86:
extends: .build
image: alpinelinux/docker-cli:latest-x86
extends: .upload
variables:
ARCH: x86
tags:
- docker-alpine
- x86
create-manifest: create-manifest:
stage: manifest stage: manifest
variables: variables:
...@@ -76,10 +103,12 @@ create-manifest: ...@@ -76,10 +103,12 @@ create-manifest:
$DOCKER_NAMESPACE/$CI_PROJECT_NAME:latest- $DOCKER_NAMESPACE/$CI_PROJECT_NAME:latest-
s390x s390x
x86_64 x86_64
x86
- > - >
if [ -n "$CI_COMMIT_TAG" ]; then if [ -n "$CI_COMMIT_TAG" ]; then
docker-push-manifest $DOCKER_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_TAG docker-push-manifest $DOCKER_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_TAG
$DOCKER_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_TAG- $DOCKER_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_TAG-
s390x s390x
x86_64; x86_64;
x86
fi 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