34
3
mirror of https://github.com/joomla-docker/docker-joomla.git synced 2024-11-18 02:55:13 +00:00

Merge pull request #74 from J0WI/sha512

Use stronger checksum (SHA-512)
This commit is contained in:
Michael Babker 2019-01-11 08:37:46 -06:00 committed by GitHub
commit c9fb7a80df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 31 additions and 31 deletions

View File

@ -63,11 +63,11 @@ VOLUME /var/www/html
# Define Joomla version and expected SHA1 signature # Define Joomla version and expected SHA1 signature
ENV JOOMLA_VERSION %%VERSION%% ENV JOOMLA_VERSION %%VERSION%%
ENV JOOMLA_SHA1 %%SHA1%% ENV JOOMLA_SHA512 %%SHA512%%
# Download package and extract to web volume # 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 \ 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 \ && mkdir /usr/src/joomla \
&& tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \
&& rm joomla.tar.bz2 \ && rm joomla.tar.bz2 \

View File

@ -63,13 +63,13 @@ RUN set -ex; \
VOLUME /var/www/html VOLUME /var/www/html
# Define Joomla version and expected SHA1 signature # Define Joomla version and expected SHA512 signature
ENV JOOMLA_VERSION %%VERSION%% ENV JOOMLA_VERSION %%VERSION%%
ENV JOOMLA_SHA1 %%SHA1%% ENV JOOMLA_SHA512 %%SHA512%%
# Download package and extract to web volume # 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 \ 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 \ && mkdir /usr/src/joomla \
&& tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \
&& rm joomla.tar.bz2 \ && rm joomla.tar.bz2 \

View File

@ -65,13 +65,13 @@ RUN set -ex; \
VOLUME /var/www/html 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_VERSION 3.9.1
ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9
# Download package and extract to web volume # 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 \ 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 \ && mkdir /usr/src/joomla \
&& tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \
&& rm joomla.tar.bz2 \ && rm joomla.tar.bz2 \

View File

@ -62,11 +62,11 @@ VOLUME /var/www/html
# Define Joomla version and expected SHA1 signature # Define Joomla version and expected SHA1 signature
ENV JOOMLA_VERSION 3.9.1 ENV JOOMLA_VERSION 3.9.1
ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9
# Download package and extract to web volume # 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 \ 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 \ && mkdir /usr/src/joomla \
&& tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \
&& rm joomla.tar.bz2 \ && rm joomla.tar.bz2 \

View File

@ -62,13 +62,13 @@ RUN set -ex; \
VOLUME /var/www/html 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_VERSION 3.9.1
ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9
# Download package and extract to web volume # 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 \ 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 \ && mkdir /usr/src/joomla \
&& tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \
&& rm joomla.tar.bz2 \ && rm joomla.tar.bz2 \

View File

@ -63,13 +63,13 @@ RUN set -ex; \
VOLUME /var/www/html 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_VERSION 3.9.1
ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9
# Download package and extract to web volume # 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 \ 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 \ && mkdir /usr/src/joomla \
&& tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \
&& rm joomla.tar.bz2 \ && rm joomla.tar.bz2 \

View File

@ -60,11 +60,11 @@ VOLUME /var/www/html
# Define Joomla version and expected SHA1 signature # Define Joomla version and expected SHA1 signature
ENV JOOMLA_VERSION 3.9.1 ENV JOOMLA_VERSION 3.9.1
ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9
# Download package and extract to web volume # 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 \ 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 \ && mkdir /usr/src/joomla \
&& tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \
&& rm joomla.tar.bz2 \ && rm joomla.tar.bz2 \

View File

@ -60,13 +60,13 @@ RUN set -ex; \
VOLUME /var/www/html 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_VERSION 3.9.1
ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9
# Download package and extract to web volume # 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 \ 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 \ && mkdir /usr/src/joomla \
&& tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \
&& rm joomla.tar.bz2 \ && rm joomla.tar.bz2 \

View File

@ -64,13 +64,13 @@ RUN set -ex; \
VOLUME /var/www/html 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_VERSION 3.9.1
ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9
# Download package and extract to web volume # 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 \ 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 \ && mkdir /usr/src/joomla \
&& tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \
&& rm joomla.tar.bz2 \ && rm joomla.tar.bz2 \

View File

@ -61,11 +61,11 @@ VOLUME /var/www/html
# Define Joomla version and expected SHA1 signature # Define Joomla version and expected SHA1 signature
ENV JOOMLA_VERSION 3.9.1 ENV JOOMLA_VERSION 3.9.1
ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9
# Download package and extract to web volume # 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 \ 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 \ && mkdir /usr/src/joomla \
&& tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \
&& rm joomla.tar.bz2 \ && rm joomla.tar.bz2 \

View File

@ -61,13 +61,13 @@ RUN set -ex; \
VOLUME /var/www/html 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_VERSION 3.9.1
ENV JOOMLA_SHA1 aec0f602f93064d55cc06917329abdeef2e0f820 ENV JOOMLA_SHA512 1a3b8d9788f657a97dc107bdea909792ba117c17587aaf05ce0f416bc1fddaf80c108431d6b9b1f1a212d10817cfe8f06c6178c474a4be1d73d232f98eb685e9
# Download package and extract to web volume # 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 \ 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 \ && mkdir /usr/src/joomla \
&& tar -xf joomla.tar.bz2 -C /usr/src/joomla \ && tar -xf joomla.tar.bz2 -C /usr/src/joomla \
&& rm joomla.tar.bz2 \ && rm joomla.tar.bz2 \

View File

@ -11,7 +11,7 @@ phpVersions=( "${phpVersions[@]%/}" )
current="$(curl -fsSL 'https://downloads.joomla.org/api/v1/latest/cms' | jq -r '.branches[3].version')" current="$(curl -fsSL 'https://downloads.joomla.org/api/v1/latest/cms' | jq -r '.branches[3].version')"
urlVersion=$(echo $current | sed -e 's/\./-/g') 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=( declare -A variantExtras=(
[apache]='\n# Enable Apache Rewrite Module\nRUN a2enmod rewrite\n' [apache]='\n# Enable Apache Rewrite Module\nRUN a2enmod rewrite\n'
@ -55,7 +55,7 @@ for phpVersion in "${phpVersions[@]}"; do
sed -r \ sed -r \
-e 's!%%VERSION%%!'"$current"'!g' \ -e 's!%%VERSION%%!'"$current"'!g' \
-e 's!%%SHA1%%!'"$sha1"'!g' \ -e 's!%%SHA512%%!'"$sha512"'!g' \
-e 's!%%PHP_VERSION%%!'"$phpVersion"'!g' \ -e 's!%%PHP_VERSION%%!'"$phpVersion"'!g' \
-e 's!%%VARIANT%%!'"$variant"'!g' \ -e 's!%%VARIANT%%!'"$variant"'!g' \
-e 's!%%VARIANT_EXTRAS%%!'"$extras"'!g' \ -e 's!%%VARIANT_EXTRAS%%!'"$extras"'!g' \