From a796d56b0c172f74b706e6a2daa3e4206bde2ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Fri, 31 Mar 2023 10:58:21 +0200
Subject: [PATCH] fix docker builds
---
.gitlab-ci.yml | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c970de17b..497052f6e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -157,13 +157,11 @@ releases:x64:
.docker-build-app-image:
stage: package
- image: docker:18.06
+ image: docker:git
tags:
- - redshift
- services:
- - docker:18.06-dind
+ - docker
before_script:
- - docker info
+ - git config --global --add safe.directory /builds/nodes/typescript/duniter
script:
- docker pull $CI_REGISTRY_IMAGE:$IMAGE_TAG || true
- docker build --cache-from $CI_REGISTRY_IMAGE:$IMAGE_TAG --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" --build-arg="INSTALL_DEX=$INSTALL_DEX" -f release/docker/Dockerfile .
@@ -201,11 +199,9 @@ package:prod:docker:
stage: package
rules:
- if: $CI_COMMIT_TAG
- image: docker:18.06
+ image: docker:git
tags:
- - redshift
- services:
- - docker:18.06-dind
+ - docker
script:
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" -f release/docker/Dockerfile .
- docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
--
GitLab