From 6bd5e2efc58c79b97bec805de7b7c6e2e288b439 Mon Sep 17 00:00:00 2001
From: Adrien le Maire <adrien@alemaire.be>
Date: Wed, 10 Feb 2021 09:48:56 +0000
Subject: [PATCH] Update roundcubemail/Dockerfile, .gitlab-ci.yml files

---
 .gitlab-ci.yml           | 28 ++++++++++++++++++++++++++++
 roundcubemail/Dockerfile |  6 ++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7636f4..8d21d52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,8 @@ dev-minio:
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "false"
+    changes:
+      - minio/*
 
 minio:
   stage: build
@@ -28,6 +30,8 @@ minio:
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "true"
+    changes:
+      - minio/*
 
 dev-watchdog:
   stage: build
@@ -39,6 +43,8 @@ dev-watchdog:
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "false"
+    changes:
+      - watchdog/*
 
 watchdog:
   stage: build
@@ -50,6 +56,8 @@ watchdog:
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "true"
+    changes:
+      - watchdog/*
 
 dev-unifi:
   stage: build
@@ -61,6 +69,8 @@ dev-unifi:
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "false"
+    changes:
+      - unifi/*
 
 unifi:
   stage: build
@@ -72,6 +82,8 @@ unifi:
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "true"
+    changes:
+      - unifi/*
 
 dev-keycloak:
   stage: build
@@ -83,6 +95,8 @@ dev-keycloak:
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "false"
+    changes:
+      - keycloak/*
 
 keycloak:
   stage: build
@@ -94,6 +108,8 @@ keycloak:
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "true"
+    changes:
+      - keycloak/*
 
 dev-restic:
   stage: build
@@ -105,6 +121,8 @@ dev-restic:
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "false"
+    changes:
+      - restic/*
 
 restic:
   stage: build
@@ -116,6 +134,8 @@ restic:
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "true"
+    changes:
+      - restic/*
 
 pleroma:
   stage: build
@@ -127,6 +147,8 @@ pleroma:
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "true"
+    changes:
+      - pleroma/*
 
 dendrite:
   stage: build
@@ -138,6 +160,8 @@ dendrite:
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "true"
+    changes:
+      - dendrite/*
 
 roundcubemail:
   stage: build
@@ -149,6 +173,8 @@ roundcubemail:
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "true"
+    changes:
+      - roundcubemail/*
 
 borg:
   stage: build
@@ -160,6 +186,8 @@ borg:
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "true"
+    changes:
+      - borg/*
 
 .docker_init: &docker_init |
   if ! docker info &>/dev/null; then
diff --git a/roundcubemail/Dockerfile b/roundcubemail/Dockerfile
index c8d0e11..64367da 100644
--- a/roundcubemail/Dockerfile
+++ b/roundcubemail/Dockerfile
@@ -19,10 +19,12 @@ RUN set -ex; \
 		dirmngr \
 		locales \
 		libc-l10n \
-		ca-certificates \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
-	a2enmod rewrite
+	a2enmod rewrite; \
+	curl -fLSko /etc/ssl/certs/cacert.pem https://curl.se/ca/cacert.pem
+
+ENV CURL_CA_BUNDLE=/etc/ssl/certs/cacert.pem
 
 # install composer
 RUN set -ex; \