Compare commits

...
8 Commits
Author SHA1 Message Date
Michal Čihař 8429260408 Fix snapshots download url
Issue #157

Signed-off-by: Michal Čihař <michal@cihar.com>
2018-04-18 16:26:42 +02:00
Michal Čihař 2a32d39405 Remove signature checks for snapshot
Signed-off-by: Michal Čihař <michal@cihar.com>
2018-04-18 16:07:47 +02:00
Michal Čihař a82c421460 Merge branch 'master' into edge-4.8
See https://github.com/phpmyadmin/docker/issues/157

Signed-off-by: Michal Čihař <michal@cihar.com>
2018-04-18 15:51:03 +02:00
Michal Čihař 3e18501a5f Revert "Remove no longer needed ctype dependency"
This reverts commit 275b59e3dd.

It is needed for Twig.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-23 22:26:31 +02:00
Michal Čihař f88988d7a5 Merge branch 'master' into edge-4.8 2017-08-23 16:20:01 +02:00
Michal Čihař 11ad52edcd Change to 4.8 snapshots
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-05 16:30:40 +02:00
Michal Čihař a924c9da70 Remove pgp verification for snapshots
They do not come with signatures

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-05 16:27:07 +02:00
Michal Čihař 174f145d54 Build 4.7 snapshot image
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-05 16:20:12 +02:00
+3 -18
View File
@@ -36,27 +36,13 @@ COPY run.sh /run.sh
RUN chmod u+rwx /run.sh
# Calculate download URL
ENV VERSION 4.8.0
ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.gz
ENV VERSION 4.8+snapshot
ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.gz
LABEL version=$VERSION
# Download tarball, verify it using gpg and extract
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
gnupg \
; \
\
export GNUPGHOME="$(mktemp -d)"; \
export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
curl --output phpMyAdmin.tar.gz --location $URL; \
curl --output phpMyAdmin.tar.gz.asc --location $URL.asc; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
|| gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
|| gpg --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \
|| gpg --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
|| gpg --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
gpg --batch --verify phpMyAdmin.tar.gz.asc phpMyAdmin.tar.gz; \
rm -rf "$GNUPGHOME"; \
tar xzf phpMyAdmin.tar.gz; \
rm -f phpMyAdmin.tar.gz phpMyAdmin.tar.gz.asc; \
mv phpMyAdmin-$VERSION-all-languages /www; \
@@ -64,8 +50,7 @@ RUN set -ex; \
sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /www/libraries/vendor_config.php; \
chown -R root:nobody /www; \
find /www -type d -exec chmod 750 {} \; ; \
find /www -type f -exec chmod 640 {} \; ; \
apk del .fetch-deps
find /www -type f -exec chmod 640 {} \;
# Add directory for sessions to allow session persistence
RUN mkdir /sessions \