1
0
Fork 0

fix(build): tag images with architecture

This commit is contained in:
ssube 2019-10-30 18:53:44 -05:00 committed by Sean Sube
parent 1304cf5f02
commit d2c50a1353
2 changed files with 27 additions and 12 deletions

View File

@ -36,6 +36,7 @@ stages:
allow_failure: false allow_failure: false
.build-docker: &build-docker .build-docker: &build-docker
stage: image
image: docker:18.09.9 image: docker:18.09.9
services: services:
- docker:18.09.9-dind - docker:18.09.9-dind
@ -50,11 +51,13 @@ stages:
- echo "${DOCKER_SECRET}" | base64 -d > ${HOME}/.docker/config.json - echo "${DOCKER_SECRET}" | base64 -d > ${HOME}/.docker/config.json
- docker info - docker info
script: script:
- docker build -t $IMAGE_TAG . - docker build -f Dockerfile.${IMAGE_ARCH} -t ${IMAGE_TAG}-${IMAGE_ARCH} .
- docker push $IMAGE_TAG - docker push ${IMAGE_TAG}-${IMAGE_ARCH}
after_script: after_script:
- rm -rfv ${HOME}/.docker - rm -rfv ${HOME}/.docker
dependencies:
- build-node
variables: &vars-docker variables: &vars-docker
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_HOST: tcp://localhost:2375 DOCKER_HOST: tcp://localhost:2375
@ -98,28 +101,40 @@ build-node:
- node_modules - node_modules
- out/cache - out/cache
build-image-branch: .build-image-alpine-branch:
<<: [*build-docker] <<: [*build-docker]
stage: image
except: except:
- tags - tags
dependencies:
- build-node
variables: variables:
<<: [*vars-docker] <<: [*vars-docker]
IMAGE_ARCH: alpine
IMAGE_TAG: "ssube/salty-dog:${CI_COMMIT_REF_SLUG}" IMAGE_TAG: "ssube/salty-dog:${CI_COMMIT_REF_SLUG}"
build-image-tag: .build-image-alpine-tag:
<<: [*build-docker] <<: [*build-docker]
stage: image
only: only:
- tags - tags
dependencies:
- build-node
variables: variables:
<<: [*vars-docker] <<: [*vars-docker]
IMAGE_ARCH: alpine
IMAGE_TAG: "ssube/salty-dog:${CI_COMMIT_TAG}"
build-image-stretch-branch:
<<: [*build-docker]
except:
- tags
variables:
<<: [*vars-docker]
IMAGE_ARCH: stretch
IMAGE_TAG: "ssube/salty-dog:${CI_COMMIT_REF_SLUG}"
build-image-stretch-tag:
<<: [*build-docker]
only:
- tags
variables:
<<: [*vars-docker]
IMAGE_ARCH: stretch
IMAGE_TAG: "ssube/salty-dog:${CI_COMMIT_TAG}" IMAGE_TAG: "ssube/salty-dog:${CI_COMMIT_TAG}"
# publish jobs # publish jobs