diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index d53d61e..9135dc1 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -63,11 +63,11 @@ VOLUME /var/www/html # Define Joomla version and expected SHA1 signature ENV JOOMLA_VERSION %%VERSION%% -ENV JOOMLA_SHA1 %%SHA1%% +ENV JOOMLA_SHA512 %%SHA512%% # Download package and extract to web volume RUN curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2 \ - && echo "$JOOMLA_SHA1 *joomla.tar.bz2" | sha1sum -c - \ + && echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c - \ && mkdir /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && rm joomla.tar.bz2 \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 85c6446..726b979 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -63,13 +63,13 @@ RUN set -ex; \ VOLUME /var/www/html -# Define Joomla version and expected SHA1 signature +# Define Joomla version and expected SHA512 signature ENV JOOMLA_VERSION %%VERSION%% -ENV JOOMLA_SHA1 %%SHA1%% +ENV JOOMLA_SHA512 %%SHA512%% # Download package and extract to web volume RUN curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2 \ - && echo "$JOOMLA_SHA1 *joomla.tar.bz2" | sha1sum -c - \ + && echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c - \ && mkdir /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && rm joomla.tar.bz2 \ diff --git a/php7.1/apache/Dockerfile b/php7.1/apache/Dockerfile index 1be80fb..c9b3928 100644 --- a/php7.1/apache/Dockerfile +++ b/php7.1/apache/Dockerfile @@ -65,13 +65,13 @@ RUN set -ex; \ VOLUME /var/www/html -# Define Joomla version and expected SHA1 signature +# Define Joomla version and expected SHA512 signature ENV JOOMLA_VERSION 3.9.1 -ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 +ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9 # Download package and extract to web volume RUN curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2 \ - && echo "$JOOMLA_SHA1 *joomla.tar.bz2" | sha1sum -c - \ + && echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c - \ && mkdir /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && rm joomla.tar.bz2 \ diff --git a/php7.1/fpm-alpine/Dockerfile b/php7.1/fpm-alpine/Dockerfile index f3a46ce..7e18fd8 100644 --- a/php7.1/fpm-alpine/Dockerfile +++ b/php7.1/fpm-alpine/Dockerfile @@ -62,11 +62,11 @@ VOLUME /var/www/html # Define Joomla version and expected SHA1 signature ENV JOOMLA_VERSION 3.9.1 -ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 +ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9 # Download package and extract to web volume RUN curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2 \ - && echo "$JOOMLA_SHA1 *joomla.tar.bz2" | sha1sum -c - \ + && echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c - \ && mkdir /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && rm joomla.tar.bz2 \ diff --git a/php7.1/fpm/Dockerfile b/php7.1/fpm/Dockerfile index fef854e..ba7ecda 100644 --- a/php7.1/fpm/Dockerfile +++ b/php7.1/fpm/Dockerfile @@ -62,13 +62,13 @@ RUN set -ex; \ VOLUME /var/www/html -# Define Joomla version and expected SHA1 signature +# Define Joomla version and expected SHA512 signature ENV JOOMLA_VERSION 3.9.1 -ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 +ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9 # Download package and extract to web volume RUN curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2 \ - && echo "$JOOMLA_SHA1 *joomla.tar.bz2" | sha1sum -c - \ + && echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c - \ && mkdir /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && rm joomla.tar.bz2 \ diff --git a/php7.2/apache/Dockerfile b/php7.2/apache/Dockerfile index dcb62e1..1964dd0 100644 --- a/php7.2/apache/Dockerfile +++ b/php7.2/apache/Dockerfile @@ -63,13 +63,13 @@ RUN set -ex; \ VOLUME /var/www/html -# Define Joomla version and expected SHA1 signature +# Define Joomla version and expected SHA512 signature ENV JOOMLA_VERSION 3.9.1 -ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 +ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9 # Download package and extract to web volume RUN curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2 \ - && echo "$JOOMLA_SHA1 *joomla.tar.bz2" | sha1sum -c - \ + && echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c - \ && mkdir /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && rm joomla.tar.bz2 \ diff --git a/php7.2/fpm-alpine/Dockerfile b/php7.2/fpm-alpine/Dockerfile index 00e3cd3..6c6e158 100644 --- a/php7.2/fpm-alpine/Dockerfile +++ b/php7.2/fpm-alpine/Dockerfile @@ -60,11 +60,11 @@ VOLUME /var/www/html # Define Joomla version and expected SHA1 signature ENV JOOMLA_VERSION 3.9.1 -ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 +ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9 # Download package and extract to web volume RUN curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2 \ - && echo "$JOOMLA_SHA1 *joomla.tar.bz2" | sha1sum -c - \ + && echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c - \ && mkdir /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && rm joomla.tar.bz2 \ diff --git a/php7.2/fpm/Dockerfile b/php7.2/fpm/Dockerfile index f7b0515..20587b6 100644 --- a/php7.2/fpm/Dockerfile +++ b/php7.2/fpm/Dockerfile @@ -60,13 +60,13 @@ RUN set -ex; \ VOLUME /var/www/html -# Define Joomla version and expected SHA1 signature +# Define Joomla version and expected SHA512 signature ENV JOOMLA_VERSION 3.9.1 -ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 +ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9 # Download package and extract to web volume RUN curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2 \ - && echo "$JOOMLA_SHA1 *joomla.tar.bz2" | sha1sum -c - \ + && echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c - \ && mkdir /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && rm joomla.tar.bz2 \ diff --git a/php7.3/apache/Dockerfile b/php7.3/apache/Dockerfile index b30c084..b57aea2 100644 --- a/php7.3/apache/Dockerfile +++ b/php7.3/apache/Dockerfile @@ -64,13 +64,13 @@ RUN set -ex; \ VOLUME /var/www/html -# Define Joomla version and expected SHA1 signature +# Define Joomla version and expected SHA512 signature ENV JOOMLA_VERSION 3.9.1 -ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 +ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9 # Download package and extract to web volume RUN curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2 \ - && echo "$JOOMLA_SHA1 *joomla.tar.bz2" | sha1sum -c - \ + && echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c - \ && mkdir /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && rm joomla.tar.bz2 \ diff --git a/php7.3/fpm-alpine/Dockerfile b/php7.3/fpm-alpine/Dockerfile index cf1700d..d38f49e 100644 --- a/php7.3/fpm-alpine/Dockerfile +++ b/php7.3/fpm-alpine/Dockerfile @@ -61,11 +61,11 @@ VOLUME /var/www/html # Define Joomla version and expected SHA1 signature ENV JOOMLA_VERSION 3.9.1 -ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 +ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9 # Download package and extract to web volume RUN curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2 \ - && echo "$JOOMLA_SHA1 *joomla.tar.bz2" | sha1sum -c - \ + && echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c - \ && mkdir /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && rm joomla.tar.bz2 \ diff --git a/php7.3/fpm/Dockerfile b/php7.3/fpm/Dockerfile index 43af0f7..1af4e9a 100644 --- a/php7.3/fpm/Dockerfile +++ b/php7.3/fpm/Dockerfile @@ -61,13 +61,13 @@ RUN set -ex; \ VOLUME /var/www/html -# Define Joomla version and expected SHA1 signature +# Define Joomla version and expected SHA512 signature ENV JOOMLA_VERSION 3.9.1 -ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 +ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9 # Download package and extract to web volume RUN curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2 \ - && echo "$JOOMLA_SHA1 *joomla.tar.bz2" | sha1sum -c - \ + && echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c - \ && mkdir /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && rm joomla.tar.bz2 \ diff --git a/update.sh b/update.sh index 43b1948..9b0b620 100755 --- a/update.sh +++ b/update.sh @@ -11,7 +11,7 @@ phpVersions=( "${phpVersions[@]%/}" ) current="$(curl -fsSL 'https://downloads.joomla.org/api/v1/latest/cms' | jq -r '.branches[3].version')" urlVersion=$(echo $current | sed -e 's/\./-/g') -sha1="$(curl -fsSL "https://downloads.joomla.org/api/v1/signatures/cms/$urlVersion" | jq -r --arg file "Joomla_${current}-Stable-Full_Package.tar.bz2" '.[] | .[] | select(.filename == $file).sha1')" +sha512="$(curl -fsSL "https://downloads.joomla.org/api/v1/signatures/cms/$urlVersion" | jq -r --arg file "Joomla_${current}-Stable-Full_Package.tar.bz2" '.[] | .[] | select(.filename == $file).sha512')" declare -A variantExtras=( [apache]='\n# Enable Apache Rewrite Module\nRUN a2enmod rewrite\n' @@ -55,7 +55,7 @@ for phpVersion in "${phpVersions[@]}"; do sed -r \ -e 's!%%VERSION%%!'"$current"'!g' \ - -e 's!%%SHA1%%!'"$sha1"'!g' \ + -e 's!%%SHA512%%!'"$sha512"'!g' \ -e 's!%%PHP_VERSION%%!'"$phpVersion"'!g' \ -e 's!%%VARIANT%%!'"$variant"'!g' \ -e 's!%%VARIANT_EXTRAS%%!'"$extras"'!g' \