From 9ae485a116c4f2604fe7d3855da048897a4fc171 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 13 Oct 2022 11:11:47 -0500 Subject: [PATCH 01/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 2dbda91..2e74f91 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -52,7 +52,7 @@ libssl1.1-1.1.1q-r0 libstdc++-10.3.1_git20211027-r0 libuuid-2.37.4-r0 libwebp-1.2.2-r0 -libx11-1.7.2-r0 +libx11-1.7.3.1-r0 libxau-1.0.9-r0 libxcb-1.14-r2 libxdmcp-1.1.3-r0 From 41efff8e269135b69821a77b82c41bc2f03820b6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 20 Oct 2022 16:14:50 +0000 Subject: [PATCH 02/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 2e74f91..01ebf80 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,7 +18,7 @@ expat-2.4.9-r0 fontconfig-2.13.1-r4 freetype-2.11.1-r2 gdbm-1.22-r0 -git-2.34.4-r0 +git-2.34.5-r0 glib-2.70.1-r0 icu-libs-69.1-r1 libacl-2.2.53-r0 @@ -57,7 +57,7 @@ libxau-1.0.9-r0 libxcb-1.14-r2 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 -libxml2-2.9.14-r1 +libxml2-2.9.14-r2 libxmu-1.1.3-r0 libxpm-3.5.13-r0 libxt-1.2.1-r0 From 675eb4ecbf528c76073678ff8614af209a949c22 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 27 Oct 2022 18:00:26 +0200 Subject: [PATCH 03/10] Bot Updating Package Versions --- package_versions.txt | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 01ebf80..7470ab6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,7 +14,7 @@ coreutils-9.0-r2 curl-7.80.0-r3 dbus-libs-1.12.24-r0 encodings-1.0.5-r0 -expat-2.4.9-r0 +expat-2.5.0-r0 fontconfig-2.13.1-r4 freetype-2.11.1-r2 gdbm-1.22-r0 @@ -77,28 +77,28 @@ oniguruma-6.9.7.1-r0 openssl-1.1.1q-r0 pcre-8.45-r1 pcre2-10.40-r0 -php8-8.0.18-r0 -php8-common-8.0.18-r0 -php8-ctype-8.0.18-r0 -php8-curl-8.0.18-r0 -php8-dom-8.0.18-r0 -php8-fileinfo-8.0.18-r0 -php8-fpm-8.0.18-r0 -php8-gd-8.0.18-r0 -php8-ldap-8.0.18-r0 -php8-mbstring-8.0.18-r0 -php8-mysqlnd-8.0.18-r0 -php8-openssl-8.0.18-r0 -php8-pdo-8.0.18-r0 -php8-pdo_mysql-8.0.18-r0 +php8-8.0.25-r0 +php8-common-8.0.25-r0 +php8-ctype-8.0.25-r0 +php8-curl-8.0.25-r0 +php8-dom-8.0.25-r0 +php8-fileinfo-8.0.25-r0 +php8-fpm-8.0.25-r0 +php8-gd-8.0.25-r0 +php8-ldap-8.0.25-r0 +php8-mbstring-8.0.25-r0 +php8-mysqlnd-8.0.25-r0 +php8-openssl-8.0.25-r0 +php8-pdo-8.0.25-r0 +php8-pdo_mysql-8.0.25-r0 php8-pecl-igbinary-3.2.6-r0 php8-pecl-memcached-3.1.5-r1 -php8-phar-8.0.18-r0 -php8-session-8.0.18-r0 -php8-simplexml-8.0.18-r0 -php8-tokenizer-8.0.18-r0 -php8-xml-8.0.18-r0 -php8-xmlwriter-8.0.18-r0 +php8-phar-8.0.25-r0 +php8-session-8.0.25-r0 +php8-simplexml-8.0.25-r0 +php8-tokenizer-8.0.25-r0 +php8-xml-8.0.25-r0 +php8-xmlwriter-8.0.25-r0 popt-1.18-r0 procps-3.3.17-r0 qt5-qtbase-5.15.3_git20210713-r5 From 61039b8749c57e0872d66805741aa31d7f79a9a3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 2 Nov 2022 16:50:55 +0000 Subject: [PATCH 04/10] 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 7470ab6..edbb779 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ busybox-1.34.1-r7 ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 coreutils-9.0-r2 -curl-7.80.0-r3 +curl-7.80.0-r4 dbus-libs-1.12.24-r0 encodings-1.0.5-r0 expat-2.5.0-r0 @@ -28,7 +28,7 @@ libbsd-0.11.3-r1 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1q-r0 -libcurl-7.80.0-r3 +libcurl-7.80.0-r4 libedit-20210910.3.1-r0 libevent-2.1.12-r4 libffi-3.4.2-r1 @@ -74,7 +74,7 @@ netcat-openbsd-1.130-r3 nghttp2-libs-1.46.0-r0 nginx-1.20.2-r1 oniguruma-6.9.7.1-r0 -openssl-1.1.1q-r0 +openssl-1.1.1s-r0 pcre-8.45-r1 pcre2-10.40-r0 php8-8.0.25-r0 From fd055196e85d13f75319399474a2c0f25c7e897c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 3 Nov 2022 11:17:40 -0500 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 edbb779..01f4f1c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -74,7 +74,7 @@ netcat-openbsd-1.130-r3 nghttp2-libs-1.46.0-r0 nginx-1.20.2-r1 oniguruma-6.9.7.1-r0 -openssl-1.1.1s-r0 +openssl-1.1.1s-r1 pcre-8.45-r1 pcre2-10.40-r0 php8-8.0.25-r0 From 214aa452ae72503cf276e1e0515ccab29c004609 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 10 Nov 2022 10:00:28 -0600 Subject: [PATCH 06/10] 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 01f4f1c..839b4fc 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -27,7 +27,7 @@ libblkid-2.37.4-r0 libbsd-0.11.3-r1 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1q-r0 +libcrypto1.1-1.1.1s-r1 libcurl-7.80.0-r4 libedit-20210910.3.1-r0 libevent-2.1.12-r4 @@ -48,7 +48,7 @@ libretls-3.3.4-r3 libsasl-2.1.28-r0 libseccomp-2.5.2-r0 libsm-1.2.3-r0 -libssl1.1-1.1.1q-r0 +libssl1.1-1.1.1s-r1 libstdc++-10.3.1_git20211027-r0 libuuid-2.37.4-r0 libwebp-1.2.2-r0 @@ -110,7 +110,7 @@ skalibs-2.11.0.0-r0 ssl_client-1.34.1-r7 tar-1.34-r0 ttf-freefont-20120503-r2 -tzdata-2022c-r0 +tzdata-2022f-r1 utmps-0.1.0.3-r0 xdg-utils-1.1.3-r0 xprop-1.2.5-r0 From ce3f942f09b369a875a0d474481712417d00e7b2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 10 Nov 2022 10:41:21 -0600 Subject: [PATCH 07/10] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index c8d9e74..8afec0b 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -48,8 +48,12 @@ jobs: | jq -r '.config.digest') image_info=$(curl -sL \ --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/blobs/${digest}" \ - | jq -r '.container_config') + "https://ghcr.io/v2/${image}/blobs/${digest}") + if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then + image_info=$(echo $image_info | jq -r '.config') + else + image_info=$(echo $image_info | jq -r '.container_config') + fi IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}') IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}') if [ -z "${IMAGE_VERSION}" ]; then From 2493ccc5ee3f217bc11a9e55d27a8fd5e3e4dd83 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 30 Nov 2022 13:48:50 +0100 Subject: [PATCH 08/10] Bot Updating Templated Files --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 90a5c64..7455504 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,7 +59,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.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.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' + 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' } script{ env.LS_RELEASE_NUMBER = sh( @@ -287,7 +287,7 @@ pipeline { echo "Jenkinsfile is up to date." fi # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md" + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" From 270010ba935a7fc1d5db6c8ac402f8432e17cf5e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 30 Nov 2022 13:50:10 +0100 Subject: [PATCH 09/10] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE/issue.bug.md | 40 ------------------------- .github/ISSUE_TEMPLATE/issue.feature.md | 25 ---------------- 2 files changed, 65 deletions(-) delete mode 100755 .github/ISSUE_TEMPLATE/issue.bug.md delete mode 100755 .github/ISSUE_TEMPLATE/issue.feature.md diff --git a/.github/ISSUE_TEMPLATE/issue.bug.md b/.github/ISSUE_TEMPLATE/issue.bug.md deleted file mode 100755 index 1d269c9..0000000 --- a/.github/ISSUE_TEMPLATE/issue.bug.md +++ /dev/null @@ -1,40 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve - ---- -[linuxserverurl]: https://linuxserver.io -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - - - - ------------------------------- - -## Expected Behavior - - -## Current Behavior - - -## Steps to Reproduce - - -1. -2. -3. -4. - -## Environment -**OS:** -**CPU architecture:** x86_64/arm32/arm64 -**How docker service was installed:** - - - -## Command used to create docker container (run/create/compose/screenshot) - - -## Docker logs - diff --git a/.github/ISSUE_TEMPLATE/issue.feature.md b/.github/ISSUE_TEMPLATE/issue.feature.md deleted file mode 100755 index 20a91fd..0000000 --- a/.github/ISSUE_TEMPLATE/issue.feature.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project - ---- -[linuxserverurl]: https://linuxserver.io -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - - - - - - - ------------------------------- - -## Desired Behavior - - -## Current Behavior - - -## Alternatives Considered - From 8917e5dac76b333f030afab2ad3dc4d887a5ec97 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 30 Nov 2022 13:51:27 +0100 Subject: [PATCH 10/10] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE/issue.bug.yml | 77 +++++++++++++++++++ .github/ISSUE_TEMPLATE/issue.feature.yml | 31 ++++++++ .github/workflows/external_trigger.yml | 2 +- .../workflows/external_trigger_scheduler.yml | 2 +- .github/workflows/greetings.yml | 2 +- .github/workflows/package_trigger.yml | 2 +- .../workflows/package_trigger_scheduler.yml | 2 +- .github/workflows/stale.yml | 2 +- 8 files changed, 114 insertions(+), 6 deletions(-) create mode 100755 .github/ISSUE_TEMPLATE/issue.bug.yml create mode 100755 .github/ISSUE_TEMPLATE/issue.feature.yml diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml new file mode 100755 index 0000000..59a10f5 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.bug.yml @@ -0,0 +1,77 @@ +# Based on the issue template +name: Bug report +description: Create a report to help us improve +title: "[BUG] " +labels: [Bug] +body: + - type: checkboxes + attributes: + label: Is there an existing issue for this? + description: Please search to see if an issue already exists for the bug you encountered. + options: + - label: I have searched the existing issues + required: true + - type: textarea + attributes: + label: Current Behavior + description: Tell us what happens instead of the expected behavior. + validations: + required: true + - type: textarea + attributes: + label: Expected Behavior + description: Tell us what should happen. + validations: + required: false + - type: textarea + attributes: + label: Steps To Reproduce + description: Steps to reproduce the behavior. + placeholder: | + 1. In this environment... + 2. With this config... + 3. Run '...' + 4. See error... + validations: + required: true + - type: textarea + attributes: + label: Environment + description: | + examples: + - **OS**: Ubuntu 20.04 + - **How docker service was installed**: distro's packagemanager + value: | + - OS: + - How docker service was installed: + render: markdown + validations: + required: false + - type: dropdown + attributes: + label: CPU architecture + options: + - x86-64 + - arm64 + - armhf + validations: + required: true + - type: textarea + attributes: + label: Docker creation + description: | + Command used to create docker container + Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container + render: bash + validations: + required: true + - type: textarea + attributes: + description: | + Provide a full docker log, output of "docker logs linuxserver.io" + label: Container logs + placeholder: | + Output of `docker logs linuxserver.io` + render: bash + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml new file mode 100755 index 0000000..099dcdb --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.feature.yml @@ -0,0 +1,31 @@ +# Based on the issue template +name: Feature request +description: Suggest an idea for this project +title: "[FEAT] <title>" +labels: [enhancement] +body: + - type: checkboxes + attributes: + label: Is this a new feature request? + description: Please search to see if a feature request already exists. + options: + - label: I have searched the existing issues + required: true + - type: textarea + attributes: + label: Wanted change + description: Tell us what you want to happen. + validations: + required: true + - type: textarea + attributes: + label: Reason for change + description: Justify your request, why do you want it, what is the benefit. + validations: + required: true + - type: textarea + attributes: + label: Proposed code change + description: Do you have a potential code change in mind? + validations: + required: false diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 8afec0b..9338da5 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -7,7 +7,7 @@ jobs: external-trigger-master: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 - name: External Trigger if: github.ref == 'refs/heads/master' diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index 70dfeed..230859b 100755 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -9,7 +9,7 @@ jobs: external-trigger-scheduler: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 with: fetch-depth: '0' diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 50c5c26..c39d90b 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -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-bookstack/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!' pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-bookstack/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index 11c927a..5000ec3 100755 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -7,7 +7,7 @@ jobs: package-trigger-master: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 - name: Package Trigger if: github.ref == 'refs/heads/master' diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index e2b1b85..6fb6d98 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -9,7 +9,7 @@ jobs: package-trigger-scheduler: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 with: fetch-depth: '0' diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 3b3846e..73dfe45 100755 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/stale@v3 + - uses: actions/stale@v6.0.1 with: stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."