Merge pull request #153 from infosiftr/sha256

tianon · web-flow · commit d873d3cfe9de · 2019-05-16T16:41:46.000-07:00
Switch from MD5 to SHA256
diff --git a/7/apache/Dockerfile b/7/apache/Dockerfile
@@ -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
diff --git a/7/fpm-alpine/Dockerfile b/7/fpm-alpine/Dockerfile
@@ -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
diff --git a/7/fpm/Dockerfile b/7/fpm/Dockerfile
@@ -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
diff --git a/8.6/apache/Dockerfile b/8.6/apache/Dockerfile
@@ -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
diff --git a/8.6/fpm-alpine/Dockerfile b/8.6/fpm-alpine/Dockerfile
@@ -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
diff --git a/8.6/fpm/Dockerfile b/8.6/fpm/Dockerfile
@@ -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
diff --git a/8.7/apache/Dockerfile b/8.7/apache/Dockerfile
@@ -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
diff --git a/8.7/fpm-alpine/Dockerfile b/8.7/fpm-alpine/Dockerfile
@@ -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
diff --git a/8.7/fpm/Dockerfile b/8.7/fpm/Dockerfile
@@ -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
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -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
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -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
diff --git a/update.sh b/update.sh
@@ -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'
@@ -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"
