Updated .gitlab-ci.yml

This commit is contained in:
Deon George 2019-05-21 22:39:35 +10:00
parent 023d516455
commit 4b2481b7be

View File

@ -1,34 +1,24 @@
image: docker:latest
stages:
- test
- build
variables:
VERSION: latest
CACHETAG: build
DOCKER_HOST: tcp://${CI_REGISTRY}-leenooks-ci-docker:2375
CACHETAG: build-${VERSION}
DOCKER_HOST: tcp://docker:2375
services:
- ${CI_REGISTRY}/leenooks/ci-docker:dind
- docker:dind
before_script:
- docker info
- docker version
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
test:
stage: test
script:
- cat /etc/hosts
- env|sort
- docker build -t ${CI_REGISTRY_IMAGE}:${VERSION} .
- docker images
only:
- debug
build:
x86_64:build:
variables:
VERSION: x86_64
stage: build
image: docker:latest
script:
- if [ -f init ]; then chmod 500 init; fi
- docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
@ -37,5 +27,23 @@ build:
- docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
tags:
- docker
- x86_64
only:
- master
armv7l:build:
variables:
VERSION: armv7l
stage: build
image: docker:latest
script:
- if [ -f init ]; then chmod 500 init; fi
- docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
- docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
- docker push ${CI_REGISTRY_IMAGE}:${VERSION}
- docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
tags:
- docker
- armv7l
only:
- master