Skip to content

Commit 7a6c539

Browse files
nemchiknemchik
committed
Rebase to Alpine 3.18, deprecate armhf
1 parent f9a5348 commit 7a6c539

8 files changed

Lines changed: 138 additions & 400 deletions

File tree

‎.github/ISSUE_TEMPLATE/issue.bug.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ body:
5353
options:
5454
- x86-64
5555
- arm64
56-
- armhf
5756
validations:
5857
required: true
5958
- type: textarea

‎Dockerfile‎

Lines changed: 37 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18
44

55
# set version label
66
ARG BUILD_DATE
@@ -24,7 +24,7 @@ RUN \
2424
openssl-dev \
2525
python3-dev && \
2626
echo "**** install runtime packages ****" && \
27-
apk add --no-cache --upgrade \
27+
apk add --no-cache \
2828
fail2ban \
2929
gnupg \
3030
memcached \
@@ -45,55 +45,49 @@ RUN \
4545
nginx-mod-stream \
4646
nginx-mod-stream-geoip2 \
4747
nginx-vim \
48-
php81-bcmath \
49-
php81-bz2 \
50-
php81-ctype \
51-
php81-curl \
52-
php81-dom \
53-
php81-exif \
54-
php81-ftp \
55-
php81-gd \
56-
php81-gmp \
57-
php81-iconv \
58-
php81-imap \
59-
php81-intl \
60-
php81-ldap \
61-
php81-mysqli \
62-
php81-mysqlnd \
63-
php81-opcache \
64-
php81-pdo_mysql \
65-
php81-pdo_odbc \
66-
php81-pdo_pgsql \
67-
php81-pdo_sqlite \
68-
php81-pear \
69-
php81-pecl-apcu \
70-
php81-pecl-mailparse \
71-
php81-pecl-memcached \
72-
php81-pecl-redis \
73-
php81-pgsql \
74-
php81-phar \
75-
php81-posix \
76-
php81-soap \
77-
php81-sockets \
78-
php81-sodium \
79-
php81-sqlite3 \
80-
php81-tokenizer \
81-
php81-xmlreader \
82-
php81-xsl \
83-
php81-zip \
48+
php82-bcmath \
49+
php82-bz2 \
50+
php82-dom \
51+
php82-exif \
52+
php82-ftp \
53+
php82-gd \
54+
php82-gmp \
55+
php82-imap \
56+
php82-intl \
57+
php82-ldap \
58+
php82-mysqli \
59+
php82-mysqlnd \
60+
php82-opcache \
61+
php82-pdo_mysql \
62+
php82-pdo_odbc \
63+
php82-pdo_pgsql \
64+
php82-pdo_sqlite \
65+
php82-pear \
66+
php82-pecl-apcu \
67+
php82-pecl-mailparse \
68+
php82-pecl-memcached \
69+
php82-pecl-redis \
70+
php82-pgsql \
71+
php82-posix \
72+
php82-soap \
73+
php82-sockets \
74+
php82-sodium \
75+
php82-sqlite3 \
76+
php82-tokenizer \
77+
php82-xmlreader \
78+
php82-xsl \
8479
whois && \
8580
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
86-
php81-pecl-mcrypt \
87-
php81-pecl-xmlrpc && \
81+
php82-pecl-mcrypt && \
8882
echo "**** install certbot plugins ****" && \
8983
if [ -z ${CERTBOT_VERSION+x} ]; then \
9084
CERTBOT_VERSION=$(curl -sL https://pypi.python.org/pypi/certbot/json |jq -r '. | .info.version'); \
9185
fi && \
92-
python3 -m ensurepip && \
93-
pip3 install -U --no-cache-dir \
86+
python3 -m venv /lsiopy && \
87+
pip install -U --no-cache-dir \
9488
pip \
9589
wheel && \
96-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
90+
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \
9791
certbot==${CERTBOT_VERSION} \
9892
certbot-dns-acmedns \
9993
certbot-dns-aliyun \

‎Dockerfile.aarch64‎

Lines changed: 37 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18
44

55
# set version label
66
ARG BUILD_DATE
@@ -24,7 +24,7 @@ RUN \
2424
openssl-dev \
2525
python3-dev && \
2626
echo "**** install runtime packages ****" && \
27-
apk add --no-cache --upgrade \
27+
apk add --no-cache \
2828
fail2ban \
2929
gnupg \
3030
memcached \
@@ -45,55 +45,49 @@ RUN \
4545
nginx-mod-stream \
4646
nginx-mod-stream-geoip2 \
4747
nginx-vim \
48-
php81-bcmath \
49-
php81-bz2 \
50-
php81-ctype \
51-
php81-curl \
52-
php81-dom \
53-
php81-exif \
54-
php81-ftp \
55-
php81-gd \
56-
php81-gmp \
57-
php81-iconv \
58-
php81-imap \
59-
php81-intl \
60-
php81-ldap \
61-
php81-mysqli \
62-
php81-mysqlnd \
63-
php81-opcache \
64-
php81-pdo_mysql \
65-
php81-pdo_odbc \
66-
php81-pdo_pgsql \
67-
php81-pdo_sqlite \
68-
php81-pear \
69-
php81-pecl-apcu \
70-
php81-pecl-mailparse \
71-
php81-pecl-memcached \
72-
php81-pecl-redis \
73-
php81-pgsql \
74-
php81-phar \
75-
php81-posix \
76-
php81-soap \
77-
php81-sockets \
78-
php81-sodium \
79-
php81-sqlite3 \
80-
php81-tokenizer \
81-
php81-xmlreader \
82-
php81-xsl \
83-
php81-zip \
48+
php82-bcmath \
49+
php82-bz2 \
50+
php82-dom \
51+
php82-exif \
52+
php82-ftp \
53+
php82-gd \
54+
php82-gmp \
55+
php82-imap \
56+
php82-intl \
57+
php82-ldap \
58+
php82-mysqli \
59+
php82-mysqlnd \
60+
php82-opcache \
61+
php82-pdo_mysql \
62+
php82-pdo_odbc \
63+
php82-pdo_pgsql \
64+
php82-pdo_sqlite \
65+
php82-pear \
66+
php82-pecl-apcu \
67+
php82-pecl-mailparse \
68+
php82-pecl-memcached \
69+
php82-pecl-redis \
70+
php82-pgsql \
71+
php82-posix \
72+
php82-soap \
73+
php82-sockets \
74+
php82-sodium \
75+
php82-sqlite3 \
76+
php82-tokenizer \
77+
php82-xmlreader \
78+
php82-xsl \
8479
whois && \
8580
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
86-
php81-pecl-mcrypt \
87-
php81-pecl-xmlrpc && \
81+
php82-pecl-mcrypt && \
8882
echo "**** install certbot plugins ****" && \
8983
if [ -z ${CERTBOT_VERSION+x} ]; then \
9084
CERTBOT_VERSION=$(curl -sL https://pypi.python.org/pypi/certbot/json |jq -r '. | .info.version'); \
9185
fi && \
92-
python3 -m ensurepip && \
93-
pip3 install -U --no-cache-dir \
86+
python3 -m venv /lsiopy && \
87+
pip install -U --no-cache-dir \
9488
pip \
9589
wheel && \
96-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
90+
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \
9791
certbot==${CERTBOT_VERSION} \
9892
certbot-dns-acmedns \
9993
certbot-dns-aliyun \

0 commit comments

Comments
 (0)