From 7290ce05e01225db8f5cc8417275791ba5f10758 Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Mon, 9 Dec 2019 15:37:52 +0100
Subject: [PATCH] Add manual login as gitlab-ci ignores DOCKER_AUTH_CONFIG for
manual pushes
---
.gitlab-ci.yml | 4 ++++
pica-ci-base/Dockerfile | 20 ++++++++++----------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 47a1fbe6..0f9e87de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,9 +33,13 @@ stages:
pica-ci-base:
stage: ci-base
tags: [build]
+ before_script:
+ - echo $REGISTRY_PROD_PASSWORD | docker login $REGISTRY_PROD -u $REGISTRY_PROD_USERNAME --password-stdin
script:
- docker build -f pica-ci-base/Dockerfile . -t $REGISTRY_PROD/pica-ci-base:latest
- docker push $REGISTRY_PROD/pica-ci-base:latest
+ after_script:
+ - docker logout $REGISTRY_PROD
only:
changes:
- "pica-ci-base/*"
diff --git a/pica-ci-base/Dockerfile b/pica-ci-base/Dockerfile
index 669fc762..27362e26 100644
--- a/pica-ci-base/Dockerfile
+++ b/pica-ci-base/Dockerfile
@@ -1,12 +1,12 @@
FROM docker:19.03.0
RUN apk update && \
- apk add build-base \
- git \
- iproute2 \
- libffi-dev \
- openssl-dev \
- py-pip \
- python2-dev \
- sed \
- wget \
- && pip install docker-compose
+ apk add build-base \
+ git \
+ iproute2 \
+ libffi-dev \
+ openssl-dev \
+ py-pip \
+ python2-dev \
+ sed \
+ wget \
+ && pip install docker-compose
--
GitLab