#84 www-data owner of source files

Signed-off-by: Fabio Kruger <redacted>

diff --git a/apache/Dockerfile b/apache/Dockerfile
index 25eab9472eaacf41ab291553f792632e6eaf22e5..97c93a4237a3a50dbcd811bcefdf2ec99c1107f7 100644 (file)
--- 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 0cd49e982577b1551a4e7504b50a16397725b526..3d900cc154a5ee783ef09b2f71ecb52cd065bd70 100644 (file)
--- 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 97484b5057ca2380b18599222da3bfd97adc656e..30b15bfbc9c2eaeaab45dc147e04c7c00d0181b3 100644 (file)
--- 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