From a173eb3aa2231427a0f7024b88761386f11e60fd Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Sun, 24 Nov 2019 21:12:01 +0100
Subject: [PATCH] Keep pica-ci-base on production registry and pica-ci:<hash>
on test registry
---
.gitlab-ci.yml | 3 ++-
pica-ci/Dockerfile | 2 +-
pica-dokuwiki/Dockerfile | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1af6816..81c95cc9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,9 +40,10 @@ pica-ci-base:
metabuid:
stage: metabuild
before_script:
- - echo $REGISTRY_PASSWORD | docker login $REGISTRY -u $REGISTRY_USERNAME --password-stdin
+ - echo $REGISTRY_PROD_PASSWORD | docker login $REGISTRY_PROD -u $REGISTRY_PROD_USERNAME --password-stdin
script:
- docker build -f pica-ci/Dockerfile . -t $REGISTRY/pica-ci:$CI_COMMIT_SHA
+ - echo $REGISTRY_PASSWORD | docker login $REGISTRY -u $REGISTRY_USERNAME --password-stdin
- docker push $REGISTRY/pica-ci:$CI_COMMIT_SHA
after_script:
- docker logout $REGISTRY
diff --git a/pica-ci/Dockerfile b/pica-ci/Dockerfile
index 24336e01..71a72753 100644
--- a/pica-ci/Dockerfile
+++ b/pica-ci/Dockerfile
@@ -1,5 +1,5 @@
FROM registry.picasoft.net/pica-ci-base:latest
-&
+
WORKDIR /workdir
COPY . /workdir/
diff --git a/pica-dokuwiki/Dockerfile b/pica-dokuwiki/Dockerfile
index 3189923a..b75a790f 100644
--- a/pica-dokuwiki/Dockerfile
+++ b/pica-dokuwiki/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx
+FROM nginx:stable
LABEL maintainer="antoine@barbare.me"
COPY --chown=www-data nginx.conf /etc/nginx/nginx.conf
--
GitLab