From 58f67ca671201a956d35e1337a23d32d9441731e Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 23 Dec 2023 18:08:59 -0600 Subject: [PATCH 1/9] Rebase to Alpine 3.19 Signed-off-by: Eric Nemchik --- Dockerfile | 28 ++++++++++++++-------------- Dockerfile.aarch64 | 28 ++++++++++++++-------------- readme-vars.yml | 3 ++- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/Dockerfile b/Dockerfile index d710d8d..bf6d391 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19 ARG BUILD_DATE ARG VERSION @@ -12,19 +12,19 @@ RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ busybox-suid \ - php82-dom \ - php82-gd \ - php82-intl \ - php82-ldap \ - php82-opcache \ - php82-pecl-apcu \ - php82-pecl-yaml \ - php82-redis \ - php82-tokenizer && \ + php83-dom \ + php83-gd \ + php83-intl \ + php83-ldap \ + php83-opcache \ + php83-pecl-apcu \ + php83-pecl-yaml \ + php83-redis \ + php83-tokenizer && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php82/php-fpm.conf && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \ + grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \ echo "**** setup php opcache ****" && \ { \ echo 'opcache.memory_consumption=128'; \ @@ -32,7 +32,7 @@ RUN \ echo 'opcache.max_accelerated_files=4000'; \ echo 'opcache.revalidate_freq=2'; \ echo 'opcache.enable_cli=1'; \ - } > /etc/php82/conf.d/php-opcache.ini && \ + } > /etc/php83/conf.d/php-opcache.ini && \ if [ -z ${GRAV_RELEASE+x} ]; then \ GRAV_RELEASE=$(curl -sX GET "https://api.github.com/repos/getgrav/grav/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 558745b..51f4afe 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19 ARG BUILD_DATE ARG VERSION @@ -12,19 +12,19 @@ RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ busybox-suid \ - php82-dom \ - php82-gd \ - php82-intl \ - php82-ldap \ - php82-opcache \ - php82-pecl-apcu \ - php82-pecl-yaml \ - php82-redis \ - php82-tokenizer && \ + php83-dom \ + php83-gd \ + php83-intl \ + php83-ldap \ + php83-opcache \ + php83-pecl-apcu \ + php83-pecl-yaml \ + php83-redis \ + php83-tokenizer && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php82/php-fpm.conf && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \ + grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \ echo "**** setup php opcache ****" && \ { \ echo 'opcache.memory_consumption=128'; \ @@ -32,7 +32,7 @@ RUN \ echo 'opcache.max_accelerated_files=4000'; \ echo 'opcache.revalidate_freq=2'; \ echo 'opcache.enable_cli=1'; \ - } > /etc/php82/conf.d/php-opcache.ini && \ + } > /etc/php83/conf.d/php-opcache.ini && \ if [ -z ${GRAV_RELEASE+x} ]; then \ GRAV_RELEASE=$(curl -sX GET "https://api.github.com/repos/getgrav/grav/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ diff --git a/readme-vars.yml b/readme-vars.yml index c40b19d..2bcc299 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -28,7 +28,7 @@ param_ports: param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Contains all relevant configuration files." } + - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } # application setup block app_setup_block_enabled: true @@ -39,6 +39,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } - { date: "06.05.23:", desc: "Add php-ldap for LDAP support." } - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." } From b4712b0a565df20a94ca45a3e039df232a3af47d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 5 Jan 2024 13:29:07 +0000 Subject: [PATCH 2/9] Bot Updating Package Versions --- package_versions.txt | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c9f9d17..d8a0cb8 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -19,9 +19,8 @@ busybox-binsh 1.36.1-r5 apk busybox-suid 1.36.1-r5 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk -composer 2.6.4 binary composer 2.6.6 binary -composer/ca-bundle 1.3.7 php-composer +composer/ca-bundle 1.4.0 php-composer composer/semver 1.7.2 php-composer coreutils 9.3-r1 apk curl 8.5.0-r0 apk @@ -30,12 +29,12 @@ doctrine/cache 1.13.0 php-composer doctrine/collections 1.8.0 php-composer doctrine/deprecations 1.1.2 php-composer doctrine/lexer 1.2.3 php-composer -donatj/phpuseragentparser v1.7.0 php-composer +donatj/phpuseragentparser v1.8.0 php-composer dragonmantank/cron-expression v1.2.1 php-composer egulias/email-validator 3.2.1 php-composer erusev/parsedown 1.7.4 php-composer erusev/parsedown-extra 0.8.1 php-composer -filp/whoops 2.15.3 php-composer +filp/whoops 2.15.4 php-composer freetype 2.13.0-r5 apk gdbm 1.23-r1 apk getgrav/cache v2.0.0 php-composer @@ -94,7 +93,7 @@ logrotate 3.21.0-r1 apk lz4-libs 1.9.4-r4 apk matthiasmullie/minify 1.3.71 php-composer matthiasmullie/path-converter 1.1.3 php-composer -maximebf/debugbar v1.19.0 php-composer +maximebf/debugbar v1.19.1 php-composer miljar/php-exif v0.6.5 php-composer monolog/monolog 1.27.1 php-composer multiavatar/multiavatar-php v1.0.5 php-composer @@ -105,8 +104,8 @@ ncurses-terminfo-base 6.4_p20230506-r0 apk netcat-openbsd 1.219-r1 apk nghttp2-libs 1.57.0-r0 apk nginx 1.24.0-r7 apk -nyholm/psr7 1.8.0 php-composer -nyholm/psr7-server 1.0.2 php-composer +nyholm/psr7 1.8.1 php-composer +nyholm/psr7-server 1.1.0 php-composer oniguruma 6.9.8-r1 apk openssl 3.1.4-r1 apk p3k/picofeed 1.0.0 php-composer @@ -154,7 +153,7 @@ psr/log 1.1.4 php-composer psr/simple-cache 1.0.1 php-composer ralouphie/getallheaders 3.0.3 php-composer readline 8.2.1-r1 apk -rhukster/dom-sanitizer 1.0.6 php-composer +rhukster/dom-sanitizer 1.0.7 php-composer robthree/twofactorauth 1.8.2 php-composer rockettheme/toolbox 1.6.5 php-composer scanelf 1.3.7-r1 apk @@ -166,13 +165,13 @@ spectre.css 0.5.1 npm ssl_client 1.36.1-r5 apk symfony/amqp-messenger v5.4.13 php-composer symfony/console v4.4.49 php-composer -symfony/contracts v1.1.13 php-composer +symfony/contracts v1.10.0 php-composer symfony/deprecation-contracts v2.5.2 php-composer symfony/doctrine-messenger v5.4.12 php-composer symfony/event-dispatcher v4.4.44 php-composer symfony/event-dispatcher v5.4.9 php-composer symfony/event-dispatcher-contracts v2.5.2 php-composer -symfony/http-client v4.4.49 php-composer +symfony/http-client v4.4.51 php-composer symfony/mailer v5.4.13 php-composer symfony/messenger v5.4.13 php-composer symfony/mime v5.4.13 php-composer @@ -191,7 +190,7 @@ symfony/service-contracts v2.5.2 php-composer symfony/var-dumper v4.4.47 php-composer symfony/yaml v4.4.45 php-composer twig/twig v1.44.7 php-composer -tzdata 2023c-r1 apk +tzdata 2023d-r0 apk utmps-libs 0.1.2.1-r1 apk willdurand/negotiation 3.1.0 php-composer xz-libs 5.4.3-r0 apk From 457f4d0e485395e9d743ff0f4ab239bb28163e39 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 13 Jan 2024 13:46:49 +0000 Subject: [PATCH 3/9] Bot Updating Templated Files --- Jenkinsfile | 287 +++++++++++++++++++++++++++------------------------- 1 file changed, 148 insertions(+), 139 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bce11c3..7181452 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,6 +16,7 @@ pipeline { GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') + DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat') EXT_GIT_BRANCH = 'master' EXT_USER = 'getgrav' EXT_REPO = 'grav' @@ -61,11 +62,16 @@ pipeline { env.COMMIT_SHA = sh( script: '''git rev-parse HEAD''', returnStdout: true).trim() + env.GH_DEFAULT_BRANCH = sh( + script: '''git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||' ''', + returnStdout: true).trim() 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/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt' } + sh '''#! /bin/bash + echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" ''' script{ env.LS_RELEASE_NUMBER = sh( script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''', @@ -130,7 +136,7 @@ pipeline { steps{ script{ env.EXT_RELEASE_CLEAN = sh( - script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', + script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/ ]//g' ''', returnStdout: true).trim() def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/ @@ -148,7 +154,7 @@ pipeline { } if (env.SEMVER != null) { - if (BRANCH_NAME != "master" && BRANCH_NAME != "main") { + if (BRANCH_NAME != "${env.GH_DEFAULT_BRANCH}") { env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}" } println("SEMVER: ${env.SEMVER}") @@ -266,115 +272,150 @@ pipeline { } } steps { - sh '''#! /bin/bash - set -e - TEMPDIR=$(mktemp -d) - docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=main -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - # Stage 1 - Jenkinsfile update - if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f main - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ - git add Jenkinsfile - git commit -m 'Bot Updating Templated Files' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Updating Jenkinsfile" - rm -Rf ${TEMPDIR} - exit 0 - else - echo "Jenkinsfile is up to date." - fi - # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" - for i in ${OLD_TEMPLATES}; do - if [[ -f "${i}" ]]; then - TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + sh '''#! /bin/bash + set -e + TEMPDIR=$(mktemp -d) + docker pull ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=main -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + # Stage 1 - Jenkinsfile update + if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f main + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ + git add Jenkinsfile + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating Jenkinsfile" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "Jenkinsfile is up to date." fi - done - if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f main - for i in ${TEMPLATES_TO_DELETE}; do - git rm "${i}" + # Stage 2 - Delete old templates + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" + for i in ${OLD_TEMPLATES}; do + if [[ -f "${i}" ]]; then + TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" + fi done - git commit -m 'Bot Updating Templated Files' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Deleting old and deprecated templates" - rm -Rf ${TEMPDIR} - exit 0 - else - echo "No templates to delete" - fi - # Stage 3 - Update templates - CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - cd ${TEMPDIR}/docker-${CONTAINER_NAME} - NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f main + if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f main + for i in ${TEMPLATES_TO_DELETE}; do + git rm "${i}" + done + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Deleting old and deprecated templates" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "No templates to delete" + fi + # Stage 3 - Update templates + CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE - cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : - cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || : - cd ${TEMPDIR}/repo/${LS_REPO}/ - if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then - echo ".jenkins-external" >> .gitignore - git add .gitignore + NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f main + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE + cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : + cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || : + cd ${TEMPDIR}/repo/${LS_REPO}/ + if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then + echo ".jenkins-external" >> .gitignore + git add .gitignore + fi + git add readme-vars.yml ${TEMPLATED_FILES} + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + else + echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} fi - git add readme-vars.yml ${TEMPLATED_FILES} - git commit -m 'Bot Updating Templated Files' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - else - echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - fi - mkdir -p ${TEMPDIR}/docs - git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -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 - git add docs/images/docker-${CONTAINER_NAME}.md - git commit -m 'Bot Updating Documentation' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all - 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 - 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 - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml - fi - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then - cd ${TEMPDIR}/unraid/templates/ - if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, marking Unraid template as deprecated" - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add -u unraid/${CONTAINER_NAME}.xml - git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Moving Deprecated Unraid Template' || : + mkdir -p ${TEMPDIR}/docs + git clone 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 + GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') + git add docs/images/docker-${CONTAINER_NAME}.md + git commit -m 'Bot Updating Documentation' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} + 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 + 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 + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + fi + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + cd ${TEMPDIR}/unraid/templates/ + GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') + if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add -u unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : + else + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add unraid/${CONTAINER_NAME}.xml + git commit -m 'Bot Updating Unraid Template' + fi + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} + fi + # Stage 4 - Sync Readme to Docker Hub + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then + if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then + echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub" + DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite" + else + echo "Syncing readme to Docker Hub" + DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md" + fi + DH_TOKEN=$(curl -d '{"username":"'${DOCKERUSER}'", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') + curl -s \ + -H "Authorization: JWT ${DH_TOKEN}" \ + -H "Content-Type: application/json" \ + -X PATCH \ + -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \ + https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || : else - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add unraid/${CONTAINER_NAME}.xml - git commit -m 'Bot Updating Unraid Template' + echo "Not the default Github branch. Skipping readme sync to Docker Hub." fi - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all - fi - rm -Rf ${TEMPDIR}''' - script{ - env.FILES_UPDATED = sh( - script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', - returnStdout: true).trim() + rm -Rf ${TEMPDIR}''' + script{ + env.FILES_UPDATED = sh( + script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', + returnStdout: true).trim() + } } } } @@ -568,7 +609,8 @@ pipeline { wait git add package_versions.txt git commit -m 'Bot Updating Package Versions' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} echo "Package tag updated, stopping build process" else @@ -864,39 +906,6 @@ EOF ) ''' } } - // Use helper container to sync the current README on master to the dockerhub endpoint - stage('Sync-README') { - when { - environment name: 'CHANGE_ID', value: '' - environment name: 'EXIT_STATUS', value: '' - } - steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - sh '''#! /bin/bash - set -e - TEMPDIR=$(mktemp -d) - docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - docker pull ghcr.io/linuxserver/readme-sync - docker run --rm=true \ - -e DOCKERHUB_USERNAME=$DOCKERUSER \ - -e DOCKERHUB_PASSWORD=$DOCKERPASS \ - -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \ - -e DOCKER_REPOSITORY=${IMAGE} \ - -e GIT_BRANCH=master \ - -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - ghcr.io/linuxserver/readme-sync bash -c 'node sync' - rm -Rf ${TEMPDIR} ''' - } - } - } // If this is a Pull request send the CI link as a comment on it stage('Pull Request Comment') { when { From 02021098d3765127c1ce41333e7b0ab23c04afb9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 13 Jan 2024 13:49:31 +0000 Subject: [PATCH 4/9] Bot Updating Templated Files --- README.md | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/README.md b/README.md index 252dc2a..bcfabf7 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,6 @@ To help you get started creating a container from this image you can either use ```yaml --- -version: "2.1" services: grav: image: lscr.io/linuxserver/grav:latest @@ -182,7 +181,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to ## Updating Info -Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. +Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. Below are the instructions for updating containers: @@ -247,21 +246,6 @@ Below are the instructions for updating containers: docker image prune ``` -### Via Watchtower auto-updater (only use if you don't remember the original parameters) - -* Pull the latest image at its tag and replace it with the same env variables in one run: - - ```bash - docker run --rm \ - -v /var/run/docker.sock:/var/run/docker.sock \ - containrrr/watchtower \ - --run-once grav - ``` - -* You can also remove the old dangling images: `docker image prune` - -**warning**: We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). - ### Image Update Notifications - Diun (Docker Image Update Notifier) **tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. From 755d6dca6c630a07d87a885d7cd78ceadb5ce02b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 13 Jan 2024 13:53:55 +0000 Subject: [PATCH 5/9] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d8a0cb8..17e1853 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -57,7 +57,7 @@ libavif 0.11.1-r2 apk libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r1 apk +libcrypto3 3.1.4-r3 apk libcurl 8.5.0-r0 apk libdav1d 1.2.1-r0 apk libedit 20221030.3.1-r1 apk @@ -74,7 +74,7 @@ libpng 1.6.39-r3 apk libproc2 4.0.4-r0 apk libsasl 2.1.28-r4 apk libsm 1.2.4-r1 apk -libssl3 3.1.4-r1 apk +libssl3 3.1.4-r3 apk libstdc++ 12.2.1_git20220924-r10 apk libunistring 1.1-r1 apk libuuid 2.38.1-r8 apk @@ -107,7 +107,7 @@ nginx 1.24.0-r7 apk nyholm/psr7 1.8.1 php-composer nyholm/psr7-server 1.1.0 php-composer oniguruma 6.9.8-r1 apk -openssl 3.1.4-r1 apk +openssl 3.1.4-r3 apk p3k/picofeed 1.0.0 php-composer paragonie/random_compat v1.4.3 php-composer pcre 8.45-r3 apk From 9287f5b2364478dde06badbb40ab173e9191dd18 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 20 Jan 2024 13:46:30 +0000 Subject: [PATCH 6/9] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 17e1853..c929b8e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -57,7 +57,7 @@ libavif 0.11.1-r2 apk libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r3 apk +libcrypto3 3.1.4-r4 apk libcurl 8.5.0-r0 apk libdav1d 1.2.1-r0 apk libedit 20221030.3.1-r1 apk @@ -74,7 +74,7 @@ libpng 1.6.39-r3 apk libproc2 4.0.4-r0 apk libsasl 2.1.28-r4 apk libsm 1.2.4-r1 apk -libssl3 3.1.4-r3 apk +libssl3 3.1.4-r4 apk libstdc++ 12.2.1_git20220924-r10 apk libunistring 1.1-r1 apk libuuid 2.38.1-r8 apk @@ -107,7 +107,7 @@ nginx 1.24.0-r7 apk nyholm/psr7 1.8.1 php-composer nyholm/psr7-server 1.1.0 php-composer oniguruma 6.9.8-r1 apk -openssl 3.1.4-r3 apk +openssl 3.1.4-r4 apk p3k/picofeed 1.0.0 php-composer paragonie/random_compat v1.4.3 php-composer pcre 8.45-r3 apk From e1a8f3ebb766ad04b2c520ddb9bae07043c1af5d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 27 Jan 2024 02:20:08 +0000 Subject: [PATCH 7/9] Bot Updating Templated Files --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bcfabf7..790e68c 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ services: - PGID=1000 - TZ=Etc/UTC volumes: - - /path/to/appdata/config:/config + - /path/to/grav/config:/config ports: - 80:80 restart: unless-stopped @@ -95,7 +95,7 @@ docker run -d \ -e PGID=1000 \ -e TZ=Etc/UTC \ -p 80:80 \ - -v /path/to/appdata/config:/config \ + -v /path/to/grav/config:/config \ --restart unless-stopped \ lscr.io/linuxserver/grav:latest ``` @@ -110,7 +110,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | -| `-v /config` | Contains all relevant configuration files. | +| `-v /config` | Persistent config files | ## Environment variables from files (Docker secrets) @@ -273,6 +273,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.12.23:** - Rebase to Alpine 3.19 with php 8.3. * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf. * **06.05.23:** - Add php-ldap for LDAP support. * **13.04.23:** - Move ssl.conf include to default.conf. From 493338c900ecd8efab05f5aee024ee54e40c0439 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 27 Jan 2024 02:24:55 +0000 Subject: [PATCH 8/9] Bot Updating Package Versions --- package_versions.txt | 404 ++++++++++++++++++++++--------------------- 1 file changed, 205 insertions(+), 199 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c929b8e..5c70462 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,199 +1,205 @@ -NAME VERSION TYPE -Hidden Input 1, 0, 0, 0 dotnet -alpine-baselayout 3.4.3-r1 apk -alpine-baselayout-data 3.4.3-r1 apk -alpine-keys 2.4-r1 apk -alpine-release 3.18.5-r0 apk -aom-libs 3.6.1-r0 apk -apache2-utils 2.4.58-r0 apk -apk-tools 2.14.0-r2 apk -apr 1.7.4-r0 apk -apr-util 1.6.3-r1 apk -argon2-libs 20190702-r4 apk -bacon/bacon-qr-code 2.0.8 php-composer -bash 5.2.15-r5 apk -birke/rememberme 1.0.5 php-composer -brotli-libs 1.0.9-r14 apk -busybox 1.36.1-r5 apk -busybox-binsh 1.36.1-r5 apk -busybox-suid 1.36.1-r5 apk -ca-certificates 20230506-r0 apk -ca-certificates-bundle 20230506-r0 apk -composer 2.6.6 binary -composer/ca-bundle 1.4.0 php-composer -composer/semver 1.7.2 php-composer -coreutils 9.3-r1 apk -curl 8.5.0-r0 apk -dasprid/enum 1.0.4 php-composer -doctrine/cache 1.13.0 php-composer -doctrine/collections 1.8.0 php-composer -doctrine/deprecations 1.1.2 php-composer -doctrine/lexer 1.2.3 php-composer -donatj/phpuseragentparser v1.8.0 php-composer -dragonmantank/cron-expression v1.2.1 php-composer -egulias/email-validator 3.2.1 php-composer -erusev/parsedown 1.7.4 php-composer -erusev/parsedown-extra 0.8.1 php-composer -filp/whoops 2.15.4 php-composer -freetype 2.13.0-r5 apk -gdbm 1.23-r1 apk -getgrav/cache v2.0.0 php-composer -getgrav/image v3.0.1 php-composer -git 2.40.1-r0 apk -google/recaptcha 1.2.4 php-composer -grav-admin 1.0.0 npm -grav-plugin-form 1.0.0 npm -guzzlehttp/psr7 1.9.1 php-composer -icu-data-en 73.2-r2 apk -icu-libs 73.2-r2 apk -itsgoingd/clockwork v5.1.12 php-composer -jq 1.6-r4 apk -laminas/laminas-xml 1.4.0 php-composer -laminas/laminas-zendframework-bridge 1.4.1 php-composer -league/climate 3.8.2 php-composer -libacl 2.3.1-r3 apk -libattr 2.5.1-r4 apk -libavif 0.11.1-r2 apk -libbsd 0.11.7-r1 apk -libbz2 1.0.8-r5 apk -libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r4 apk -libcurl 8.5.0-r0 apk -libdav1d 1.2.1-r0 apk -libedit 20221030.3.1-r1 apk -libexpat 2.5.0-r1 apk -libgcc 12.2.1_git20220924-r10 apk -libice 1.1.1-r2 apk -libidn2 2.3.4-r1 apk -libintl 0.21.1-r7 apk -libjpeg-turbo 2.1.5.1-r3 apk -libldap 2.6.5-r0 apk -libmd 1.0.4-r2 apk -libncursesw 6.4_p20230506-r0 apk -libpng 1.6.39-r3 apk -libproc2 4.0.4-r0 apk -libsasl 2.1.28-r4 apk -libsm 1.2.4-r1 apk -libssl3 3.1.4-r4 apk -libstdc++ 12.2.1_git20220924-r10 apk -libunistring 1.1-r1 apk -libuuid 2.38.1-r8 apk -libwebp 1.3.2-r0 apk -libx11 1.8.7-r0 apk -libxau 1.0.11-r2 apk -libxcb 1.15-r1 apk -libxdmcp 1.1.4-r2 apk -libxext 1.3.5-r2 apk -libxml2 2.11.6-r0 apk -libxpm 3.5.16-r1 apk -libxt 1.3.0-r2 apk -libzip 1.9.2-r2 apk -linux-pam 1.5.2-r10 apk -logrotate 3.21.0-r1 apk -lz4-libs 1.9.4-r4 apk -matthiasmullie/minify 1.3.71 php-composer -matthiasmullie/path-converter 1.1.3 php-composer -maximebf/debugbar v1.19.1 php-composer -miljar/php-exif v0.6.5 php-composer -monolog/monolog 1.27.1 php-composer -multiavatar/multiavatar-php v1.0.5 php-composer -musl 1.2.4-r2 apk -musl-utils 1.2.4-r2 apk -nano 7.2-r1 apk -ncurses-terminfo-base 6.4_p20230506-r0 apk -netcat-openbsd 1.219-r1 apk -nghttp2-libs 1.57.0-r0 apk -nginx 1.24.0-r7 apk -nyholm/psr7 1.8.1 php-composer -nyholm/psr7-server 1.1.0 php-composer -oniguruma 6.9.8-r1 apk -openssl 3.1.4-r4 apk -p3k/picofeed 1.0.0 php-composer -paragonie/random_compat v1.4.3 php-composer -pcre 8.45-r3 apk -pcre2 10.42-r1 apk -php82 8.2.13-r0 apk -php82-common 8.2.13-r0 apk -php82-ctype 8.2.13-r0 apk -php82-curl 8.2.13-r0 apk -php82-dom 8.2.13-r0 apk -php82-fileinfo 8.2.13-r0 apk -php82-fpm 8.2.13-r0 apk -php82-gd 8.2.13-r0 apk -php82-iconv 8.2.13-r0 apk -php82-intl 8.2.13-r0 apk -php82-ldap 8.2.13-r0 apk -php82-mbstring 8.2.13-r0 apk -php82-opcache 8.2.13-r0 apk -php82-openssl 8.2.13-r0 apk -php82-pecl-apcu 5.1.22-r0 apk -php82-pecl-igbinary 3.2.14-r0 apk -php82-pecl-msgpack 2.2.0-r0 apk -php82-pecl-redis 6.0.2-r0 apk -php82-pecl-yaml 2.2.3-r0 apk -php82-phar 8.2.13-r0 apk -php82-session 8.2.13-r0 apk -php82-simplexml 8.2.13-r0 apk -php82-sockets 8.2.13-r0 apk -php82-tokenizer 8.2.13-r0 apk -php82-xml 8.2.13-r0 apk -php82-xmlwriter 8.2.13-r0 apk -php82-zip 8.2.13-r0 apk -pimple/pimple v3.5.0 php-composer -popt 1.19-r2 apk -procps-ng 4.0.4-r0 apk -psr/cache 1.0.1 php-composer -psr/container 1.1.1 php-composer -psr/event-dispatcher 1.0.0 php-composer -psr/http-factory 1.0.2 php-composer -psr/http-message 1.1 php-composer -psr/http-server-handler 1.0.2 php-composer -psr/http-server-middleware 1.0.2 php-composer -psr/log 1.1.4 php-composer -psr/simple-cache 1.0.1 php-composer -ralouphie/getallheaders 3.0.3 php-composer -readline 8.2.1-r1 apk -rhukster/dom-sanitizer 1.0.7 php-composer -robthree/twofactorauth 1.8.2 php-composer -rockettheme/toolbox 1.6.5 php-composer -scanelf 1.3.7-r1 apk -scssphp/scssphp v1.11.0 php-composer -seld/cli-prompt 1.0.4 php-composer -shadow 4.13-r4 apk -skalibs 2.13.1.1-r1 apk -spectre.css 0.5.1 npm -ssl_client 1.36.1-r5 apk -symfony/amqp-messenger v5.4.13 php-composer -symfony/console v4.4.49 php-composer -symfony/contracts v1.10.0 php-composer -symfony/deprecation-contracts v2.5.2 php-composer -symfony/doctrine-messenger v5.4.12 php-composer -symfony/event-dispatcher v4.4.44 php-composer -symfony/event-dispatcher v5.4.9 php-composer -symfony/event-dispatcher-contracts v2.5.2 php-composer -symfony/http-client v4.4.51 php-composer -symfony/mailer v5.4.13 php-composer -symfony/messenger v5.4.13 php-composer -symfony/mime v5.4.13 php-composer -symfony/polyfill-ctype v1.28.0 php-composer -symfony/polyfill-iconv v1.28.0 php-composer -symfony/polyfill-intl-idn v1.26.0 php-composer -symfony/polyfill-intl-normalizer v1.26.0 php-composer -symfony/polyfill-mbstring v1.28.0 php-composer -symfony/polyfill-php74 v1.28.0 php-composer -symfony/polyfill-php80 v1.26.0 php-composer -symfony/polyfill-php80 v1.28.0 php-composer -symfony/polyfill-php81 v1.28.0 php-composer -symfony/process v4.4.44 php-composer -symfony/redis-messenger v5.4.13 php-composer -symfony/service-contracts v2.5.2 php-composer -symfony/var-dumper v4.4.47 php-composer -symfony/yaml v4.4.45 php-composer -twig/twig v1.44.7 php-composer -tzdata 2023d-r0 apk -utmps-libs 0.1.2.1-r1 apk -willdurand/negotiation 3.1.0 php-composer -xz-libs 5.4.3-r0 apk -yaml 0.2.5-r1 apk -zlib 1.2.13-r1 apk -zstd-libs 1.5.5-r4 apk +NAME VERSION TYPE +Hidden Input 1, 0, 0, 0 dotnet +alpine-baselayout 3.4.3-r2 apk +alpine-baselayout-data 3.4.3-r2 apk +alpine-keys 2.4-r1 apk +alpine-release 3.19.0-r0 apk +aom-libs 3.7.1-r0 apk +apache2-utils 2.4.58-r1 apk +apk-tools 2.14.0-r5 apk +apr 1.7.4-r0 apk +apr-util 1.6.3-r1 apk +argon2-libs 20190702-r5 apk +bacon/bacon-qr-code 2.0.8 php-composer +bash 5.2.21-r0 apk +birke/rememberme 1.0.5 php-composer +brotli-libs 1.1.0-r1 apk +busybox 1.36.1-r15 apk +busybox-binsh 1.36.1-r15 apk +busybox-suid 1.36.1-r15 apk +c-ares 1.24.0-r0 apk +ca-certificates 20230506-r0 apk +ca-certificates-bundle 20230506-r0 apk +composer 2.6.6 binary +composer/ca-bundle 1.4.0 php-composer +composer/semver 1.7.2 php-composer +coreutils 9.4-r1 apk +coreutils-env 9.4-r1 apk +coreutils-fmt 9.4-r1 apk +coreutils-sha512sum 9.4-r1 apk +curl 8.5.0-r0 apk +dasprid/enum 1.0.4 php-composer +doctrine/cache 1.13.0 php-composer +doctrine/collections 1.8.0 php-composer +doctrine/deprecations 1.1.2 php-composer +doctrine/lexer 1.2.3 php-composer +donatj/phpuseragentparser v1.8.0 php-composer +dragonmantank/cron-expression v1.2.1 php-composer +egulias/email-validator 3.2.1 php-composer +erusev/parsedown 1.7.4 php-composer +erusev/parsedown-extra 0.8.1 php-composer +filp/whoops 2.15.4 php-composer +freetype 2.13.2-r0 apk +gdbm 1.23-r1 apk +getgrav/cache v2.0.0 php-composer +getgrav/image v3.0.1 php-composer +git 2.43.0-r0 apk +google/recaptcha 1.2.4 php-composer +grav-admin 1.0.0 npm +grav-plugin-form 1.0.0 npm +guzzlehttp/psr7 1.9.1 php-composer +hiredis 1.2.0-r0 apk +icu-data-en 74.1-r0 apk +icu-libs 74.1-r0 apk +itsgoingd/clockwork v5.1.12 php-composer +jq 1.7.1-r0 apk +laminas/laminas-xml 1.4.0 php-composer +laminas/laminas-zendframework-bridge 1.4.1 php-composer +league/climate 3.8.2 php-composer +libacl 2.3.1-r4 apk +libattr 2.5.1-r5 apk +libavif 1.0.3-r0 apk +libbsd 0.11.7-r3 apk +libbz2 1.0.8-r6 apk +libc-utils 0.7.2-r5 apk +libcrypto3 3.1.4-r4 apk +libcurl 8.5.0-r0 apk +libdav1d 1.3.0-r0 apk +libedit 20230828.3.1-r3 apk +libexpat 2.5.0-r2 apk +libgcc 13.2.1_git20231014-r0 apk +libice 1.1.1-r5 apk +libidn2 2.3.4-r4 apk +libintl 0.22.3-r0 apk +libjpeg-turbo 3.0.1-r0 apk +libldap 2.6.6-r1 apk +libmd 1.1.0-r0 apk +libncursesw 6.4_p20231125-r0 apk +libpng 1.6.40-r0 apk +libproc2 4.0.4-r0 apk +libsasl 2.1.28-r5 apk +libsharpyuv 1.3.2-r0 apk +libsm 1.2.4-r3 apk +libssl3 3.1.4-r4 apk +libstdc++ 13.2.1_git20231014-r0 apk +libunistring 1.1-r2 apk +libuuid 2.39.3-r0 apk +libwebp 1.3.2-r0 apk +libx11 1.8.7-r0 apk +libxau 1.0.11-r3 apk +libxcb 1.16-r0 apk +libxdmcp 1.1.4-r3 apk +libxext 1.3.5-r3 apk +libxml2 2.11.6-r0 apk +libxpm 3.5.17-r0 apk +libxt 1.3.0-r4 apk +libzip 1.10.1-r0 apk +linux-pam 1.5.3-r7 apk +logrotate 3.21.0-r1 apk +lz4-libs 1.9.4-r5 apk +matthiasmullie/minify 1.3.71 php-composer +matthiasmullie/path-converter 1.1.3 php-composer +maximebf/debugbar v1.19.1 php-composer +miljar/php-exif v0.6.5 php-composer +monolog/monolog 1.27.1 php-composer +multiavatar/multiavatar-php v1.0.5 php-composer +musl 1.2.4_git20230717-r4 apk +musl-utils 1.2.4_git20230717-r4 apk +nano 7.2-r1 apk +ncurses-terminfo-base 6.4_p20231125-r0 apk +netcat-openbsd 1.226-r0 apk +nghttp2-libs 1.58.0-r0 apk +nginx 1.24.0-r14 apk +nyholm/psr7 1.8.1 php-composer +nyholm/psr7-server 1.1.0 php-composer +oniguruma 6.9.9-r0 apk +openssl 3.1.4-r4 apk +p3k/picofeed 1.0.0 php-composer +paragonie/random_compat v1.4.3 php-composer +pcre 8.45-r3 apk +pcre2 10.42-r2 apk +php83 8.3.2-r0 apk +php83-common 8.3.2-r0 apk +php83-ctype 8.3.2-r0 apk +php83-curl 8.3.2-r0 apk +php83-dom 8.3.2-r0 apk +php83-fileinfo 8.3.2-r0 apk +php83-fpm 8.3.2-r0 apk +php83-gd 8.3.2-r0 apk +php83-iconv 8.3.2-r0 apk +php83-intl 8.3.2-r0 apk +php83-ldap 8.3.2-r0 apk +php83-mbstring 8.3.2-r0 apk +php83-opcache 8.3.2-r0 apk +php83-openssl 8.3.2-r0 apk +php83-pecl-apcu 5.1.23-r0 apk +php83-pecl-igbinary 3.2.15-r0 apk +php83-pecl-msgpack 2.2.0-r1 apk +php83-pecl-redis 6.0.2-r0 apk +php83-pecl-yaml 2.2.3-r0 apk +php83-phar 8.3.2-r0 apk +php83-session 8.3.2-r0 apk +php83-simplexml 8.3.2-r0 apk +php83-sockets 8.3.2-r0 apk +php83-tokenizer 8.3.2-r0 apk +php83-xml 8.3.2-r0 apk +php83-xmlwriter 8.3.2-r0 apk +php83-zip 8.3.2-r0 apk +pimple/pimple v3.5.0 php-composer +popt 1.19-r3 apk +procps-ng 4.0.4-r0 apk +psr/cache 1.0.1 php-composer +psr/container 1.1.1 php-composer +psr/event-dispatcher 1.0.0 php-composer +psr/http-factory 1.0.2 php-composer +psr/http-message 1.1 php-composer +psr/http-server-handler 1.0.2 php-composer +psr/http-server-middleware 1.0.2 php-composer +psr/log 1.1.4 php-composer +psr/simple-cache 1.0.1 php-composer +ralouphie/getallheaders 3.0.3 php-composer +readline 8.2.1-r2 apk +rhukster/dom-sanitizer 1.0.7 php-composer +robthree/twofactorauth 1.8.2 php-composer +rockettheme/toolbox 1.6.5 php-composer +scanelf 1.3.7-r2 apk +scssphp/scssphp v1.11.0 php-composer +seld/cli-prompt 1.0.4 php-composer +shadow 4.14.2-r0 apk +skalibs 2.14.0.1-r0 apk +spectre.css 0.5.1 npm +ssl_client 1.36.1-r15 apk +symfony/amqp-messenger v5.4.13 php-composer +symfony/console v4.4.49 php-composer +symfony/contracts v1.10.0 php-composer +symfony/deprecation-contracts v2.5.2 php-composer +symfony/doctrine-messenger v5.4.12 php-composer +symfony/event-dispatcher v4.4.44 php-composer +symfony/event-dispatcher v5.4.9 php-composer +symfony/event-dispatcher-contracts v2.5.2 php-composer +symfony/http-client v4.4.51 php-composer +symfony/mailer v5.4.13 php-composer +symfony/messenger v5.4.13 php-composer +symfony/mime v5.4.13 php-composer +symfony/polyfill-ctype v1.28.0 php-composer +symfony/polyfill-iconv v1.28.0 php-composer +symfony/polyfill-intl-idn v1.26.0 php-composer +symfony/polyfill-intl-normalizer v1.26.0 php-composer +symfony/polyfill-mbstring v1.28.0 php-composer +symfony/polyfill-php74 v1.28.0 php-composer +symfony/polyfill-php80 v1.26.0 php-composer +symfony/polyfill-php80 v1.28.0 php-composer +symfony/polyfill-php81 v1.28.0 php-composer +symfony/process v4.4.44 php-composer +symfony/redis-messenger v5.4.13 php-composer +symfony/service-contracts v2.5.2 php-composer +symfony/var-dumper v4.4.47 php-composer +symfony/yaml v4.4.45 php-composer +twig/twig v1.44.7 php-composer +tzdata 2023d-r0 apk +utmps-libs 0.1.2.2-r0 apk +willdurand/negotiation 3.1.0 php-composer +xz-libs 5.4.5-r0 apk +yaml 0.2.5-r2 apk +zlib 1.3-r2 apk +zstd-libs 1.5.5-r8 apk From c6a40932dafd8005face06ced6cf47ae14d14fde Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 3 Feb 2024 13:47:10 +0000 Subject: [PATCH 9/9] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5c70462..cc17bb2 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ Hidden Input 1, 0, 0, 0 dotnet alpine-baselayout 3.4.3-r2 apk alpine-baselayout-data 3.4.3-r2 apk alpine-keys 2.4-r1 apk -alpine-release 3.19.0-r0 apk +alpine-release 3.19.1-r0 apk aom-libs 3.7.1-r0 apk apache2-utils 2.4.58-r1 apk apk-tools 2.14.0-r5 apk @@ -17,16 +17,16 @@ brotli-libs 1.1.0-r1 apk busybox 1.36.1-r15 apk busybox-binsh 1.36.1-r15 apk busybox-suid 1.36.1-r15 apk -c-ares 1.24.0-r0 apk +c-ares 1.24.0-r1 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk composer 2.6.6 binary composer/ca-bundle 1.4.0 php-composer composer/semver 1.7.2 php-composer -coreutils 9.4-r1 apk -coreutils-env 9.4-r1 apk -coreutils-fmt 9.4-r1 apk -coreutils-sha512sum 9.4-r1 apk +coreutils 9.4-r2 apk +coreutils-env 9.4-r2 apk +coreutils-fmt 9.4-r2 apk +coreutils-sha512sum 9.4-r2 apk curl 8.5.0-r0 apk dasprid/enum 1.0.4 php-composer doctrine/cache 1.13.0 php-composer @@ -62,7 +62,7 @@ libavif 1.0.3-r0 apk libbsd 0.11.7-r3 apk libbz2 1.0.8-r6 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r4 apk +libcrypto3 3.1.4-r5 apk libcurl 8.5.0-r0 apk libdav1d 1.3.0-r0 apk libedit 20230828.3.1-r3 apk @@ -80,7 +80,7 @@ libproc2 4.0.4-r0 apk libsasl 2.1.28-r5 apk libsharpyuv 1.3.2-r0 apk libsm 1.2.4-r3 apk -libssl3 3.1.4-r4 apk +libssl3 3.1.4-r5 apk libstdc++ 13.2.1_git20231014-r0 apk libunistring 1.1-r2 apk libuuid 2.39.3-r0 apk @@ -109,11 +109,11 @@ nano 7.2-r1 apk ncurses-terminfo-base 6.4_p20231125-r0 apk netcat-openbsd 1.226-r0 apk nghttp2-libs 1.58.0-r0 apk -nginx 1.24.0-r14 apk +nginx 1.24.0-r15 apk nyholm/psr7 1.8.1 php-composer nyholm/psr7-server 1.1.0 php-composer oniguruma 6.9.9-r0 apk -openssl 3.1.4-r4 apk +openssl 3.1.4-r5 apk p3k/picofeed 1.0.0 php-composer paragonie/random_compat v1.4.3 php-composer pcre 8.45-r3 apk @@ -201,5 +201,5 @@ utmps-libs 0.1.2.2-r0 apk willdurand/negotiation 3.1.0 php-composer xz-libs 5.4.5-r0 apk yaml 0.2.5-r2 apk -zlib 1.3-r2 apk +zlib 1.3.1-r0 apk zstd-libs 1.5.5-r8 apk