move base image and variables out
This commit is contained in:
@@ -1,3 +1,12 @@
|
||||
image: docker:18.09.7-dind
|
||||
services:
|
||||
- docker:18.09.7-dind
|
||||
variables:
|
||||
DOCKER_DRIVER: overlay
|
||||
DOCKER_HOST: tcp://localhost:2375/
|
||||
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
|
||||
FF_GITLAB_REGISTRY_HELPER_IMAGE: 1
|
||||
|
||||
stages:
|
||||
- build
|
||||
- push
|
||||
@@ -9,16 +18,16 @@ before_script:
|
||||
|
||||
build:
|
||||
stage: build
|
||||
image: docker:18.09.7-dind
|
||||
services:
|
||||
- docker:18.09.7-dind
|
||||
variables:
|
||||
DOCKER_DRIVER: overlay
|
||||
DOCKER_HOST: tcp://localhost:2375/
|
||||
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
|
||||
FF_GITLAB_REGISTRY_HELPER_IMAGE: 1
|
||||
before_script:
|
||||
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
||||
# image: docker:18.09.7-dind
|
||||
# services:
|
||||
# - docker:18.09.7-dind
|
||||
# variables:
|
||||
# DOCKER_DRIVER: overlay
|
||||
# DOCKER_HOST: tcp://localhost:2375/
|
||||
# IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
|
||||
# FF_GITLAB_REGISTRY_HELPER_IMAGE: 1
|
||||
# before_script:
|
||||
# - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
||||
script:
|
||||
- docker build --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA ./Docker/
|
||||
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
||||
|
||||
Reference in New Issue
Block a user