Skip to content

Switch from MD5 to SHA256 #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tianon merged 1 commit into from
May 16, 2019
Merged

Switch from MD5 to SHA256 #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 7/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 7.67
ENV DRUPAL_MD5 78b1814e55fdaf40e753fd523d059f8d
ENV DRUPAL_SHA256 a1a9f48eb2e89ce52f16729201ad2efbee7e802ab0c19118cbf9e4938f847af1

RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
&& echo "${DRUPAL_SHA256} *drupal.tar.gz" | sha256sum -c - \
&& tar -xz --strip-components=1 -f drupal.tar.gz \
&& rm drupal.tar.gz \
&& chown -R www-data:www-data sites modules themes
Expand Down
4 changes: 2 additions & 2 deletions 7/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 7.67
ENV DRUPAL_MD5 78b1814e55fdaf40e753fd523d059f8d
ENV DRUPAL_SHA256 a1a9f48eb2e89ce52f16729201ad2efbee7e802ab0c19118cbf9e4938f847af1

RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
&& echo "${DRUPAL_SHA256} *drupal.tar.gz" | sha256sum -c - \
&& tar -xz --strip-components=1 -f drupal.tar.gz \
&& rm drupal.tar.gz \
&& chown -R www-data:www-data sites modules themes
Expand Down
4 changes: 2 additions & 2 deletions 7/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 7.67
ENV DRUPAL_MD5 78b1814e55fdaf40e753fd523d059f8d
ENV DRUPAL_SHA256 a1a9f48eb2e89ce52f16729201ad2efbee7e802ab0c19118cbf9e4938f847af1

RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
&& echo "${DRUPAL_SHA256} *drupal.tar.gz" | sha256sum -c - \
&& tar -xz --strip-components=1 -f drupal.tar.gz \
&& rm drupal.tar.gz \
&& chown -R www-data:www-data sites modules themes
Expand Down
4 changes: 2 additions & 2 deletions 8.6/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 8.6.16
ENV DRUPAL_MD5 a0683ae0b0ea99845a6bf45383671cb9
ENV DRUPAL_SHA256 96de86424df1347c0c70ce58687f9dfece4215fab69710378764d789f82eafcb

RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
&& echo "${DRUPAL_SHA256} *drupal.tar.gz" | sha256sum -c - \
&& tar -xz --strip-components=1 -f drupal.tar.gz \
&& rm drupal.tar.gz \
&& chown -R www-data:www-data sites modules themes
Expand Down
4 changes: 2 additions & 2 deletions 8.6/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 8.6.16
ENV DRUPAL_MD5 a0683ae0b0ea99845a6bf45383671cb9
ENV DRUPAL_SHA256 96de86424df1347c0c70ce58687f9dfece4215fab69710378764d789f82eafcb

RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
&& echo "${DRUPAL_SHA256} *drupal.tar.gz" | sha256sum -c - \
&& tar -xz --strip-components=1 -f drupal.tar.gz \
&& rm drupal.tar.gz \
&& chown -R www-data:www-data sites modules themes
Expand Down
4 changes: 2 additions & 2 deletions 8.6/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 8.6.16
ENV DRUPAL_MD5 a0683ae0b0ea99845a6bf45383671cb9
ENV DRUPAL_SHA256 96de86424df1347c0c70ce58687f9dfece4215fab69710378764d789f82eafcb

RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
&& echo "${DRUPAL_SHA256} *drupal.tar.gz" | sha256sum -c - \
&& tar -xz --strip-components=1 -f drupal.tar.gz \
&& rm drupal.tar.gz \
&& chown -R www-data:www-data sites modules themes
Expand Down
4 changes: 2 additions & 2 deletions 8.7/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 8.7.1
ENV DRUPAL_MD5 2cf2a1c93ea785c6ff91d29aebef2697
ENV DRUPAL_SHA256 0740de22a7a415b3892f2942b5023e3f570601b428c43e0302a075027b704570

RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
&& echo "${DRUPAL_SHA256} *drupal.tar.gz" | sha256sum -c - \
&& tar -xz --strip-components=1 -f drupal.tar.gz \
&& rm drupal.tar.gz \
&& chown -R www-data:www-data sites modules themes
Expand Down
4 changes: 2 additions & 2 deletions 8.7/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 8.7.1
ENV DRUPAL_MD5 2cf2a1c93ea785c6ff91d29aebef2697
ENV DRUPAL_SHA256 0740de22a7a415b3892f2942b5023e3f570601b428c43e0302a075027b704570

RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
&& echo "${DRUPAL_SHA256} *drupal.tar.gz" | sha256sum -c - \
&& tar -xz --strip-components=1 -f drupal.tar.gz \
&& rm drupal.tar.gz \
&& chown -R www-data:www-data sites modules themes
Expand Down
4 changes: 2 additions & 2 deletions 8.7/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 8.7.1
ENV DRUPAL_MD5 2cf2a1c93ea785c6ff91d29aebef2697
ENV DRUPAL_SHA256 0740de22a7a415b3892f2942b5023e3f570601b428c43e0302a075027b704570

RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
&& echo "${DRUPAL_SHA256} *drupal.tar.gz" | sha256sum -c - \
&& tar -xz --strip-components=1 -f drupal.tar.gz \
&& rm drupal.tar.gz \
&& chown -R www-data:www-data sites modules themes
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION %%VERSION%%
ENV DRUPAL_MD5 %%MD5%%
ENV DRUPAL_SHA256 %%SHA256%%

RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
&& echo "${DRUPAL_SHA256} *drupal.tar.gz" | sha256sum -c - \
&& tar -xz --strip-components=1 -f drupal.tar.gz \
&& rm drupal.tar.gz \
&& chown -R www-data:www-data sites modules themes
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-debian.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION %%VERSION%%
ENV DRUPAL_MD5 %%MD5%%
ENV DRUPAL_SHA256 %%SHA256%%

RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
&& echo "${DRUPAL_SHA256} *drupal.tar.gz" | sha256sum -c - \
&& tar -xz --strip-components=1 -f drupal.tar.gz \
&& rm drupal.tar.gz \
&& chown -R www-data:www-data sites modules themes
Expand Down
10 changes: 8 additions & 2 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,13 @@ for version in "${versions[@]}"; do
md5="${fullVersion##* }"
fullVersion="${fullVersion% $md5}"

echo "$version: $fullVersion ($md5)"
sha256="$(
wget -qO- "https://www.drupal.org/project/drupal/releases/$fullVersion" \
| tac|tac \
| grep -m1 'SHA-256:' | grep -oE '[0-9a-f]{64}'
)"

echo "$version: $fullVersion ($sha256)"

for variant in fpm-alpine fpm apache; do
dist='debian'
Expand All @@ -54,7 +60,7 @@ for version in "${versions[@]}"; do
-e 's/%%PHP_VERSION%%/'"${phpVersions[$version]:-$defaultPhpVersion}"'/' \
-e 's/%%VARIANT%%/'"$variant"'/' \
-e 's/%%VERSION%%/'"$fullVersion"'/' \
-e 's/%%MD5%%/'"$md5"'/' \
-e 's/%%SHA256%%/'"$sha256"'/' \
"./Dockerfile-$dist.template" > "$version/$variant/Dockerfile"

travisEnv='\n - VERSION='"$version"' VARIANT='"$variant$travisEnv"
Expand Down