From c6694fe6deae0da0d7e47c5efad708c31f0e7474 Mon Sep 17 00:00:00 2001 From: Deon George Date: Wed, 29 Nov 2017 15:32:04 +1100 Subject: [PATCH] Changed source image for ci --- .gitlab-ci.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b952d23..031dcfc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,9 @@ services: - ${DOCKER_REGISTRY}/leenooks/ci-docker:dind +variables: + DOCKER_REGISTRY: registry.leenooks.net + stages: - build - test @@ -9,7 +12,7 @@ stages: # For some reason compiling on CentOS 6.x results in buffer corruption build:6-7.1: stage: build - image: leenooks/ci-tsm:6-7.1 + image: ${DOCKER_REGISTRY}/leenooks/ci-tsm:6-7.1 script: - make -f Makefile.linux64 only: @@ -23,7 +26,7 @@ build:6-7.1: test:6-7.1: stage: test - image: leenooks/ci-tsm:6-7.1 + image: ${DOCKER_REGISTRY}/leenooks/ci-tsm:6-7.1 dependencies: - build:6-7.1 script: @@ -36,7 +39,7 @@ test:6-7.1: # Compile on CentOS 6.x, for some reason compiling on CentOS 7.x results in buffer corruption build:7-8.1: stage: build - image: leenooks/ci-tsm:7-8.1 + image: ${DOCKER_REGISTRY}/leenooks/ci-tsm:7-8.1 script: - make -f Makefile.linux64 only: @@ -50,7 +53,7 @@ build:7-8.1: test:7-8.1: stage: test - image: leenooks/ci-tsm:7-8.1 + image: ${DOCKER_REGISTRY}/leenooks/ci-tsm:7-8.1 dependencies: - build:7-8.1 script: @@ -70,7 +73,6 @@ docker:7-8.1: variables: VERSION: 8.1.0 DOCKER_IMAGE: deon/tsmpipe - DOCKER_REGISTRY: registry.leenooks.net DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375 dependencies: - test:7-8.1