Skip to content

Commit 5239485

Browse files
committed
update.sh: Bake GPG key, sha256 and version directly into Dockerfiles
Signed-off-by: Daniel Rudolf <[email protected]>
1 parent f650628 commit 5239485

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

Dockerfile-alpine.template

Lines changed: 3 additions & 3 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

@@ -89,10 +89,10 @@ RUN set -ex; \
8989
; \
9090
\
9191
export GNUPGHOME="$(mktemp -d)"; \
92-
export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
92+
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: 3 additions & 3 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

@@ -96,10 +96,10 @@ RUN set -ex; \
9696
; \
9797
\
9898
export GNUPGHOME="$(mktemp -d)"; \
99-
export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
99+
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" \

update.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ declare -A base=(
1919
[fpm-alpine]='alpine'
2020
)
2121

22+
gpg_key='3D06A59ECE730EB71B511C17CE752F178259BD92'
23+
2224
function download_url() {
2325
echo "https://files.phpmyadmin.net/phpMyAdmin/$1/phpMyAdmin-$1-all-languages.tar.xz"
2426
}
@@ -43,6 +45,7 @@ function create_variant() {
4345
s/%%SHA256%%/'"$sha256"'/;
4446
s/%%DOWNLOAD_URL%%/'"$(sed -e 's/[\/&]/\\&/g' <<< "$url")"'/;
4547
s/%%DOWNLOAD_URL_ASC%%/'"$(sed -e 's/[\/&]/\\&/g' <<< "$ascUrl")"'/;
48+
s/%%GPG_KEY%%/'"$gpg_key"'/g;
4649
s/%%VARIANT%%/'"$variant"'/;
4750
s/%%CMD%%/'"${cmd[$variant]}"'/;
4851
' "$variant/Dockerfile"

0 commit comments

Comments
 (0)