Skip to content

Commit 644a36f

Browse files
williamdeswilliamdes
committed
Revert "Run update.sh"
This reverts commit 6d73dc8.
1 parent 271a3e6 commit 644a36f

4 files changed

Lines changed: 16 additions & 44 deletions

File tree

‎apache/Dockerfile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
21
FROM php:8.1-apache
32

43
# Install dependencies
@@ -73,15 +72,15 @@ RUN set -ex; \
7372
# Calculate download URL
7473
ENV VERSION 5.2.1
7574
ENV SHA256 373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557
76-
ENV URL https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.xz
75+
ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
7776

7877
LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
7978
org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
8079
org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
8180
org.opencontainers.image.vendor="phpMyAdmin" \
8281
org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
8382
org.opencontainers.image.licenses="GPL-2.0-only" \
84-
org.opencontainers.image.version="5.2.1" \
83+
org.opencontainers.image.version="${VERSION}" \
8584
org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
8685
org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
8786

@@ -98,9 +97,9 @@ RUN set -ex; \
9897
\
9998
export GNUPGHOME="$(mktemp -d)"; \
10099
export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
101-
curl -fsSL -o phpMyAdmin.tar.xz "https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.xz"; \
102-
curl -fsSL -o phpMyAdmin.tar.xz.asc "https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.xz.asc"; \
103-
echo "373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557 *phpMyAdmin.tar.xz" | sha256sum -c -; \
100+
curl -fsSL -o phpMyAdmin.tar.xz $URL; \
101+
curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \
102+
echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \
104103
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$GPGKEY" \
105104
|| gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
106105
|| gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY" \

‎fpm-alpine/Dockerfile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
21
FROM php:8.1-fpm-alpine
32

43
# docker-entrypoint.sh dependencies
@@ -71,15 +70,15 @@ RUN set -ex; \
7170
# Calculate download URL
7271
ENV VERSION 5.2.1
7372
ENV SHA256 373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557
74-
ENV URL https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.xz
73+
ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
7574

7675
LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
7776
org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
7877
org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
7978
org.opencontainers.image.vendor="phpMyAdmin" \
8079
org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
8180
org.opencontainers.image.licenses="GPL-2.0-only" \
82-
org.opencontainers.image.version="5.2.1" \
81+
org.opencontainers.image.version="${VERSION}" \
8382
org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
8483
org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
8584

@@ -91,9 +90,9 @@ RUN set -ex; \
9190
\
9291
export GNUPGHOME="$(mktemp -d)"; \
9392
export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
94-
curl -fsSL -o phpMyAdmin.tar.xz "https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.xz"; \
95-
curl -fsSL -o phpMyAdmin.tar.xz.asc "https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.xz.asc"; \
96-
echo "373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557 *phpMyAdmin.tar.xz" | sha256sum -c -; \
93+
curl -fsSL -o phpMyAdmin.tar.xz $URL; \
94+
curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \
95+
echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \
9796
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$GPGKEY" \
9897
|| gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
9998
|| gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY" \

‎fpm/Dockerfile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
21
FROM php:8.1-fpm
32

43
# Install dependencies
@@ -73,15 +72,15 @@ RUN set -ex; \
7372
# Calculate download URL
7473
ENV VERSION 5.2.1
7574
ENV SHA256 373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557
76-
ENV URL https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.xz
75+
ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
7776

7877
LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
7978
org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
8079
org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
8180
org.opencontainers.image.vendor="phpMyAdmin" \
8281
org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
8382
org.opencontainers.image.licenses="GPL-2.0-only" \
84-
org.opencontainers.image.version="5.2.1" \
83+
org.opencontainers.image.version="${VERSION}" \
8584
org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
8685
org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
8786

@@ -98,9 +97,9 @@ RUN set -ex; \
9897
\
9998
export GNUPGHOME="$(mktemp -d)"; \
10099
export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
101-
curl -fsSL -o phpMyAdmin.tar.xz "https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.xz"; \
102-
curl -fsSL -o phpMyAdmin.tar.xz.asc "https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.xz.asc"; \
103-
echo "373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557 *phpMyAdmin.tar.xz" | sha256sum -c -; \
100+
curl -fsSL -o phpMyAdmin.tar.xz $URL; \
101+
curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \
102+
echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \
104103
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$GPGKEY" \
105104
|| gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
106105
|| gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY" \

‎versions.json‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1 @@
1-
{
2-
"5.2": {
3-
"branch": "5.2",
4-
"version": "5.2.1",
5-
"sha256": "373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557",
6-
"url": "https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.xz",
7-
"ascUrl": "https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.xz.asc",
8-
"variants": {
9-
"apache": {
10-
"variant": "apache",
11-
"base": "debian",
12-
"phpVersion": "8.1"
13-
},
14-
"fpm": {
15-
"variant": "fpm",
16-
"base": "debian",
17-
"phpVersion": "8.1"
18-
},
19-
"fpm-alpine": {
20-
"variant": "fpm-alpine",
21-
"base": "alpine",
22-
"phpVersion": "8.1"
23-
}
24-
}
25-
}
26-
}
1+
{}

0 commit comments

Comments
 (0)