Skip to content

Commit bc31b51

Browse files
committed
Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate
Signed-off-by: Eric Nemchik <eric@nemchik.com>
1 parent bf6ab14 commit bc31b51

5 files changed

Lines changed: 79 additions & 71 deletions

File tree

Dockerfile

Lines changed: 33 additions & 33 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.18
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19
44

55
# set version label
66
ARG BUILD_DATE
@@ -45,39 +45,39 @@ RUN \
4545
nginx-mod-stream \
4646
nginx-mod-stream-geoip2 \
4747
nginx-vim \
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-memcached \
68-
php82-pecl-redis \
69-
php82-pgsql \
70-
php82-posix \
71-
php82-soap \
72-
php82-sockets \
73-
php82-sodium \
74-
php82-sqlite3 \
75-
php82-tokenizer \
76-
php82-xmlreader \
77-
php82-xsl \
48+
php83-bcmath \
49+
php83-bz2 \
50+
php83-dom \
51+
php83-exif \
52+
php83-ftp \
53+
php83-gd \
54+
php83-gmp \
55+
php83-imap \
56+
php83-intl \
57+
php83-ldap \
58+
php83-mysqli \
59+
php83-mysqlnd \
60+
php83-opcache \
61+
php83-pdo_mysql \
62+
php83-pdo_odbc \
63+
php83-pdo_pgsql \
64+
php83-pdo_sqlite \
65+
php83-pear \
66+
php83-pecl-apcu \
67+
php83-pecl-memcached \
68+
php83-pecl-redis \
69+
php83-pgsql \
70+
php83-posix \
71+
php83-soap \
72+
php83-sockets \
73+
php83-sodium \
74+
php83-sqlite3 \
75+
php83-tokenizer \
76+
php83-xmlreader \
77+
php83-xsl \
7878
whois && \
7979
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
80-
php82-pecl-mcrypt && \
80+
php83-pecl-mcrypt && \
8181
echo "**** install certbot plugins ****" && \
8282
if [ -z ${CERTBOT_VERSION+x} ]; then \
8383
CERTBOT_VERSION=$(curl -sL https://pypi.python.org/pypi/certbot/json |jq -r '. | .info.version'); \
@@ -86,7 +86,7 @@ RUN \
8686
pip install -U --no-cache-dir \
8787
pip \
8888
wheel && \
89-
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \
89+
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
9090
certbot==${CERTBOT_VERSION} \
9191
certbot-dns-acmedns \
9292
certbot-dns-aliyun \

Dockerfile.aarch64

Lines changed: 33 additions & 33 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.18
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19
44

55
# set version label
66
ARG BUILD_DATE
@@ -45,39 +45,39 @@ RUN \
4545
nginx-mod-stream \
4646
nginx-mod-stream-geoip2 \
4747
nginx-vim \
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-memcached \
68-
php82-pecl-redis \
69-
php82-pgsql \
70-
php82-posix \
71-
php82-soap \
72-
php82-sockets \
73-
php82-sodium \
74-
php82-sqlite3 \
75-
php82-tokenizer \
76-
php82-xmlreader \
77-
php82-xsl \
48+
php83-bcmath \
49+
php83-bz2 \
50+
php83-dom \
51+
php83-exif \
52+
php83-ftp \
53+
php83-gd \
54+
php83-gmp \
55+
php83-imap \
56+
php83-intl \
57+
php83-ldap \
58+
php83-mysqli \
59+
php83-mysqlnd \
60+
php83-opcache \
61+
php83-pdo_mysql \
62+
php83-pdo_odbc \
63+
php83-pdo_pgsql \
64+
php83-pdo_sqlite \
65+
php83-pear \
66+
php83-pecl-apcu \
67+
php83-pecl-memcached \
68+
php83-pecl-redis \
69+
php83-pgsql \
70+
php83-posix \
71+
php83-soap \
72+
php83-sockets \
73+
php83-sodium \
74+
php83-sqlite3 \
75+
php83-tokenizer \
76+
php83-xmlreader \
77+
php83-xsl \
7878
whois && \
7979
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
80-
php82-pecl-mcrypt && \
80+
php83-pecl-mcrypt && \
8181
echo "**** install certbot plugins ****" && \
8282
if [ -z ${CERTBOT_VERSION+x} ]; then \
8383
CERTBOT_VERSION=$(curl -sL https://pypi.python.org/pypi/certbot/json |jq -r '. | .info.version'); \
@@ -86,7 +86,7 @@ RUN \
8686
pip install -U --no-cache-dir \
8787
pip \
8888
wheel && \
89-
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \
89+
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
9090
certbot==${CERTBOT_VERSION} \
9191
certbot-dns-acmedns \
9292
certbot-dns-aliyun \

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ services:
180180
- EXTRA_DOMAINS= #optional
181181
- STAGING=false #optional
182182
volumes:
183-
- /path/to/appdata/config:/config
183+
- /path/to/swag/config:/config
184184
ports:
185185
- 443:443
186186
- 80:80 #optional
@@ -208,7 +208,7 @@ docker run -d \
208208
-e STAGING=false `#optional` \
209209
-p 443:443 \
210210
-p 80:80 `#optional` \
211-
-v /path/to/appdata/config:/config \
211+
-v /path/to/swag/config:/config \
212212
--restart unless-stopped \
213213
lscr.io/linuxserver/swag:latest
214214
```
@@ -234,7 +234,7 @@ Containers are configured using parameters passed at runtime (such as those abov
234234
| `-e ONLY_SUBDOMAINS=false` | If you wish to get certs only for certain subdomains, but not the main domain (main domain may be hosted on another machine and cannot be validated), set this to `true` |
235235
| `-e EXTRA_DOMAINS=` | Additional fully qualified domain names (comma separated, no spaces) ie. `extradomain.com,subdomain.anotherdomain.org,*.anotherdomain.org` |
236236
| `-e STAGING=false` | Set to `true` to retrieve certs in staging mode. Rate limits will be much higher, but the resulting cert will not pass the browser's security test. Only to be used for testing purposes. |
237-
| `-v /config` | All the config files including the webroot reside here. |
237+
| `-v /config` | Persistent config files |
238238

239239
### Portainer notice
240240

@@ -416,6 +416,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
416416

417417
## Versions
418418

419+
* **23.12.23:** - Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate.
419420
* **11.12.23:** - Deprecate certbot-dns-dynu to resolve dependency conflicts with other plugins.
420421
* **30.11.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404.
421422
* **23.11.23:** - Run certbot as root to allow fix http validation.

readme-vars.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ param_env_vars:
3434
- { env_var: "VALIDATION", env_value: "http", desc: "Certbot validation method to use, options are `http` or `dns` (`dns` method also requires `DNSPLUGIN` variable set)." }
3535
param_usage_include_vols: true
3636
param_volumes:
37-
- { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "All the config files including the webroot reside here." }
37+
- { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
3838
param_usage_include_ports: true
3939
param_ports:
4040
- { external_port: "443", internal_port: "443", port_desc: "Https port" }
@@ -58,7 +58,7 @@ opt_param_env_vars:
5858
- { env_var: "STAGING", env_value: "false", desc: "Set to `true` to retrieve certs in staging mode. Rate limits will be much higher, but the resulting cert will not pass the browser's security test. Only to be used for testing purposes." }
5959
opt_param_usage_include_vols: false
6060
opt_param_volumes:
61-
- { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Configuration files." }
61+
- { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
6262
opt_param_usage_include_ports: true
6363
opt_param_ports:
6464
- { external_port: "80", internal_port: "80", port_desc: "Http port (required for http validation and http -> https redirect)" }
@@ -168,6 +168,7 @@ app_setup_block: |
168168
169169
# changelog
170170
changelogs:
171+
- { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate." }
171172
- { date: "11.12.23:", desc: "Deprecate certbot-dns-dynu to resolve dependency conflicts with other plugins." }
172173
- { date: "30.11.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404." }
173174
- { date: "23.11.23:", desc: "Run certbot as root to allow fix http validation." }

root/etc/crontabs/root

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
# min hour day month weekday command
2+
*/15 * * * * run-parts /etc/periodic/15min
3+
0 * * * * run-parts /etc/periodic/hourly
4+
0 2 * * * run-parts /etc/periodic/daily
5+
0 3 * * 6 run-parts /etc/periodic/weekly
6+
0 5 1 * * run-parts /etc/periodic/monthly
7+
28
8 2 * * * /app/le-renew.sh >> /config/log/letsencrypt/letsencrypt.log 2>&1

0 commit comments

Comments
 (0)