mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-04-19 10:41:51 +09:00
Compare commits
3 Commits
2.11.0-ls3
...
2.11.0-ls3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
210134745d | ||
|
|
9d469c2957 | ||
|
|
37e64ebdac |
2
.github/workflows/permissions.yml
vendored
2
.github/workflows/permissions.yml
vendored
@@ -5,6 +5,8 @@ on:
|
|||||||
- '**/run'
|
- '**/run'
|
||||||
- '**/finish'
|
- '**/finish'
|
||||||
- '**/check'
|
- '**/check'
|
||||||
|
- 'root/migrations/*'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
permission_check:
|
permission_check:
|
||||||
uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1
|
uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1
|
||||||
|
|||||||
12
Jenkinsfile
vendored
12
Jenkinsfile
vendored
@@ -245,7 +245,7 @@ pipeline {
|
|||||||
-v ${WORKSPACE}:/mnt \
|
-v ${WORKSPACE}:/mnt \
|
||||||
-e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
|
-e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
|
||||||
-e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
|
-e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
|
||||||
ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
|
ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
|
||||||
apk add --no-cache python3 && \
|
apk add --no-cache python3 && \
|
||||||
python3 -m venv /lsiopy && \
|
python3 -m venv /lsiopy && \
|
||||||
pip install --no-cache-dir -U pip && \
|
pip install --no-cache-dir -U pip && \
|
||||||
@@ -352,7 +352,7 @@ pipeline {
|
|||||||
fi
|
fi
|
||||||
echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub"
|
echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub"
|
||||||
mkdir -p ${TEMPDIR}/docs
|
mkdir -p ${TEMPDIR}/docs
|
||||||
git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
|
git clone --depth=1 https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
|
||||||
if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
|
if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
|
||||||
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
|
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
|
||||||
cd ${TEMPDIR}/docs/docker-documentation
|
cd ${TEMPDIR}/docs/docker-documentation
|
||||||
@@ -370,8 +370,8 @@ pipeline {
|
|||||||
echo "Docs update not needed, skipping"
|
echo "Docs update not needed, skipping"
|
||||||
fi
|
fi
|
||||||
mkdir -p ${TEMPDIR}/unraid
|
mkdir -p ${TEMPDIR}/unraid
|
||||||
git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
|
git clone --depth=1 https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
|
||||||
git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
|
git clone --depth=1 https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
|
||||||
if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
|
if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
|
||||||
sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
|
sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
|
||||||
elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
|
elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
|
||||||
@@ -703,7 +703,7 @@ pipeline {
|
|||||||
set -e
|
set -e
|
||||||
docker pull ghcr.io/linuxserver/ci:latest
|
docker pull ghcr.io/linuxserver/ci:latest
|
||||||
if [ "${MULTIARCH}" == "true" ]; then
|
if [ "${MULTIARCH}" == "true" ]; then
|
||||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
|
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
|
||||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
||||||
fi
|
fi
|
||||||
docker run --rm \
|
docker run --rm \
|
||||||
@@ -794,7 +794,7 @@ pipeline {
|
|||||||
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
|
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
|
||||||
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
|
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
|
||||||
if [ "${CI}" == "false" ]; then
|
if [ "${CI}" == "false" ]; then
|
||||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
|
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
|
||||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
||||||
fi
|
fi
|
||||||
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
|
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
|
||||||
|
|||||||
@@ -23,8 +23,8 @@ azure-mgmt-core 1.4.0 python
|
|||||||
azure-mgmt-dns 8.1.0 python
|
azure-mgmt-dns 8.1.0 python
|
||||||
bash 5.2.21-r0 apk
|
bash 5.2.21-r0 apk
|
||||||
beautifulsoup4 4.12.3 python
|
beautifulsoup4 4.12.3 python
|
||||||
boto3 1.34.140 python
|
boto3 1.34.144 python
|
||||||
botocore 1.34.140 python
|
botocore 1.34.144 python
|
||||||
brotli-libs 1.1.0-r1 apk
|
brotli-libs 1.1.0-r1 apk
|
||||||
bs4 0.0.2 python
|
bs4 0.0.2 python
|
||||||
busybox 1.36.1-r19 apk
|
busybox 1.36.1-r19 apk
|
||||||
@@ -95,7 +95,7 @@ curl 8.5.0-r0 apk
|
|||||||
dataclasses-json 0.5.14 python
|
dataclasses-json 0.5.14 python
|
||||||
distro 1.9.0 python
|
distro 1.9.0 python
|
||||||
dns-lexicon 3.17.0 python
|
dns-lexicon 3.17.0 python
|
||||||
dnslib 0.9.24 python
|
dnslib 0.9.25 python
|
||||||
dnspython 2.6.1 python
|
dnspython 2.6.1 python
|
||||||
domeneshop 0.4.4 python
|
domeneshop 0.4.4 python
|
||||||
fail2ban 1.0.2 python
|
fail2ban 1.0.2 python
|
||||||
@@ -118,8 +118,8 @@ gnupg-utils 2.4.4-r0 apk
|
|||||||
gnupg-wks-client 2.4.4-r0 apk
|
gnupg-wks-client 2.4.4-r0 apk
|
||||||
gnutls 3.8.4-r0 apk
|
gnutls 3.8.4-r0 apk
|
||||||
google-api-core 2.19.1 python
|
google-api-core 2.19.1 python
|
||||||
google-api-python-client 2.136.0 python
|
google-api-python-client 2.137.0 python
|
||||||
google-auth 2.31.0 python
|
google-auth 2.32.0 python
|
||||||
google-auth-httplib2 0.2.0 python
|
google-auth-httplib2 0.2.0 python
|
||||||
googleapis-common-protos 1.63.2 python
|
googleapis-common-protos 1.63.2 python
|
||||||
gpg 2.4.4-r0 apk
|
gpg 2.4.4-r0 apk
|
||||||
@@ -145,7 +145,7 @@ libavif 1.0.3-r0 apk
|
|||||||
libbsd 0.11.7-r3 apk
|
libbsd 0.11.7-r3 apk
|
||||||
libbz2 1.0.8-r6 apk
|
libbz2 1.0.8-r6 apk
|
||||||
libc-utils 0.7.2-r5 apk
|
libc-utils 0.7.2-r5 apk
|
||||||
libcrypto3 3.1.6-r0 apk
|
libcrypto3 3.1.6-r2 apk
|
||||||
libcurl 8.5.0-r0 apk
|
libcurl 8.5.0-r0 apk
|
||||||
libdav1d 1.3.0-r1 apk
|
libdav1d 1.3.0-r1 apk
|
||||||
libedit 20230828.3.1-r3 apk
|
libedit 20230828.3.1-r3 apk
|
||||||
@@ -178,7 +178,7 @@ libseccomp 2.5.5-r0 apk
|
|||||||
libsharpyuv 1.3.2-r0 apk
|
libsharpyuv 1.3.2-r0 apk
|
||||||
libsm 1.2.4-r3 apk
|
libsm 1.2.4-r3 apk
|
||||||
libsodium 1.0.19-r0 apk
|
libsodium 1.0.19-r0 apk
|
||||||
libssl3 3.1.6-r0 apk
|
libssl3 3.1.6-r2 apk
|
||||||
libstdc++ 13.2.1_git20231014-r0 apk
|
libstdc++ 13.2.1_git20231014-r0 apk
|
||||||
libtasn1 4.19.0-r2 apk
|
libtasn1 4.19.0-r2 apk
|
||||||
libunistring 1.1-r2 apk
|
libunistring 1.1-r2 apk
|
||||||
@@ -235,7 +235,7 @@ nginx-mod-stream-geoip2 1.24.0-r16 apk
|
|||||||
nginx-vim 1.24.0-r16 apk
|
nginx-vim 1.24.0-r16 apk
|
||||||
npth 1.6-r4 apk
|
npth 1.6-r4 apk
|
||||||
oniguruma 6.9.9-r0 apk
|
oniguruma 6.9.9-r0 apk
|
||||||
openssl 3.1.6-r0 apk
|
openssl 3.1.6-r2 apk
|
||||||
p11-kit 0.25.3-r0 apk
|
p11-kit 0.25.3-r0 apk
|
||||||
packaging 24.1 python
|
packaging 24.1 python
|
||||||
parsedatetime 2.6 python
|
parsedatetime 2.6 python
|
||||||
@@ -294,7 +294,7 @@ php83-xmlwriter 8.3.8-r0 apk
|
|||||||
php83-xsl 8.3.8-r0 apk
|
php83-xsl 8.3.8-r0 apk
|
||||||
php83-zip 8.3.8-r0 apk
|
php83-zip 8.3.8-r0 apk
|
||||||
pinentry 1.2.1-r1 apk
|
pinentry 1.2.1-r1 apk
|
||||||
pip 24.1.1 python
|
pip 24.1.2 python
|
||||||
pkb-client 1.2 python
|
pkb-client 1.2 python
|
||||||
popt 1.19-r3 apk
|
popt 1.19-r3 apk
|
||||||
portalocker 2.10.0 python
|
portalocker 2.10.0 python
|
||||||
|
|||||||
Reference in New Issue
Block a user