Skip to content

Commit 24c2f1f

Browse files
ibennetchibennetch
committed
Update ENV statements to use = to match Docker standards
Sometimes the old way generates warnings when building Signed-off-by: Isaac Bennetch <[email protected]>
1 parent 6515c2b commit 24c2f1f

File tree

5 files changed

+45
-45
lines changed

5 files changed

+45
-45
lines changed

‎Dockerfile-alpine.template

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ RUN set -ex; \
4040

4141
# set recommended PHP.ini settings
4242
# see https://secure.php.net/manual/en/opcache.installation.php
43-
ENV PMA_SSL_DIR /etc/phpmyadmin/ssl
44-
ENV MAX_EXECUTION_TIME 600
45-
ENV MEMORY_LIMIT 512M
46-
ENV UPLOAD_LIMIT 2048K
47-
ENV TZ UTC
48-
ENV SESSION_SAVE_PATH /sessions
43+
ENV PMA_SSL_DIR=/etc/phpmyadmin/ssl
44+
ENV MAX_EXECUTION_TIME=600
45+
ENV MEMORY_LIMIT=512M
46+
ENV UPLOAD_LIMIT=2048K
47+
ENV TZ=UTC
48+
ENV SESSION_SAVE_PATH=/sessions
4949
RUN set -ex; \
5050
mkdir $SESSION_SAVE_PATH; \
5151
mkdir -p $PMA_SSL_DIR; \
@@ -82,9 +82,9 @@ RUN set -ex; \
8282
USER www-data:www-data
8383

8484
# Calculate download URL
85-
ENV VERSION %%VERSION%%
86-
ENV SHA256 %%SHA256%%
87-
ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
85+
ENV VERSION=%%VERSION%%
86+
ENV SHA256=%%SHA256%%
87+
ENV URL=https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
8888

8989
LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
9090
org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \

‎Dockerfile-debian.template

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ RUN set -ex; \
5555

5656
# set recommended PHP.ini settings
5757
# see https://secure.php.net/manual/en/opcache.installation.php
58-
ENV PMA_SSL_DIR /etc/phpmyadmin/ssl
59-
ENV MAX_EXECUTION_TIME 600
60-
ENV MEMORY_LIMIT 512M
61-
ENV UPLOAD_LIMIT 2048K
62-
ENV TZ UTC
63-
ENV SESSION_SAVE_PATH /sessions
58+
ENV PMA_SSL_DIR=/etc/phpmyadmin/ssl
59+
ENV MAX_EXECUTION_TIME=600
60+
ENV MEMORY_LIMIT=512M
61+
ENV UPLOAD_LIMIT=2048K
62+
ENV TZ=UTC
63+
ENV SESSION_SAVE_PATH=/sessions
6464
RUN set -ex; \
6565
mkdir $SESSION_SAVE_PATH; \
6666
mkdir -p $PMA_SSL_DIR; \
@@ -97,9 +97,9 @@ RUN set -ex; \
9797
USER www-data:www-data
9898

9999
# Calculate download URL
100-
ENV VERSION %%VERSION%%
101-
ENV SHA256 %%SHA256%%
102-
ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
100+
ENV VERSION=%%VERSION%%
101+
ENV SHA256=%%SHA256%%
102+
ENV URL=https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
103103

104104
LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
105105
org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \

‎apache/Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ RUN set -ex; \
5656

5757
# set recommended PHP.ini settings
5858
# see https://secure.php.net/manual/en/opcache.installation.php
59-
ENV PMA_SSL_DIR /etc/phpmyadmin/ssl
60-
ENV MAX_EXECUTION_TIME 600
61-
ENV MEMORY_LIMIT 512M
62-
ENV UPLOAD_LIMIT 2048K
63-
ENV TZ UTC
64-
ENV SESSION_SAVE_PATH /sessions
59+
ENV PMA_SSL_DIR=/etc/phpmyadmin/ssl
60+
ENV MAX_EXECUTION_TIME=600
61+
ENV MEMORY_LIMIT=512M
62+
ENV UPLOAD_LIMIT=2048K
63+
ENV TZ=UTC
64+
ENV SESSION_SAVE_PATH=/sessions
6565
RUN set -ex; \
6666
mkdir $SESSION_SAVE_PATH; \
6767
mkdir -p $PMA_SSL_DIR; \
@@ -98,9 +98,9 @@ RUN set -ex; \
9898
USER www-data:www-data
9999

100100
# Calculate download URL
101-
ENV VERSION 5.2.2
102-
ENV SHA256 f881819a3b11e653b0212afaf0cc105db85c767715cb3f5852670f7fc36c9669
103-
ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
101+
ENV VERSION=5.2.2
102+
ENV SHA256=f881819a3b11e653b0212afaf0cc105db85c767715cb3f5852670f7fc36c9669
103+
ENV URL=https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
104104

105105
LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
106106
org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \

‎fpm-alpine/Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ RUN set -ex; \
4141

4242
# set recommended PHP.ini settings
4343
# see https://secure.php.net/manual/en/opcache.installation.php
44-
ENV PMA_SSL_DIR /etc/phpmyadmin/ssl
45-
ENV MAX_EXECUTION_TIME 600
46-
ENV MEMORY_LIMIT 512M
47-
ENV UPLOAD_LIMIT 2048K
48-
ENV TZ UTC
49-
ENV SESSION_SAVE_PATH /sessions
44+
ENV PMA_SSL_DIR=/etc/phpmyadmin/ssl
45+
ENV MAX_EXECUTION_TIME=600
46+
ENV MEMORY_LIMIT=512M
47+
ENV UPLOAD_LIMIT=2048K
48+
ENV TZ=UTC
49+
ENV SESSION_SAVE_PATH=/sessions
5050
RUN set -ex; \
5151
mkdir $SESSION_SAVE_PATH; \
5252
mkdir -p $PMA_SSL_DIR; \
@@ -83,9 +83,9 @@ RUN set -ex; \
8383
USER www-data:www-data
8484

8585
# Calculate download URL
86-
ENV VERSION 5.2.2
87-
ENV SHA256 f881819a3b11e653b0212afaf0cc105db85c767715cb3f5852670f7fc36c9669
88-
ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
86+
ENV VERSION=5.2.2
87+
ENV SHA256=f881819a3b11e653b0212afaf0cc105db85c767715cb3f5852670f7fc36c9669
88+
ENV URL=https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
8989

9090
LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
9191
org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \

‎fpm/Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ RUN set -ex; \
5353

5454
# set recommended PHP.ini settings
5555
# see https://secure.php.net/manual/en/opcache.installation.php
56-
ENV PMA_SSL_DIR /etc/phpmyadmin/ssl
57-
ENV MAX_EXECUTION_TIME 600
58-
ENV MEMORY_LIMIT 512M
59-
ENV UPLOAD_LIMIT 2048K
60-
ENV TZ UTC
61-
ENV SESSION_SAVE_PATH /sessions
56+
ENV PMA_SSL_DIR=/etc/phpmyadmin/ssl
57+
ENV MAX_EXECUTION_TIME=600
58+
ENV MEMORY_LIMIT=512M
59+
ENV UPLOAD_LIMIT=2048K
60+
ENV TZ=UTC
61+
ENV SESSION_SAVE_PATH=/sessions
6262
RUN set -ex; \
6363
mkdir $SESSION_SAVE_PATH; \
6464
mkdir -p $PMA_SSL_DIR; \
@@ -95,9 +95,9 @@ RUN set -ex; \
9595
USER www-data:www-data
9696

9797
# Calculate download URL
98-
ENV VERSION 5.2.2
99-
ENV SHA256 f881819a3b11e653b0212afaf0cc105db85c767715cb3f5852670f7fc36c9669
100-
ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
98+
ENV VERSION=5.2.2
99+
ENV SHA256=f881819a3b11e653b0212afaf0cc105db85c767715cb3f5852670f7fc36c9669
100+
ENV URL=https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
101101

102102
LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
103103
org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \

0 commit comments

Comments
 (0)