Merge branch 'env-format'

Author: TimWolla

4/Dockerfile

@@ -40,9 +40,9 @@ RUN	set -x \
 
 COPY	*.php /var/www/html/
 
-ENV	ADMINER_VERSION 4.8.1
-ENV	ADMINER_DOWNLOAD_SHA256 2fd7e6d8f987b243ab1839249551f62adce19704c47d3d0c8dd9e57ea5b9c6b3
-ENV	ADMINER_COMMIT 1f173e18bdf0be29182e0d67989df56eadea4754
+ENV	ADMINER_VERSION=4.8.1
+ENV	ADMINER_DOWNLOAD_SHA256=2fd7e6d8f987b243ab1839249551f62adce19704c47d3d0c8dd9e57ea5b9c6b3
+ENV	ADMINER_COMMIT=1f173e18bdf0be29182e0d67989df56eadea4754
 
 RUN	set -x \
 &&	apk add --no-cache --virtual .build-deps git \

4/fastcgi/Dockerfile

@@ -36,9 +36,9 @@ RUN	set -x \
 
 COPY	*.php /var/www/html/
 
-ENV	ADMINER_VERSION 4.8.1
-ENV	ADMINER_DOWNLOAD_SHA256 2fd7e6d8f987b243ab1839249551f62adce19704c47d3d0c8dd9e57ea5b9c6b3
-ENV	ADMINER_COMMIT 1f173e18bdf0be29182e0d67989df56eadea4754
+ENV	ADMINER_VERSION=4.8.1
+ENV	ADMINER_DOWNLOAD_SHA256=2fd7e6d8f987b243ab1839249551f62adce19704c47d3d0c8dd9e57ea5b9c6b3
+ENV	ADMINER_COMMIT=1f173e18bdf0be29182e0d67989df56eadea4754
 
 RUN	set -x \
 &&	apk add --no-cache --virtual .build-deps git \

update.sh

@@ -31,9 +31,9 @@ for version in "${versions[@]}"; do
 	echo "  - adminer-${fullVersion}.php: $downloadSha256"
 
 	sed -ri \
-		-e 's/^(ENV\s+ADMINER_VERSION\s+).*/\1'"$fullVersion"'/' \
-		-e 's/^(ENV\s+ADMINER_DOWNLOAD_SHA256\s+).*/\1'"$downloadSha256"'/' \
-		-e 's/^(ENV\s+ADMINER_COMMIT\s+).*/\1'"$commit_hash"'/' \
+		-e 's/^(ENV\s+ADMINER_VERSION=).*/\1'"$fullVersion"'/' \
+		-e 's/^(ENV\s+ADMINER_DOWNLOAD_SHA256=).*/\1'"$downloadSha256"'/' \
+		-e 's/^(ENV\s+ADMINER_COMMIT=).*/\1'"$commit_hash"'/' \
 		"$version/fastcgi/Dockerfile" \
 		"$version/Dockerfile"
 done