From 79ef08f7e7486cf7ceaa642aad4046f0e489790b Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Mon, 9 Dec 2019 17:00:27 +0100
Subject: [PATCH] Use pica-ci-base for set-variables job as we need git
---
.gitlab-ci.yml | 1 +
pica-etherpad/entrypoint.sh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f9e87de..1a7e5d9f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,6 +52,7 @@ pica-ci-base:
set-variables:
stage: ci-base
tags: [build]
+ image: $REGISTRY_PROD/pica-ci-base
script:
- chmod +x ./get-modified-image.sh
- ./get-modified-image.sh
diff --git a/pica-etherpad/entrypoint.sh b/pica-etherpad/entrypoint.sh
index ad3980aa..eda98879 100644
--- a/pica-etherpad/entrypoint.sh
+++ b/pica-etherpad/entrypoint.sh
@@ -28,7 +28,7 @@ RESULT=`mysql -u${ETHERPAD_DB_USER} -p${ETHERPAD_DB_PASSWORD} \
-e "SHOW DATABASES LIKE '${ETHERPAD_DB_NAME}'"`
if [ "$RESULT" != $ETHERPAD_DB_NAME ]; then
- # mysql database does not exist, create it
+ # Mysql database does not exist, create it
echo "Creating database ${ETHERPAD_DB_NAME}"
mysql -u${ETHERPAD_DB_USER} -p${ETHERPAD_DB_PASSWORD} -h${ETHERPAD_DB_HOST} \
--
GitLab