|
|
@@ -7,8 +7,6 @@ variables:
|
|
|
APP_ENV: staging
|
|
|
SSH_PRIVATE_KEY: $SSH_PRIVATE_KEY
|
|
|
XDEBUG_MODE: coverage
|
|
|
- DOCKER_BUILDKIT: 0
|
|
|
- DOCKER_TLS_CERTDIR: ""
|
|
|
|
|
|
cache:
|
|
|
paths:
|
|
|
@@ -26,17 +24,6 @@ cache:
|
|
|
test_docker:
|
|
|
stage: build
|
|
|
image: docker:20.10
|
|
|
- services:
|
|
|
- - name: docker:19.03-dind
|
|
|
- alias: docker
|
|
|
- command:
|
|
|
- - "--storage-driver=overlay2"
|
|
|
- - "--tls=false"
|
|
|
- - "--cgroup-parent=/docker"
|
|
|
- - "--storage-opt=overlay2.override_kernel_check=true"
|
|
|
- variables:
|
|
|
- DOCKER_HOST: tcp://docker:2375
|
|
|
- DOCKER_TLS_VERIFY: 0
|
|
|
script:
|
|
|
- docker info
|
|
|
- docker version
|
|
|
@@ -44,19 +31,9 @@ test_docker:
|
|
|
build_image:
|
|
|
stage: build
|
|
|
image: docker:20.10
|
|
|
- services:
|
|
|
- - docker:20.10-dind
|
|
|
- variables:
|
|
|
- DOCKER_HOST: "unix:///runner/services/docker/docker.sock"
|
|
|
- DOCKER_DRIVER: overlay2
|
|
|
- DOCKER_TLS_CERTDIR: "/certs"
|
|
|
- DOCKER_DEBUG: 1
|
|
|
- CI_DEBUG_TRACE: "true"
|
|
|
before_script:
|
|
|
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
|
|
script:
|
|
|
- - docker version
|
|
|
- - docker info
|
|
|
- docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA .
|
|
|
- docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE:latest
|
|
|
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
Olivier Massot