Skip to content

Commit 813fcf8

Browse files
committed
Revert "Auxiliary commit to revert individual files from 5239485"
This reverts commit bc440d32df7d8a2eea760fd85ae81564f7b77be8.
1 parent d10b78c commit 813fcf8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Dockerfile-alpine.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
7878
org.opencontainers.image.vendor="phpMyAdmin" \
7979
org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
8080
org.opencontainers.image.licenses="GPL-2.0-only" \
81-
org.opencontainers.image.version="%%VERSION%%" \
81+
org.opencontainers.image.version="${VERSION}" \
8282
org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
8383
org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
8484

@@ -92,7 +92,7 @@ RUN set -ex; \
9292
export GPGKEY="%%GPG_KEY%%"; \
9393
curl -fsSL -o phpMyAdmin.tar.xz "%%DOWNLOAD_URL%%"; \
9494
curl -fsSL -o phpMyAdmin.tar.xz.asc "%%DOWNLOAD_URL_ASC%%"; \
95-
echo "%%SHA256%% *phpMyAdmin.tar.xz" | sha256sum -c -; \
95+
echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \
9696
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$GPGKEY" \
9797
|| gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
9898
|| gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY" \

Dockerfile-debian.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
8080
org.opencontainers.image.vendor="phpMyAdmin" \
8181
org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
8282
org.opencontainers.image.licenses="GPL-2.0-only" \
83-
org.opencontainers.image.version="%%VERSION%%" \
83+
org.opencontainers.image.version="${VERSION}" \
8484
org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
8585
org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
8686

@@ -99,7 +99,7 @@ RUN set -ex; \
9999
export GPGKEY="%%GPG_KEY%%"; \
100100
curl -fsSL -o phpMyAdmin.tar.xz "%%DOWNLOAD_URL%%"; \
101101
curl -fsSL -o phpMyAdmin.tar.xz.asc "%%DOWNLOAD_URL_ASC%%"; \
102-
echo "%%SHA256%% *phpMyAdmin.tar.xz" | sha256sum -c -; \
102+
echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \
103103
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$GPGKEY" \
104104
|| gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
105105
|| gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY" \

0 commit comments

Comments
 (0)