Skip to content

Commit 4ffb8ac

Browse files
f3l1xf3l1x
committed
All: upgrade alpine to 3.20, debian to bookworm, PHP to 8.3
1 parent 7319d6f commit 4ffb8ac

File tree

8 files changed

+140
-106
lines changed

8 files changed

+140
-106
lines changed

‎adminer-dg/Dockerfile‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,44 @@
1-
FROM alpine:3.14
1+
FROM alpine:3.20
22

33
LABEL maintainer="Milan Sulc <[email protected]>"
44

5-
ENV ADMINER_DG_VERION=1.28.1
5+
ENV ADMINER_DG_VERION=2.0.0
66
ENV MEMORY=256M
77
ENV UPLOAD=2048M
88
ENV WORKERS=4
99
ENV PHP_CLI_SERVER_WORKERS=${WORKERS}
1010

11-
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
11+
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories && \
1212
apk update && \
1313
apk upgrade && \
1414
apk add \
15-
wget \
16-
ca-certificates \
17-
php8@community \
18-
php8-session@community \
19-
php8-mysqli@community \
20-
php8-pgsql@community \
21-
php8-json@community \
22-
php8-pecl-mongodb@community \
23-
tini && \
15+
wget \
16+
ca-certificates \
17+
php83@community \
18+
php83-session@community \
19+
php83-mysqli@community \
20+
php83-pgsql@community \
21+
php83-json@community \
22+
php83-pecl-mongodb@community \
23+
tini && \
2424
wget https://github.com/dg/adminer-custom/archive/v$ADMINER_DG_VERION.tar.gz -O /srv/adminer.tgz && \
2525
tar zxvf /srv/adminer.tgz --strip-components=1 -C /srv && \
2626
rm /srv/adminer.tgz && \
27-
ln -s /usr/bin/php8 /usr/bin/php && \
2827
apk del wget ca-certificates && \
2928
rm -rf /var/cache/apk/*
3029

3130
WORKDIR /srv
3231
EXPOSE 80
3332

3433
ENTRYPOINT ["/sbin/tini", "--"]
35-
36-
CMD /usr/bin/php \
37-
-d memory_limit=$MEMORY \
38-
-d upload_max_filesize=$UPLOAD \
39-
-d post_max_size=$UPLOAD \
40-
-S 0.0.0.0:80
34+
CMD [\
35+
"/usr/bin/php", \
36+
"-d", \
37+
"memory_limit=${MEMORY}", \
38+
"-d", \
39+
"upload_max_filesize=${UPLOAD}", \
40+
"-d", \
41+
"post_max_size=${UPLOAD}", \
42+
"-S", \
43+
"0.0.0.0:80" \
44+
]

‎adminer-editor/Dockerfile‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.14
1+
FROM alpine:3.20
22

33
LABEL maintainer="Milan Sulc <[email protected]>"
44

@@ -8,31 +8,35 @@ ENV UPLOAD=2048M
88
ENV WORKERS=4
99
ENV PHP_CLI_SERVER_WORKERS=${WORKERS}
1010

11-
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
11+
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories && \
1212
apk update && \
1313
apk upgrade && \
1414
apk add \
1515
wget \
1616
ca-certificates \
17-
php8@community \
18-
php8-session@community \
19-
php8-mysqli@community \
20-
php8-pgsql@community \
21-
php8-json@community \
22-
php8-pecl-mongodb@community \
17+
php83-session@community \
18+
php83-mysqli@community \
19+
php83-pgsql@community \
20+
php83-json@community \
21+
php83-pecl-mongodb@community \
2322
tini && \
2423
wget https://github.com/vrana/adminer/releases/download/v$ADMINER_EDITOR_VERSION/editor-$ADMINER_EDITOR_VERSION.php -O /srv/index.php && \
25-
ln -s /usr/bin/php8 /usr/bin/php && \
24+
ln -s /usr/bin/php83 /usr/bin/php && \
2625
apk del wget ca-certificates && \
2726
rm -rf /var/cache/apk/*
2827

2928
WORKDIR /srv
3029
EXPOSE 80
3130

3231
ENTRYPOINT ["/sbin/tini", "--"]
33-
34-
CMD /usr/bin/php \
35-
-d memory_limit=$MEMORY \
36-
-d upload_max_filesize=$UPLOAD \
37-
-d post_max_size=$UPLOAD \
38-
-S 0.0.0.0:80
32+
CMD [\
33+
"/usr/bin/php", \
34+
"-d", \
35+
"memory_limit=${MEMORY}", \
36+
"-d", \
37+
"upload_max_filesize=${UPLOAD}", \
38+
"-d", \
39+
"post_max_size=${UPLOAD}", \
40+
"-S", \
41+
"0.0.0.0:80" \
42+
]

‎adminer-full/Dockerfile‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.14
1+
FROM alpine:3.20
22

33
LABEL maintainer="Milan Sulc <[email protected]>"
44

@@ -8,18 +8,17 @@ ENV UPLOAD=2048M
88
ENV WORKERS=4
99
ENV PHP_CLI_SERVER_WORKERS=${WORKERS}
1010

11-
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
11+
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories && \
1212
apk update && \
1313
apk upgrade && \
1414
apk add \
1515
wget \
1616
ca-certificates \
17-
php8@community \
18-
php8-session@community \
19-
php8-mysqli@community \
20-
php8-pgsql@community \
21-
php8-json@community \
22-
php8-pecl-mongodb@community \
17+
php83-session@community \
18+
php83-mysqli@community \
19+
php83-pgsql@community \
20+
php83-json@community \
21+
php83-pecl-mongodb@community \
2322
tini && \
2423
wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \
2524
ln -s /usr/bin/php8 /usr/bin/php && \
@@ -30,9 +29,14 @@ WORKDIR /srv
3029
EXPOSE 80
3130

3231
ENTRYPOINT ["/sbin/tini", "--"]
33-
34-
CMD /usr/bin/php \
35-
-d memory_limit=$MEMORY \
36-
-d upload_max_filesize=$UPLOAD \
37-
-d post_max_size=$UPLOAD \
38-
-S 0.0.0.0:80
32+
CMD [\
33+
"/usr/bin/php", \
34+
"-d", \
35+
"memory_limit=${MEMORY}", \
36+
"-d", \
37+
"upload_max_filesize=${UPLOAD}", \
38+
"-d", \
39+
"post_max_size=${UPLOAD}", \
40+
"-S", \
41+
"0.0.0.0:80" \
42+
]

‎adminer-mongo/Dockerfile‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.14
1+
FROM alpine:3.20
22

33
LABEL maintainer="Milan Sulc <[email protected]>"
44

@@ -8,28 +8,32 @@ ENV UPLOAD=2048M
88
ENV WORKERS=4
99
ENV PHP_CLI_SERVER_WORKERS=${WORKERS}
1010

11-
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
11+
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories && \
1212
apk update && \
1313
apk upgrade && \
1414
apk add \
1515
wget \
1616
ca-certificates \
17-
php8@community \
18-
php8-session@community \
19-
php8-pecl-mongodb@community \
17+
php83-session@community \
18+
php83-pecl-mongodb@community \
2019
tini && \
2120
wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \
22-
ln -s /usr/bin/php8 /usr/bin/php && \
21+
ln -s /usr/bin/php83 /usr/bin/php && \
2322
apk del wget ca-certificates && \
2423
rm -rf /var/cache/apk/*
2524

2625
WORKDIR /srv
2726
EXPOSE 80
2827

2928
ENTRYPOINT ["/sbin/tini", "--"]
30-
31-
CMD /usr/bin/php \
32-
-d memory_limit=$MEMORY \
33-
-d upload_max_filesize=$UPLOAD \
34-
-d post_max_size=$UPLOAD \
35-
-S 0.0.0.0:80
29+
CMD [\
30+
"/usr/bin/php", \
31+
"-d", \
32+
"memory_limit=${MEMORY}", \
33+
"-d", \
34+
"upload_max_filesize=${UPLOAD}", \
35+
"-d", \
36+
"post_max_size=${UPLOAD}", \
37+
"-S", \
38+
"0.0.0.0:80" \
39+
]

‎adminer-mysql/Dockerfile‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.14
1+
FROM alpine:3.20
22

33
LABEL maintainer="Milan Sulc <[email protected]>"
44

@@ -8,28 +8,32 @@ ENV UPLOAD=2048M
88
ENV WORKERS=4
99
ENV PHP_CLI_SERVER_WORKERS=${WORKERS}
1010

11-
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
11+
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories && \
1212
apk update && \
1313
apk upgrade && \
1414
apk add \
1515
wget \
1616
ca-certificates \
17-
php8@community \
18-
php8-session@community \
19-
php8-mysqli@community \
17+
php83-session@community \
18+
php83-mysqli@community \
2019
tini && \
2120
wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \
22-
ln -s /usr/bin/php8 /usr/bin/php && \
21+
ln -s /usr/bin/php83 /usr/bin/php && \
2322
apk del wget ca-certificates && \
2423
rm -rf /var/cache/apk/*
2524

2625
WORKDIR /srv
2726
EXPOSE 80
2827

2928
ENTRYPOINT ["/sbin/tini", "--"]
30-
31-
CMD /usr/bin/php \
32-
-d memory_limit=$MEMORY \
33-
-d upload_max_filesize=$UPLOAD \
34-
-d post_max_size=$UPLOAD \
35-
-S 0.0.0.0:80
29+
CMD [\
30+
"/usr/bin/php", \
31+
"-d", \
32+
"memory_limit=${MEMORY}", \
33+
"-d", \
34+
"upload_max_filesize=${UPLOAD}", \
35+
"-d", \
36+
"post_max_size=${UPLOAD}", \
37+
"-S", \
38+
"0.0.0.0:80" \
39+
]

‎adminer-oracle-11/Dockerfile‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM dockette/debian:buster
1+
FROM dockette/debian:bullseye
22

33
LABEL maintainer="Milan Sulc <[email protected]>"
44

@@ -23,9 +23,9 @@ RUN apt-get update && \
2323
unzip \
2424
libaio1 \
2525
ca-certificates \
26-
php8.0 \
27-
php8.0-dev \
28-
php8.0-xml \
26+
php8.3 \
27+
php8.3-dev \
28+
php8.3-xml \
2929
php-pear \
3030
tini && \
3131
wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php
@@ -38,7 +38,7 @@ RUN wget https://github.com/f00b4r/oracle-instantclient/raw/master/instantclient
3838
ln -s /usr/local/instantclient_11_2 /usr/local/instantclient && \
3939
ln -s /usr/local/instantclient/libclntsh.so.11.1 /usr/local/instantclient/libclntsh.so && \
4040
echo 'instantclient,/usr/local/instantclient' | pecl install oci8 && \
41-
echo "extension=oci8.so" > /etc/php/8.0/cli/conf.d/00-oci8.ini
41+
echo "extension=oci8.so" > /etc/php/8.3/cli/conf.d/00-oci8.ini
4242

4343
# CLEAN UP #####################################################################
4444
RUN apt-get clean -y && \
@@ -51,9 +51,14 @@ WORKDIR /srv
5151
EXPOSE 80
5252

5353
ENTRYPOINT ["/sbin/tini", "--"]
54-
55-
CMD /usr/bin/php \
56-
-d memory_limit=$MEMORY \
57-
-d upload_max_filesize=$UPLOAD \
58-
-d post_max_size=$UPLOAD \
59-
-S 0.0.0.0:80
54+
CMD [\
55+
"/usr/bin/php", \
56+
"-d", \
57+
"memory_limit=${MEMORY}", \
58+
"-d", \
59+
"upload_max_filesize=${UPLOAD}", \
60+
"-d", \
61+
"post_max_size=${UPLOAD}", \
62+
"-S", \
63+
"0.0.0.0:80" \
64+
]

‎adminer-oracle-12/Dockerfile‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM dockette/debian:buster
1+
FROM dockette/debian:bullseye
22

33
LABEL maintainer="Milan Sulc <[email protected]>"
44

@@ -23,9 +23,9 @@ RUN apt-get update && \
2323
unzip \
2424
libaio1 \
2525
ca-certificates \
26-
php8.0 \
27-
php8.0-dev \
28-
php8.0-xml \
26+
php8.3 \
27+
php8.3-dev \
28+
php8.3-xml \
2929
php-pear \
3030
tini && \
3131
wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php
@@ -38,7 +38,7 @@ RUN wget https://github.com/f00b4r/oracle-instantclient/raw/master/instantclient
3838
ln -s /usr/local/instantclient_12_1 /usr/local/instantclient && \
3939
ln -s /usr/local/instantclient/libclntsh.so.12.1 /usr/local/instantclient/libclntsh.so && \
4040
echo 'instantclient,/usr/local/instantclient' | pecl install oci8 && \
41-
echo "extension=oci8.so" > /etc/php/8.0/cli/conf.d/00-oci8.ini
41+
echo "extension=oci8.so" > /etc/php/8.3/cli/conf.d/00-oci8.ini
4242

4343
# CLEAN UP #####################################################################
4444
RUN apt-get clean -y && \
@@ -51,9 +51,14 @@ WORKDIR /srv
5151
EXPOSE 80
5252

5353
ENTRYPOINT ["/sbin/tini", "--"]
54-
55-
CMD /usr/bin/php \
56-
-d memory_limit=$MEMORY \
57-
-d upload_max_filesize=$UPLOAD \
58-
-d post_max_size=$UPLOAD \
59-
-S 0.0.0.0:80
54+
CMD [\
55+
"/usr/bin/php", \
56+
"-d", \
57+
"memory_limit=${MEMORY}", \
58+
"-d", \
59+
"upload_max_filesize=${UPLOAD}", \
60+
"-d", \
61+
"post_max_size=${UPLOAD}", \
62+
"-S", \
63+
"0.0.0.0:80" \
64+
]

0 commit comments

Comments
 (0)