File tree Expand file tree Collapse file tree 3 files changed +9
-6
lines changed Expand file tree Collapse file tree 3 files changed +9
-6
lines changed Original file line number Diff line number Diff line change @@ -78,7 +78,7 @@ LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
78
78
org.opencontainers.image.vendor="phpMyAdmin" \
79
79
org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
80
80
org.opencontainers.image.licenses="GPL-2.0-only" \
81
- org.opencontainers.image.version="${ VERSION} " \
81
+ org.opencontainers.image.version="%% VERSION%% " \
82
82
org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
83
83
org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
84
84
@@ -89,10 +89,10 @@ RUN set -ex; \
89
89
; \
90
90
\
91
91
export GNUPGHOME="$(mktemp -d)"; \
92
- export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92 "; \
92
+ export GPGKEY="%%GPG_KEY%% "; \
93
93
curl -fsSL -o phpMyAdmin.tar.xz "%%DOWNLOAD_URL%%"; \
94
94
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 -; \
96
96
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$GPGKEY" \
97
97
|| gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
98
98
|| gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY" \
Original file line number Diff line number Diff line change @@ -80,7 +80,7 @@ LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
80
80
org.opencontainers.image.vendor="phpMyAdmin" \
81
81
org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
82
82
org.opencontainers.image.licenses="GPL-2.0-only" \
83
- org.opencontainers.image.version="${ VERSION} " \
83
+ org.opencontainers.image.version="%% VERSION%% " \
84
84
org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
85
85
org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
86
86
@@ -96,10 +96,10 @@ RUN set -ex; \
96
96
; \
97
97
\
98
98
export GNUPGHOME="$(mktemp -d)"; \
99
- export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92 "; \
99
+ export GPGKEY="%%GPG_KEY%% "; \
100
100
curl -fsSL -o phpMyAdmin.tar.xz "%%DOWNLOAD_URL%%"; \
101
101
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 -; \
103
103
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$GPGKEY" \
104
104
|| gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
105
105
|| gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY" \
Original file line number Diff line number Diff line change @@ -19,6 +19,8 @@ declare -A base=(
19
19
[fpm-alpine]=' alpine'
20
20
)
21
21
22
+ gpg_key=' 3D06A59ECE730EB71B511C17CE752F178259BD92'
23
+
22
24
function download_url() {
23
25
echo " https://files.phpmyadmin.net/phpMyAdmin/$1 /phpMyAdmin-$1 -all-languages.tar.xz"
24
26
}
@@ -43,6 +45,7 @@ function create_variant() {
43
45
s/%%SHA256%%/' " $sha256 " ' /;
44
46
s/%%DOWNLOAD_URL%%/' " $( sed -e ' s/[\/&]/\\&/g' <<< " $url" ) " ' /;
45
47
s/%%DOWNLOAD_URL_ASC%%/' " $( sed -e ' s/[\/&]/\\&/g' <<< " $ascUrl" ) " ' /;
48
+ s/%%GPG_KEY%%/' " $gpg_key " ' /g;
46
49
s/%%VARIANT%%/' " $variant " ' /;
47
50
s/%%CMD%%/' " ${cmd[$variant]} " ' /;
48
51
' " $variant /Dockerfile"
You can’t perform that action at this time.
0 commit comments