mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-03-03 00:43:34 +09:00
Compare commits
8 Commits
2.2.0-ls17
...
2.3.0-ls18
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
635990d3ff | ||
|
|
d85216d876 | ||
|
|
03f58b3f2c | ||
|
|
823c4e8ff6 | ||
|
|
b7ad54dbfb | ||
|
|
11edbd85e3 | ||
|
|
7d12260681 | ||
|
|
a4b9e77d08 |
@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
|
||||
[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
|
||||
[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
|
||||
indent_style = space
|
||||
indent_size = 4
|
||||
|
||||
2
.github/workflows/greetings.yml
vendored
2
.github/workflows/greetings.yml
vendored
@@ -8,6 +8,6 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/first-interaction@v1
|
||||
with:
|
||||
issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-swag/blob/master/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-swag/blob/master/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!'
|
||||
issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
|
||||
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-swag/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
|
||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
9
.github/workflows/permissions.yml
vendored
Executable file
9
.github/workflows/permissions.yml
vendored
Executable file
@@ -0,0 +1,9 @@
|
||||
name: Permission check
|
||||
on:
|
||||
pull_request:
|
||||
paths:
|
||||
- '**/run'
|
||||
- '**/finish'
|
||||
jobs:
|
||||
permission_check:
|
||||
uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1
|
||||
26
Jenkinsfile
vendored
26
Jenkinsfile
vendored
@@ -57,7 +57,7 @@ pipeline {
|
||||
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
|
||||
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
|
||||
env.PULL_REQUEST = env.CHANGE_ID
|
||||
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
|
||||
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
|
||||
}
|
||||
script{
|
||||
env.LS_RELEASE_NUMBER = sh(
|
||||
@@ -805,19 +805,19 @@ pipeline {
|
||||
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
|
||||
if [ "${CI}" == "false" ]; then
|
||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
|
||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
|
||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
|
||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
|
||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
||||
fi
|
||||
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
|
||||
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
|
||||
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
|
||||
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
|
||||
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
|
||||
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
|
||||
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
|
||||
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
|
||||
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
|
||||
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
|
||||
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
|
||||
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
||||
if [ -n "${SEMVER}" ]; then
|
||||
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
|
||||
@@ -825,13 +825,13 @@ pipeline {
|
||||
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
||||
fi
|
||||
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
|
||||
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
|
||||
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||
docker push ${MANIFESTIMAGE}:amd64-latest
|
||||
docker push ${MANIFESTIMAGE}:arm32v7-latest
|
||||
docker push ${MANIFESTIMAGE}:arm64v8-latest
|
||||
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
|
||||
docker push ${MANIFESTIMAGE}:amd64-latest
|
||||
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
|
||||
docker push ${MANIFESTIMAGE}:arm32v7-latest
|
||||
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
|
||||
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||
docker push ${MANIFESTIMAGE}:arm64v8-latest
|
||||
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
||||
if [ -n "${SEMVER}" ]; then
|
||||
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
|
||||
@@ -977,12 +977,12 @@ pipeline {
|
||||
sh 'echo "build aborted"'
|
||||
}
|
||||
else if (currentBuild.currentResult == "SUCCESS"){
|
||||
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
|
||||
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\
|
||||
"description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
|
||||
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
|
||||
}
|
||||
else {
|
||||
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
|
||||
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
|
||||
"description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
|
||||
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ The architectures supported by this image are:
|
||||
| :----: | :----: | ---- |
|
||||
| x86-64 | ✅ | amd64-\<version tag\> |
|
||||
| arm64 | ✅ | arm64v8-\<version tag\> |
|
||||
| armhf| ✅ | arm32v7-\<version tag\> |
|
||||
| armhf | ✅ | arm32v7-\<version tag\> |
|
||||
|
||||
## Application Setup
|
||||
|
||||
@@ -154,7 +154,7 @@ services:
|
||||
environment:
|
||||
- PUID=1000
|
||||
- PGID=1000
|
||||
- TZ=Europe/London
|
||||
- TZ=Etc/UTC
|
||||
- URL=yourdomain.url
|
||||
- VALIDATION=http
|
||||
- SUBDOMAINS=www, #optional
|
||||
@@ -181,7 +181,7 @@ docker run -d \
|
||||
--cap-add=NET_ADMIN \
|
||||
-e PUID=1000 \
|
||||
-e PGID=1000 \
|
||||
-e TZ=Europe/London \
|
||||
-e TZ=Etc/UTC \
|
||||
-e URL=yourdomain.url \
|
||||
-e VALIDATION=http \
|
||||
-e SUBDOMAINS=www, `#optional` \
|
||||
@@ -197,6 +197,7 @@ docker run -d \
|
||||
-v /path/to/appdata/config:/config \
|
||||
--restart unless-stopped \
|
||||
lscr.io/linuxserver/swag:latest
|
||||
|
||||
```
|
||||
|
||||
## Parameters
|
||||
@@ -209,7 +210,7 @@ Container images are configured using parameters passed at runtime (such as thos
|
||||
| `-p 80` | Http port (required for http validation and http -> https redirect) |
|
||||
| `-e PUID=1000` | for UserID - see below for explanation |
|
||||
| `-e PGID=1000` | for GroupID - see below for explanation |
|
||||
| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London. |
|
||||
| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
|
||||
| `-e URL=yourdomain.url` | Top url you have control over (`customdomain.com` if you own it, or `customsubdomain.ddnsprovider.com` if dynamic dns). |
|
||||
| `-e VALIDATION=http` | Certbot validation method to use, options are `http` or `dns` (`dns` method also requires `DNSPLUGIN` variable set). |
|
||||
| `-e SUBDOMAINS=www,` | Subdomains you'd like the cert to cover (comma separated, no spaces) ie. `www,ftp,cloud`. For a wildcard cert, set this *exactly* to `wildcard` (wildcard cert is available via `dns` validation only) |
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
alpine-baselayout-3.4.0-r0
|
||||
alpine-baselayout-data-3.4.0-r0
|
||||
alpine-keys-2.4-r1
|
||||
alpine-release-3.17.1-r0
|
||||
alpine-release-3.17.2-r0
|
||||
aom-libs-3.5.0-r0
|
||||
apache2-utils-2.4.55-r0
|
||||
apk-tools-2.12.10-r1
|
||||
@@ -21,15 +21,15 @@ fail2ban-1.0.2-r0
|
||||
fontconfig-2.14.1-r0
|
||||
freetype-2.12.1-r0
|
||||
gdbm-1.23-r0
|
||||
git-2.38.3-r1
|
||||
git-perl-2.38.3-r1
|
||||
git-2.38.4-r0
|
||||
git-perl-2.38.4-r0
|
||||
gmp-6.2.1-r2
|
||||
gnupg-2.2.40-r0
|
||||
gnupg-dirmngr-2.2.40-r0
|
||||
gnupg-gpgconf-2.2.40-r0
|
||||
gnupg-utils-2.2.40-r0
|
||||
gnupg-wks-client-2.2.40-r0
|
||||
gnutls-3.7.8-r2
|
||||
gnutls-3.7.8-r3
|
||||
gpg-2.2.40-r0
|
||||
gpg-agent-2.2.40-r0
|
||||
gpg-wks-server-2.2.40-r0
|
||||
@@ -48,7 +48,7 @@ libbsd-0.11.7-r0
|
||||
libbz2-1.0.8-r4
|
||||
libc-utils-0.7.2-r3
|
||||
libcrypto3-3.0.8-r0
|
||||
libcurl-7.87.0-r1
|
||||
libcurl-7.87.0-r2
|
||||
libdav1d-1.0.0-r2
|
||||
libedit-20221030.3.1-r0
|
||||
libevent-2.1.12-r5
|
||||
@@ -132,35 +132,35 @@ pcre-8.45-r2
|
||||
pcre2-10.42-r0
|
||||
perl-5.36.0-r0
|
||||
perl-error-0.17029-r1
|
||||
perl-git-2.38.3-r1
|
||||
php81-8.1.15-r0
|
||||
php81-bcmath-8.1.15-r0
|
||||
php81-bz2-8.1.15-r0
|
||||
php81-common-8.1.15-r0
|
||||
php81-ctype-8.1.15-r0
|
||||
php81-curl-8.1.15-r0
|
||||
php81-dom-8.1.15-r0
|
||||
php81-exif-8.1.15-r0
|
||||
php81-fileinfo-8.1.15-r0
|
||||
php81-fpm-8.1.15-r0
|
||||
php81-ftp-8.1.15-r0
|
||||
php81-gd-8.1.15-r0
|
||||
php81-gmp-8.1.15-r0
|
||||
php81-iconv-8.1.15-r0
|
||||
php81-imap-8.1.15-r0
|
||||
php81-intl-8.1.15-r0
|
||||
php81-ldap-8.1.15-r0
|
||||
php81-mbstring-8.1.15-r0
|
||||
php81-mysqli-8.1.15-r0
|
||||
php81-mysqlnd-8.1.15-r0
|
||||
php81-opcache-8.1.15-r0
|
||||
php81-openssl-8.1.15-r0
|
||||
php81-pdo-8.1.15-r0
|
||||
php81-pdo_mysql-8.1.15-r0
|
||||
php81-pdo_odbc-8.1.15-r0
|
||||
php81-pdo_pgsql-8.1.15-r0
|
||||
php81-pdo_sqlite-8.1.15-r0
|
||||
php81-pear-8.1.15-r0
|
||||
perl-git-2.38.4-r0
|
||||
php81-8.1.16-r0
|
||||
php81-bcmath-8.1.16-r0
|
||||
php81-bz2-8.1.16-r0
|
||||
php81-common-8.1.16-r0
|
||||
php81-ctype-8.1.16-r0
|
||||
php81-curl-8.1.16-r0
|
||||
php81-dom-8.1.16-r0
|
||||
php81-exif-8.1.16-r0
|
||||
php81-fileinfo-8.1.16-r0
|
||||
php81-fpm-8.1.16-r0
|
||||
php81-ftp-8.1.16-r0
|
||||
php81-gd-8.1.16-r0
|
||||
php81-gmp-8.1.16-r0
|
||||
php81-iconv-8.1.16-r0
|
||||
php81-imap-8.1.16-r0
|
||||
php81-intl-8.1.16-r0
|
||||
php81-ldap-8.1.16-r0
|
||||
php81-mbstring-8.1.16-r0
|
||||
php81-mysqli-8.1.16-r0
|
||||
php81-mysqlnd-8.1.16-r0
|
||||
php81-opcache-8.1.16-r0
|
||||
php81-openssl-8.1.16-r0
|
||||
php81-pdo-8.1.16-r0
|
||||
php81-pdo_mysql-8.1.16-r0
|
||||
php81-pdo_odbc-8.1.16-r0
|
||||
php81-pdo_pgsql-8.1.16-r0
|
||||
php81-pdo_sqlite-8.1.16-r0
|
||||
php81-pear-8.1.16-r0
|
||||
php81-pecl-apcu-5.1.22-r0
|
||||
php81-pecl-igbinary-3.2.12-r0
|
||||
php81-pecl-mailparse-3.1.4-r0
|
||||
@@ -168,21 +168,21 @@ php81-pecl-mcrypt-1.0.4-r0
|
||||
php81-pecl-memcached-3.2.0-r0
|
||||
php81-pecl-redis-5.3.7-r0
|
||||
php81-pecl-xmlrpc-1.0.0_rc3-r0
|
||||
php81-pgsql-8.1.15-r0
|
||||
php81-phar-8.1.15-r0
|
||||
php81-posix-8.1.15-r0
|
||||
php81-session-8.1.15-r0
|
||||
php81-simplexml-8.1.15-r0
|
||||
php81-soap-8.1.15-r0
|
||||
php81-sockets-8.1.15-r0
|
||||
php81-sodium-8.1.15-r0
|
||||
php81-sqlite3-8.1.15-r0
|
||||
php81-tokenizer-8.1.15-r0
|
||||
php81-xml-8.1.15-r0
|
||||
php81-xmlreader-8.1.15-r0
|
||||
php81-xmlwriter-8.1.15-r0
|
||||
php81-xsl-8.1.15-r0
|
||||
php81-zip-8.1.15-r0
|
||||
php81-pgsql-8.1.16-r0
|
||||
php81-phar-8.1.16-r0
|
||||
php81-posix-8.1.16-r0
|
||||
php81-session-8.1.16-r0
|
||||
php81-simplexml-8.1.16-r0
|
||||
php81-soap-8.1.16-r0
|
||||
php81-sockets-8.1.16-r0
|
||||
php81-sodium-8.1.16-r0
|
||||
php81-sqlite3-8.1.16-r0
|
||||
php81-tokenizer-8.1.16-r0
|
||||
php81-xml-8.1.16-r0
|
||||
php81-xmlreader-8.1.16-r0
|
||||
php81-xmlwriter-8.1.16-r0
|
||||
php81-xsl-8.1.16-r0
|
||||
php81-zip-8.1.16-r0
|
||||
pinentry-1.2.1-r0
|
||||
popt-1.19-r0
|
||||
procps-3.3.17-r2
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
# Recommended PROPAGATION value in environment for netcup is 900
|
||||
|
||||
dns_netcup_customer_id = 123456
|
||||
dns_netcup_api_key = 0123456789abcdef0123456789abcdef01234567
|
||||
dns_netcup_api_password = abcdef0123456789abcdef01234567abcdef0123
|
||||
|
||||
Reference in New Issue
Block a user