Skip to content
Snippets Groups Projects
Commit 32535a31 authored by Bastien DUMONT's avatar Bastien DUMONT :angel:
Browse files

Merge branch 'fix/docker-build' into 'dev'

chore: fix docker build

See merge request !159
parents 670d3752 dde1054c
Branches
No related tags found
2 merge requests!167chore(release): Ecolyo 3.1.0,!159chore: fix docker build
Pipeline #104859 passed
default: default:
services: services:
- name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:20.10.9-dind - name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:25-dind
alias: docker alias: docker
tags: tags:
- build-push-to-registry - build-push-to-registry
...@@ -28,10 +28,13 @@ build-test: ...@@ -28,10 +28,13 @@ build-test:
- merge_requests - merge_requests
build-push: build-push:
image: docker:18.09
services:
- docker:18.09-dind
stage: build-push stage: build-push
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:25
variables:
DOCKER_TLS_CERTDIR: ''
DOCKER_HOST: tcp://docker:2375/
DOCKER_DRIVER: overlay2
needs: []
only: only:
- master - master
- dev - dev
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment