mirror of
https://github.com/linuxserver/docker-swag.git
synced 2025-08-07 05:42:15 -04:00
Rebase to 3.22
This commit is contained in:
parent
7f9835b43f
commit
56ff1d5e19
14 changed files with 69 additions and 67 deletions
0
.editorconfig
Executable file → Normal file
0
.editorconfig
Executable file → Normal file
0
.github/FUNDING.yml
vendored
Executable file → Normal file
0
.github/FUNDING.yml
vendored
Executable file → Normal file
0
.github/ISSUE_TEMPLATE/config.yml
vendored
Executable file → Normal file
0
.github/ISSUE_TEMPLATE/config.yml
vendored
Executable file → Normal file
0
.github/ISSUE_TEMPLATE/issue.bug.yml
vendored
Executable file → Normal file
0
.github/ISSUE_TEMPLATE/issue.bug.yml
vendored
Executable file → Normal file
0
.github/ISSUE_TEMPLATE/issue.feature.yml
vendored
Executable file → Normal file
0
.github/ISSUE_TEMPLATE/issue.feature.yml
vendored
Executable file → Normal file
0
.github/workflows/call_issue_pr_tracker.yml
vendored
Executable file → Normal file
0
.github/workflows/call_issue_pr_tracker.yml
vendored
Executable file → Normal file
0
.github/workflows/call_issues_cron.yml
vendored
Executable file → Normal file
0
.github/workflows/call_issues_cron.yml
vendored
Executable file → Normal file
0
.github/workflows/permissions.yml
vendored
Executable file → Normal file
0
.github/workflows/permissions.yml
vendored
Executable file → Normal file
65
Dockerfile
65
Dockerfile
|
@ -1,6 +1,6 @@
|
||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.21
|
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
|
@ -49,37 +49,36 @@ RUN \
|
||||||
nginx-mod-stream \
|
nginx-mod-stream \
|
||||||
nginx-mod-stream-geoip2 \
|
nginx-mod-stream-geoip2 \
|
||||||
nginx-vim \
|
nginx-vim \
|
||||||
php83-bcmath \
|
php84-bcmath \
|
||||||
php83-bz2 \
|
php84-bz2 \
|
||||||
php83-dom \
|
php84-dom \
|
||||||
php83-exif \
|
php84-exif \
|
||||||
php83-ftp \
|
php84-ftp \
|
||||||
php83-gd \
|
php84-gd \
|
||||||
php83-gmp \
|
php84-gmp \
|
||||||
php83-imap \
|
php84-imap \
|
||||||
php83-intl \
|
php84-intl \
|
||||||
php83-ldap \
|
php84-ldap \
|
||||||
php83-mysqli \
|
php84-mysqli \
|
||||||
php83-mysqlnd \
|
php84-mysqlnd \
|
||||||
php83-opcache \
|
php84-opcache \
|
||||||
php83-pdo_mysql \
|
php84-pdo_mysql \
|
||||||
php83-pdo_odbc \
|
php84-pdo_odbc \
|
||||||
php83-pdo_pgsql \
|
php84-pdo_pgsql \
|
||||||
php83-pdo_sqlite \
|
php84-pdo_sqlite \
|
||||||
php83-pear \
|
php84-pear \
|
||||||
php83-pecl-apcu \
|
php84-pecl-apcu \
|
||||||
php83-pecl-mcrypt \
|
php84-pecl-memcached \
|
||||||
php83-pecl-memcached \
|
php84-pecl-redis \
|
||||||
php83-pecl-redis \
|
php84-pgsql \
|
||||||
php83-pgsql \
|
php84-posix \
|
||||||
php83-posix \
|
php84-soap \
|
||||||
php83-soap \
|
php84-sockets \
|
||||||
php83-sockets \
|
php84-sodium \
|
||||||
php83-sodium \
|
php84-sqlite3 \
|
||||||
php83-sqlite3 \
|
php84-tokenizer \
|
||||||
php83-tokenizer \
|
php84-xmlreader \
|
||||||
php83-xmlreader \
|
php84-xsl \
|
||||||
php83-xsl \
|
|
||||||
whois && \
|
whois && \
|
||||||
echo "**** install certbot plugins ****" && \
|
echo "**** install certbot plugins ****" && \
|
||||||
if [ -z ${CERTBOT_VERSION+x} ]; then \
|
if [ -z ${CERTBOT_VERSION+x} ]; then \
|
||||||
|
@ -89,7 +88,7 @@ RUN \
|
||||||
pip install -U --no-cache-dir \
|
pip install -U --no-cache-dir \
|
||||||
pip \
|
pip \
|
||||||
wheel && \
|
wheel && \
|
||||||
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ \
|
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.22/ \
|
||||||
certbot==${CERTBOT_VERSION} \
|
certbot==${CERTBOT_VERSION} \
|
||||||
certbot-dns-acmedns \
|
certbot-dns-acmedns \
|
||||||
certbot-dns-aliyun \
|
certbot-dns-aliyun \
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.21
|
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
|
@ -49,37 +49,36 @@ RUN \
|
||||||
nginx-mod-stream \
|
nginx-mod-stream \
|
||||||
nginx-mod-stream-geoip2 \
|
nginx-mod-stream-geoip2 \
|
||||||
nginx-vim \
|
nginx-vim \
|
||||||
php83-bcmath \
|
php84-bcmath \
|
||||||
php83-bz2 \
|
php84-bz2 \
|
||||||
php83-dom \
|
php84-dom \
|
||||||
php83-exif \
|
php84-exif \
|
||||||
php83-ftp \
|
php84-ftp \
|
||||||
php83-gd \
|
php84-gd \
|
||||||
php83-gmp \
|
php84-gmp \
|
||||||
php83-imap \
|
php84-imap \
|
||||||
php83-intl \
|
php84-intl \
|
||||||
php83-ldap \
|
php84-ldap \
|
||||||
php83-mysqli \
|
php84-mysqli \
|
||||||
php83-mysqlnd \
|
php84-mysqlnd \
|
||||||
php83-opcache \
|
php84-opcache \
|
||||||
php83-pdo_mysql \
|
php84-pdo_mysql \
|
||||||
php83-pdo_odbc \
|
php84-pdo_odbc \
|
||||||
php83-pdo_pgsql \
|
php84-pdo_pgsql \
|
||||||
php83-pdo_sqlite \
|
php84-pdo_sqlite \
|
||||||
php83-pear \
|
php84-pear \
|
||||||
php83-pecl-apcu \
|
php84-pecl-apcu \
|
||||||
php83-pecl-mcrypt \
|
php84-pecl-memcached \
|
||||||
php83-pecl-memcached \
|
php84-pecl-redis \
|
||||||
php83-pecl-redis \
|
php84-pgsql \
|
||||||
php83-pgsql \
|
php84-posix \
|
||||||
php83-posix \
|
php84-soap \
|
||||||
php83-soap \
|
php84-sockets \
|
||||||
php83-sockets \
|
php84-sodium \
|
||||||
php83-sodium \
|
php84-sqlite3 \
|
||||||
php83-sqlite3 \
|
php84-tokenizer \
|
||||||
php83-tokenizer \
|
php84-xmlreader \
|
||||||
php83-xmlreader \
|
php84-xsl \
|
||||||
php83-xsl \
|
|
||||||
whois && \
|
whois && \
|
||||||
echo "**** install certbot plugins ****" && \
|
echo "**** install certbot plugins ****" && \
|
||||||
if [ -z ${CERTBOT_VERSION+x} ]; then \
|
if [ -z ${CERTBOT_VERSION+x} ]; then \
|
||||||
|
@ -89,7 +88,7 @@ RUN \
|
||||||
pip install -U --no-cache-dir \
|
pip install -U --no-cache-dir \
|
||||||
pip \
|
pip \
|
||||||
wheel && \
|
wheel && \
|
||||||
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ \
|
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.22/ \
|
||||||
certbot==${CERTBOT_VERSION} \
|
certbot==${CERTBOT_VERSION} \
|
||||||
certbot-dns-acmedns \
|
certbot-dns-acmedns \
|
||||||
certbot-dns-aliyun \
|
certbot-dns-aliyun \
|
||||||
|
|
0
LICENSE
Executable file → Normal file
0
LICENSE
Executable file → Normal file
|
@ -420,6 +420,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
* **09.07.25:** - Rebase to Alpine 3.22 with PHP 8.4. Add QUIC support. Drop PHP bindings for mcrypt as it is no longer maintained.
|
||||||
* **05.05.25:** - Disable Certbot's built in log rotation.
|
* **05.05.25:** - Disable Certbot's built in log rotation.
|
||||||
* **19.01.25:** - Add [Auto Reload](https://github.com/linuxserver/docker-mods/tree/swag-auto-reload) functionality to SWAG.
|
* **19.01.25:** - Add [Auto Reload](https://github.com/linuxserver/docker-mods/tree/swag-auto-reload) functionality to SWAG.
|
||||||
* **17.12.24:** - Rebase to Alpine 3.21.
|
* **17.12.24:** - Rebase to Alpine 3.21.
|
||||||
|
|
|
@ -207,6 +207,7 @@ init_diagram: |
|
||||||
"swag:latest" <- Base Images
|
"swag:latest" <- Base Images
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- {date: "09.07.25:", desc: "Rebase to Alpine 3.22 with PHP 8.4. Add QUIC support. Drop PHP bindings for mcrypt as it is no longer maintained."}
|
||||||
- {date: "05.05.25:", desc: "Disable Certbot's built in log rotation."}
|
- {date: "05.05.25:", desc: "Disable Certbot's built in log rotation."}
|
||||||
- {date: "19.01.25:", desc: "Add [Auto Reload](https://github.com/linuxserver/docker-mods/tree/swag-auto-reload) functionality to SWAG."}
|
- {date: "19.01.25:", desc: "Add [Auto Reload](https://github.com/linuxserver/docker-mods/tree/swag-auto-reload) functionality to SWAG."}
|
||||||
- {date: "17.12.24:", desc: "Rebase to Alpine 3.21."}
|
- {date: "17.12.24:", desc: "Rebase to Alpine 3.21."}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
## Version 2024/12/17 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
## Version 2025/07/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
||||||
|
|
||||||
# redirect all traffic to https
|
# redirect all traffic to https
|
||||||
server {
|
server {
|
||||||
|
@ -14,6 +14,8 @@ server {
|
||||||
server {
|
server {
|
||||||
listen 443 ssl default_server;
|
listen 443 ssl default_server;
|
||||||
listen [::]:443 ssl default_server;
|
listen [::]:443 ssl default_server;
|
||||||
|
listen 443 quic reuseport default_server;
|
||||||
|
listen [::]:443 quic reuseport default_server;
|
||||||
|
|
||||||
server_name _;
|
server_name _;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue