Skip to content
Snippets Groups Projects
Unverified Commit a796d56b authored by Ismaël Bouya's avatar Ismaël Bouya
Browse files

fix docker builds

parent a03e7e9a
Branches
No related tags found
1 merge request!1413fix docker builds
Pipeline #19126 passed
Stage: tests
Stage: package
Stage: quality
Stage: integration
Show whitespace changes
Inline Side-by-side
Showing
with 5 additions and 9 deletions
.gitlab-ci.yml
+ 5
− 9
View file @ a796d56b
...@@ -157,13 +157,11 @@ releases:x64: ...@@ -157,13 +157,11 @@ releases:x64:
.docker-build-app-image: .docker-build-app-image:
stage: package stage: package
image: docker:18.06 image: docker:git
tags: tags:
- redshift - docker
services:
- docker:18.06-dind
before_script: before_script:
- docker info - git config --global --add safe.directory /builds/nodes/typescript/duniter
script: script:
- docker pull $CI_REGISTRY_IMAGE:$IMAGE_TAG || true - 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 . - 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: ...@@ -201,11 +199,9 @@ package:prod:docker:
stage: package stage: package
rules: rules:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
image: docker:18.06 image: docker:git
tags: tags:
- redshift - docker
services:
- docker:18.06-dind
script: script:
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" -f release/docker/Dockerfile . - 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 - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment