NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 10:02:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'leipert-use-gitlab-org-runners' into 'master'

Browse source 
Use gitlab-org runners per default

See merge request gitlab-org/gitlab-build-images!287
This commit is contained in:
Rémy Coutable 2020-04-16 09:49:33 +00:00
commit c9f39f3f12
1 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

27
.gitlab-ci.yml
View file

@ -1,22 +1,23 @@
image: docker:git default:
image: docker:git
services:
- docker:19.03.0-dind
before_script:
- docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" "$CI_REGISTRY"
- source scripts/build-helpers.sh
tags:
- gitlab-org-docker
stages: stages:
- build - build
- test - test
- automation - automation
services:
- docker:19.03.0-dind
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_HOST: tcp://docker:2375 DOCKER_HOST: tcp://docker:2375
FORCE_BUILD: "false" FORCE_BUILD: "false"
before_script:
- docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" "$CI_REGISTRY"
- source scripts/build-helpers.sh
.test_build: &test_build .test_build: &test_build
stage: test stage: test
script: script:
@ -26,8 +27,6 @@ before_script:
- docker build -f "Dockerfile.$1" . - docker build -f "Dockerfile.$1" .
except: except:
- master - master
tags:
- docker
.build_and_deploy: &build_and_deploy .build_and_deploy: &build_and_deploy
stage: build stage: build
@ -36,8 +35,6 @@ before_script:
- docker push "$CI_REGISTRY_IMAGE:$CI_JOB_NAME" - docker push "$CI_REGISTRY_IMAGE:$CI_JOB_NAME"
only: only:
- master - master
tags:
- docker
.test_custom: &test_custom .test_custom: &test_custom
stage: test stage: test
@ -48,8 +45,6 @@ before_script:
- ./scripts/custom-docker-build $1 - ./scripts/custom-docker-build $1
except: except:
- master - master
tags:
- docker
.build_and_deploy_custom: &build_and_deploy_custom .build_and_deploy_custom: &build_and_deploy_custom
stage: build stage: build
@ -58,8 +53,6 @@ before_script:
- push_if_needed "$CI_REGISTRY_IMAGE:$CI_JOB_NAME" - push_if_needed "$CI_REGISTRY_IMAGE:$CI_JOB_NAME"
only: only:
- master - master
tags:
- docker
# Tests # Tests