deon/tsmpipe
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed source image for ci

Browse Source
This commit is contained in:
Deon George 2017-11-29 15:32:04 +11:00
parent da6b7accbb
commit c6694fe6de
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@ -1,6 +1,9 @@
services: services:
- ${DOCKER_REGISTRY}/leenooks/ci-docker:dind - ${DOCKER_REGISTRY}/leenooks/ci-docker:dind
variables:
DOCKER_REGISTRY: registry.leenooks.net
stages: stages:
- build - build
- test - test
@ -9,7 +12,7 @@ stages:
# For some reason compiling on CentOS 6.x results in buffer corruption # For some reason compiling on CentOS 6.x results in buffer corruption
build:6-7.1: build:6-7.1:
stage: build stage: build
image: leenooks/ci-tsm:6-7.1 image: ${DOCKER_REGISTRY}/leenooks/ci-tsm:6-7.1
script: script:
- make -f Makefile.linux64 - make -f Makefile.linux64
only: only:
@ -23,7 +26,7 @@ build:6-7.1:
test:6-7.1: test:6-7.1:
stage: test stage: test
image: leenooks/ci-tsm:6-7.1 image: ${DOCKER_REGISTRY}/leenooks/ci-tsm:6-7.1
dependencies: dependencies:
- build:6-7.1 - build:6-7.1
script: 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 # Compile on CentOS 6.x, for some reason compiling on CentOS 7.x results in buffer corruption
build:7-8.1: build:7-8.1:
stage: build stage: build
image: leenooks/ci-tsm:7-8.1 image: ${DOCKER_REGISTRY}/leenooks/ci-tsm:7-8.1
script: script:
- make -f Makefile.linux64 - make -f Makefile.linux64
only: only:
@ -50,7 +53,7 @@ build:7-8.1:
test:7-8.1: test:7-8.1:
stage: test stage: test
image: leenooks/ci-tsm:7-8.1 image: ${DOCKER_REGISTRY}/leenooks/ci-tsm:7-8.1
dependencies: dependencies:
- build:7-8.1 - build:7-8.1
script: script:
@ -70,7 +73,6 @@ docker:7-8.1:
variables: variables:
VERSION: 8.1.0 VERSION: 8.1.0
DOCKER_IMAGE: deon/tsmpipe DOCKER_IMAGE: deon/tsmpipe
DOCKER_REGISTRY: registry.leenooks.net
DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375 DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375
dependencies: dependencies:
- test:7-8.1 - test:7-8.1