From: Fabio Kruger <redacted>
Date: Fri, 27 Mar 2020 21:40:51 +0000 (+0100)
Subject: #84 www-data owner of source files
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=6c0557a7406d19c4f8983c7bb177b7ed3edb9edf;p=roundcube-roundcubemail-docker.git

#84 www-data owner of source files

Signed-off-by: Fabio Kruger <redacted>
---

diff --git a/apache/Dockerfile b/apache/Dockerfile
index 25eab94..97c93a4 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -70,12 +70,12 @@ RUN set -ex; \
 	# ha.pool.sks-keyservers.net seems to be unreliable, use pgp.mit.edu as fallback
 	gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5 || gpg --batch --keyserver pgp.mit.edu --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \
 	gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
-	tar -xf roundcubemail.tar.gz -C /usr/src/; \
 	gpgconf --kill all; \
+  mkdir /usr/src/roundcubemail; \
+	tar -xf roundcubemail.tar.gz -C /usr/src/roundcubemail --strip-components=1; \
 	rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
-	# upstream tarballs include ./roundcubemail-${ROUNDCUBEMAIL_VERSION}/ so this gives us /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION}
-	mv /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION} /usr/src/roundcubemail; \
-	rm -rf /usr/src/roundcubemail/installer
+	rm -rf /usr/src/roundcubemail/installer; \
+  chown -R www-data:www-data /usr/src/roundcubemail/
 
 # include the wait-for-it.sh script
 RUN curl -fL https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /wait-for-it.sh && chmod +x /wait-for-it.sh
diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
index 0cd49e9..3d900cc 100644
--- a/fpm-alpine/Dockerfile
+++ b/fpm-alpine/Dockerfile
@@ -65,12 +65,12 @@ RUN set -ex; \
 	# ha.pool.sks-keyservers.net seems to be unreliable, use pgp.mit.edu as fallback
 	gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5 || gpg --batch --keyserver pgp.mit.edu --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \
 	gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
-	tar -xf roundcubemail.tar.gz -C /usr/src/; \
 	gpgconf --kill all; \
+	mkdir /usr/src/roundcubemail; \
+	tar -xf roundcubemail.tar.gz -C /usr/src/roundcubemail --strip-components=1; \
 	rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
-	# upstream tarballs include ./roundcubemail-${ROUNDCUBEMAIL_VERSION}/ so this gives us /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION}
-	mv /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION} /usr/src/roundcubemail; \
 	rm -rf /usr/src/roundcubemail/installer; \
+	chown -R www-data:www-data /usr/src/roundcubemail/; \
 	apk del .fetch-deps
 
 # include the wait-for-it.sh script
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index 97484b5..30b15bf 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -68,12 +68,12 @@ RUN set -ex; \
 	# ha.pool.sks-keyservers.net seems to be unreliable, use pgp.mit.edu as fallback
 	gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5 || gpg --batch --keyserver pgp.mit.edu --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \
 	gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
-	tar -xf roundcubemail.tar.gz -C /usr/src/; \
 	gpgconf --kill all; \
+  mkdir /usr/src/roundcubemail; \
+	tar -xf roundcubemail.tar.gz -C /usr/src/roundcubemail --strip-components=1; \
 	rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
-	# upstream tarballs include ./roundcubemail-${ROUNDCUBEMAIL_VERSION}/ so this gives us /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION}
-	mv /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION} /usr/src/roundcubemail; \
-	rm -rf /usr/src/roundcubemail/installer
+	rm -rf /usr/src/roundcubemail/installer; \
+  chown -R www-data:www-data /usr/src/roundcubemail/
 
 # include the wait-for-it.sh script
 RUN curl -fL https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /wait-for-it.sh && chmod +x /wait-for-it.sh