Skip to content

Commit 407af26

Browse files
f3l1xf3l1x
committed
All: upgrade PHP version, upgrade alpine, upgrade debian, fix tini
1 parent 84a5527 commit 407af26

File tree

8 files changed

+59
-59
lines changed

8 files changed

+59
-59
lines changed

‎adminer-dg/Dockerfile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
FROM alpine:3.20
1+
FROM alpine:3.22
22

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

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

11-
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories && \
11+
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.22/community' >> /etc/apk/repositories && \
1212
apk update && \
1313
apk upgrade && \
1414
apk add \
1515
wget \
1616
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 \
17+
php84@community \
18+
php84-session@community \
19+
php84-mysqli@community \
20+
php84-pgsql@community \
21+
php84-json@community \
22+
php84-pecl-mongodb@community \
2323
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 && \

‎adminer-editor/Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
FROM alpine:3.20
1+
FROM alpine:3.22
22

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

55
ENV ADMINER_EDITOR_VERSION=5.4.1
66
ENV MEMORY=256M
77
ENV UPLOAD=2048M
8-
ENV WORKERS=4
8+
ENV WORKERS=8
99
ENV PHP_CLI_SERVER_WORKERS=${WORKERS}
1010

11-
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories && \
11+
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.22/community' >> /etc/apk/repositories && \
1212
apk update && \
1313
apk upgrade && \
1414
apk add \
1515
wget \
1616
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 \
17+
php84@community \
18+
php84-session@community \
19+
php84-mysqli@community \
20+
php84-pgsql@community \
21+
php84-json@community \
22+
php84-pecl-mongodb@community \
2323
tini && \
2424
wget https://github.com/vrana/adminer/releases/download/v$ADMINER_EDITOR_VERSION/editor-$ADMINER_EDITOR_VERSION.php -O /srv/index.php && \
2525
apk del wget ca-certificates && \

‎adminer-full/Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
FROM alpine:3.20
1+
FROM alpine:3.22
22

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

55
ENV ADMINER_VERSION=5.4.1
66
ENV MEMORY=256M
77
ENV UPLOAD=2048M
8-
ENV WORKERS=4
8+
ENV WORKERS=8
99
ENV PHP_CLI_SERVER_WORKERS=${WORKERS}
1010

11-
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories && \
11+
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.22/community' >> /etc/apk/repositories && \
1212
apk update && \
1313
apk upgrade && \
1414
apk add \
1515
wget \
1616
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 \
17+
php84@community \
18+
php84-session@community \
19+
php84-mysqli@community \
20+
php84-pgsql@community \
21+
php84-json@community \
22+
php84-pecl-mongodb@community \
2323
tini && \
2424
wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \
2525
apk del wget ca-certificates && \

‎adminer-mongo/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
FROM alpine:3.20
1+
FROM alpine:3.22
22

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

55
ENV ADMINER_VERSION=5.4.1
66
ENV MEMORY=256M
77
ENV UPLOAD=2048M
8-
ENV WORKERS=4
8+
ENV WORKERS=8
99
ENV PHP_CLI_SERVER_WORKERS=${WORKERS}
1010

11-
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories && \
11+
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.22/community' >> /etc/apk/repositories && \
1212
apk update && \
1313
apk upgrade && \
1414
apk add \
1515
wget \
1616
ca-certificates \
17-
php83@community \
18-
php83-session@community \
19-
php83-pecl-mongodb@community \
17+
php84@community \
18+
php84-session@community \
19+
php84-pecl-mongodb@community \
2020
tini && \
2121
wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \
2222
apk del wget ca-certificates && \

‎adminer-mysql/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
FROM alpine:3.20
1+
FROM alpine:3.22
22

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

55
ENV ADMINER_VERSION=5.4.1
66
ENV MEMORY=256M
77
ENV UPLOAD=2048M
8-
ENV WORKERS=4
8+
ENV WORKERS=8
99
ENV PHP_CLI_SERVER_WORKERS=${WORKERS}
1010

11-
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories && \
11+
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.22/community' >> /etc/apk/repositories && \
1212
apk update && \
1313
apk upgrade && \
1414
apk add \
1515
wget \
1616
ca-certificates \
17-
php83@community \
18-
php83-session@community \
19-
php83-mysqli@community \
17+
php84@community \
18+
php84-session@community \
19+
php84-mysqli@community \
2020
tini && \
2121
wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \
2222
apk del wget ca-certificates && \

‎adminer-oracle-11/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM dockette/debian:bullseye
1+
FROM dockette/debian:bookworm-slim
22

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

55
ENV ADMINER_VERSION=5.4.1
66
ENV MEMORY=256M
77
ENV UPLOAD=2048M
88
ENV LD_LIBRARY_PATH="/usr/local/lib;/usr/local/instantclient"
9-
ENV WORKERS=4
9+
ENV WORKERS=8
1010
ENV PHP_CLI_SERVER_WORKERS=${WORKERS}
1111

1212
# DEPENDENCIES #################################################################
@@ -23,9 +23,9 @@ RUN apt-get update && \
2323
unzip \
2424
libaio1 \
2525
ca-certificates \
26-
php8.3 \
27-
php8.3-dev \
28-
php8.3-xml \
26+
php8.4 \
27+
php8.4-dev \
28+
php8.4-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.3/cli/conf.d/00-oci8.ini
41+
echo "extension=oci8.so" > /etc/php/8.4/cli/conf.d/00-oci8.ini
4242

4343
# CLEAN UP #####################################################################
4444
RUN apt-get clean -y && \
@@ -50,7 +50,7 @@ RUN apt-get clean -y && \
5050
WORKDIR /srv
5151
EXPOSE 80
5252

53-
ENTRYPOINT ["/sbin/tini", "--"]
53+
ENTRYPOINT ["tini", "--"]
5454
CMD [\
5555
"/usr/bin/php", \
5656
"-d", \

‎adminer-oracle-12/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM dockette/debian:bullseye
1+
FROM dockette/debian:bookworm-slim
22

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

55
ENV ADMINER_VERSION=5.4.1
66
ENV MEMORY=256M
77
ENV UPLOAD=2048M
88
ENV LD_LIBRARY_PATH="/usr/local/lib;/usr/local/instantclient"
9-
ENV WORKERS=4
9+
ENV WORKERS=8
1010
ENV PHP_CLI_SERVER_WORKERS=${WORKERS}
1111

1212
# DEPENDENCIES #################################################################
@@ -23,9 +23,9 @@ RUN apt-get update && \
2323
unzip \
2424
libaio1 \
2525
ca-certificates \
26-
php8.3 \
27-
php8.3-dev \
28-
php8.3-xml \
26+
php8.4 \
27+
php8.4-dev \
28+
php8.4-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.3/cli/conf.d/00-oci8.ini
41+
echo "extension=oci8.so" > /etc/php/8.4/cli/conf.d/00-oci8.ini
4242

4343
# CLEAN UP #####################################################################
4444
RUN apt-get clean -y && \
@@ -50,7 +50,7 @@ RUN apt-get clean -y && \
5050
WORKDIR /srv
5151
EXPOSE 80
5252

53-
ENTRYPOINT ["/sbin/tini", "--"]
53+
ENTRYPOINT ["tini", "--"]
5454
CMD [\
5555
"/usr/bin/php", \
5656
"-d", \

‎adminer-postgres/Dockerfile‎

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

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

@@ -8,15 +8,15 @@ 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.20/community' >> /etc/apk/repositories && \
11+
RUN echo '@community http://nl.alpinelinux.org/alpine/v3.22/community' >> /etc/apk/repositories && \
1212
apk update && \
1313
apk upgrade && \
1414
apk add \
1515
wget \
1616
ca-certificates \
17-
php83@community \
18-
php83-session@community \
19-
php83-pgsql@community \
17+
php84@community \
18+
php84-session@community \
19+
php84-pgsql@community \
2020
tini && \
2121
wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \
2222
apk del wget ca-certificates && \

0 commit comments

Comments
 (0)