From 38b0c4fc52a935283f83b4267a7f28718e86a340 Mon Sep 17 00:00:00 2001 From: dkaygithub Date: Wed, 24 Jan 2024 11:10:20 -0600 Subject: [PATCH 01/10] Update readme-vars.yml --- readme-vars.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/readme-vars.yml b/readme-vars.yml index b710f62..c160e39 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -72,6 +72,12 @@ app_setup_block: | db.getSiblingDB("MONGO_DBNAME_stat").createUser({user: "MONGO_USER", pwd: "MONGO_PASS", roles: [{role: "dbOwner", db: "MONGO_DBNAME_stat"}]}); ``` + If you are using the Mongo v4 (the latest which does not require AVX): + + ```js + db.getSiblingDB("MONGO_DBNAME").createUser({user: "MONGO_USER", pwd: "MONGO_PASS", roles: [{role: "dbOwner", db: "MONGO_DBNAME"}, {role: "dbOwner", db: "MONGO_DBNAME_stat"}]}); + ``` + Being sure to replace the placeholders with the same values you supplied to the Unifi container, and mount it into your *mongodb* container. For example: From 7e853dc254c2ee65242940d930d23b3d97d24ff8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 11 Jun 2024 17:33:54 +0000 Subject: [PATCH 02/10] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b44aff0..0e7527e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -141,7 +141,7 @@ jmdns 3.4.1 jna 5.12.1 java-archive joda-time 2.10.4 java-archive jq 1.6-2.1ubuntu3 deb -jrt-fs 17.0.10 java-archive +jrt-fs 17.0.11 java-archive json 20231013 java-archive jsr305 3.0.1 java-archive jsr305 3.0.2 java-archive @@ -165,8 +165,8 @@ libblkid1 2.37.2-4ubuntu3.4 libbrotli1 1.0.9-2build6 deb libbsd0 0.11.5-1 deb libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.7 deb -libc6 2.35-0ubuntu3.7 deb +libc-bin 2.35-0ubuntu3.8 deb +libc6 2.35-0ubuntu3.8 deb libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1ubuntu0.22.04.1 deb libcom-err2 1.46.5-2ubuntu1.1 deb @@ -255,7 +255,7 @@ libunistring2 1.0-1 libuuid1 2.37.2-4ubuntu3.4 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.7 deb +locales 2.35-0ubuntu3.8 deb log4j-api 2.21.1 java-archive log4j-to-slf4j 2.21.1 java-archive logback-access 1.4.14 java-archive @@ -278,7 +278,7 @@ ncurses-base 6.3-2ubuntu0.1 ncurses-bin 6.3-2ubuntu0.1 deb netcat 1.218-4ubuntu1 deb netcat-openbsd 1.218-4ubuntu1 deb -openjdk-17-jre-headless 17.0.10+7-1~22.04.1 deb +openjdk-17-jre-headless 17.0.11+9-1~22.04.1 deb openssh 1.0 java-archive openssl 3.0.2-0ubuntu1.15 deb org.eclipse.paho.client.mqttv3 1.1.0 java-archive From f8b55405ff5dd54c8dd9af8427d265df818daca1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 23 Jun 2024 11:58:53 +0000 Subject: [PATCH 03/10] Bot Updating Templated Files --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index c4dafe5..225e4d6 100644 --- a/README.md +++ b/README.md @@ -96,6 +96,12 @@ db.createUser({ EOF ``` +If you are using the Mongo v4 (the latest which does not require AVX): + +```js +db.getSiblingDB("MONGO_DBNAME").createUser({user: "MONGO_USER", pwd: "MONGO_PASS", roles: [{role: "dbOwner", db: "MONGO_DBNAME"}, {role: "dbOwner", db: "MONGO_DBNAME_stat"}]}); +``` + Being sure to replace the placeholders with the same values you supplied to the Unifi container, and mount it into your *mongodb* container. For example: From 917037f4e8c9f1aaf531ffb7ef83e3d4c90f2db7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 25 Jun 2024 17:29:51 +0000 Subject: [PATCH 04/10] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 0e7527e..e41c829 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -172,7 +172,7 @@ libcap2 1:2.44-1ubuntu0.22.04.1 libcom-err2 1.46.5-2ubuntu1.1 deb libcommons-daemon-java 1.0.15-8 deb libcrypt1 1:4.4.27-1 deb -libcups2 2.4.1op1-1ubuntu4.8 deb +libcups2 2.4.1op1-1ubuntu4.9 deb libcurl4 7.81.0-1ubuntu1.16 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdbus-1-3 1.12.20-2ubuntu4.1 deb From ee6e7f88473b3af61a618fab8dde3cbbd1dbb964 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 2 Jul 2024 17:30:36 +0000 Subject: [PATCH 05/10] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e41c829..bda7707 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -172,7 +172,7 @@ libcap2 1:2.44-1ubuntu0.22.04.1 libcom-err2 1.46.5-2ubuntu1.1 deb libcommons-daemon-java 1.0.15-8 deb libcrypt1 1:4.4.27-1 deb -libcups2 2.4.1op1-1ubuntu4.9 deb +libcups2 2.4.1op1-1ubuntu4.10 deb libcurl4 7.81.0-1ubuntu1.16 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdbus-1-3 1.12.20-2ubuntu4.1 deb From fcac3b454ed50362b441af46402a9db3e2a222db Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 9 Jul 2024 17:30:07 +0000 Subject: [PATCH 06/10] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index bda7707..c0060d4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -243,7 +243,7 @@ libsmartcols1 2.37.2-4ubuntu3.4 libsqlite3-0 3.37.2-2ubuntu0.3 deb libss2 1.46.5-2ubuntu1.1 deb libssh-4 0.9.6-2ubuntu0.22.04.3 deb -libssl3 3.0.2-0ubuntu1.15 deb +libssl3 3.0.2-0ubuntu1.16 deb libstdc++6 12.3.0-1ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.12 deb libtasn1-6 4.18.0-4build1 deb @@ -280,7 +280,7 @@ netcat 1.218-4ubuntu1 netcat-openbsd 1.218-4ubuntu1 deb openjdk-17-jre-headless 17.0.11+9-1~22.04.1 deb openssh 1.0 java-archive -openssl 3.0.2-0ubuntu1.15 deb +openssl 3.0.2-0ubuntu1.16 deb org.eclipse.paho.client.mqttv3 1.1.0 java-archive owasp-java-html-sanitizer 20240325.1 java-archive passwd 1:4.8.1-2ubuntu2.2 deb From 127481d2010b4b7c73d650327a8dd4d87f28659a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 16 Jul 2024 17:26:43 +0000 Subject: [PATCH 07/10] Bot Updating Templated Files --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5bba590..5d7a4b9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -245,7 +245,7 @@ pipeline { -v ${WORKSPACE}:/mnt \ -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ -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 && \ python3 -m venv /lsiopy && \ pip install --no-cache-dir -U pip && \ @@ -352,7 +352,7 @@ pipeline { fi echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub" 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 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ cd ${TEMPDIR}/docs/docker-documentation @@ -370,8 +370,8 @@ pipeline { echo "Docs update not needed, skipping" fi mkdir -p ${TEMPDIR}/unraid - git clone 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/docker-templates.git ${TEMPDIR}/unraid/docker-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 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 @@ -703,7 +703,7 @@ pipeline { set -e docker pull ghcr.io/linuxserver/ci:latest 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} fi docker run --rm \ @@ -794,7 +794,7 @@ pipeline { echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin 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} fi for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do From 9aaff76b45150439010651a2bbd672c88ca7102b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 16 Jul 2024 17:27:52 +0000 Subject: [PATCH 08/10] Bot Updating Templated Files --- .github/workflows/permissions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml index 1447bc5..02e1bdb 100644 --- a/.github/workflows/permissions.yml +++ b/.github/workflows/permissions.yml @@ -5,6 +5,8 @@ on: - '**/run' - '**/finish' - '**/check' + - 'root/migrations/*' + jobs: permission_check: uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 From 37ff2486fa234a53ec3e466bffdb2ba360d7a9f9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 16 Jul 2024 17:32:05 +0000 Subject: [PATCH 09/10] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c0060d4..68e0139 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -335,7 +335,7 @@ tomcat-embed-el 10.1.20 tomcat-embed-jasper 10.1.20 java-archive tomcat-embed-websocket 10.1.20 java-archive txw2 4.0.5 java-archive -tzdata 2024a-0ubuntu0.22.04 deb +tzdata 2024a-0ubuntu0.22.04.1 deb ubuntu-keyring 2021.03.26 deb ucf 3.0043 deb unzip 6.0-26ubuntu3.2 deb From 4caf784aacc112032ca3048d4260138d4aa543f8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 17 Jul 2024 13:54:23 +0000 Subject: [PATCH 10/10] Bot Updating Package Versions --- package_versions.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 68e0139..c2c4ef6 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -53,7 +53,7 @@ debconf 1.5.79ubuntu1 debianutils 5.5-1ubuntu2 deb diffutils 1:3.8-0ubuntu2 deb dirmngr 2.2.27-3ubuntu2.1 deb -dom4j 1.6.1 java-archive +dom4j 2.1.4 java-archive dpkg 1.21.1ubuntu2.3 deb e2fsprogs 1.46.5-2ubuntu1.1 deb ecj 3.33.0 java-archive @@ -127,9 +127,11 @@ java-ucp 1.1 java-uuid-generator 4.3.0 java-archive java10-shim 20240325.1 java-archive java8-shim 20240325.1 java-archive +jaxb-api 2.2.12 java-archive jaxb-core 4.0.5 java-archive jaxb-impl 4.0.5 java-archive jaxb-runtime 4.0.5 java-archive +jaxen 2.0.0 java-archive jbcrypt 0.4 java-archive jboss-logging 3.5.3.Final java-archive jcl-over-slf4j 2.0.13 java-archive @@ -202,8 +204,8 @@ libkrb5-3 1.19.2-2ubuntu0.3 libkrb5support0 1.19.2-2ubuntu0.3 deb libksba8 1.6.0-2ubuntu0.2 deb liblcms2-2 2.12~rc1-2build2 deb -libldap-2.5-0 2.5.17+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.17+dfsg-0ubuntu0.22.04.1 deb +libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.1 deb +libldap-common 2.5.18+dfsg-0ubuntu0.22.04.1 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb @@ -293,10 +295,12 @@ proto-google-iam-v1 0.12.0 protobuf-java 3.6.0 java-archive protobuf-java-util 3.6.0 java-archive publicsuffix 20211207.1025-1 deb +pull-parser 2.1.10 java-archive radclient4 4.0 java-archive reactive-streams 1.0.4 java-archive reactor-core 3.6.5 java-archive readline-common 8.1.2-1 deb +relaxngDatatype 20020414 java-archive resource-loader 2.0.2 java-archive sed 4.8-1ubuntu2 deb sensible-utils 0.0.17 deb @@ -327,6 +331,7 @@ spring-web 6.1.6 spring-webmvc 6.1.6 java-archive spring-websocket 6.1.6 java-archive sshj 0.38.0 java-archive +stax-api 1.0-2 java-archive sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.2 deb tomcat-annotations-api 10.1.20 java-archive @@ -342,4 +347,6 @@ unzip 6.0-26ubuntu3.2 urlrewritefilter 4.0.4.1 java-archive usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3.4 deb +xpp3 1.1.4c java-archive +xsdlib 2013.6.1 java-archive zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb