From b7229d1db69d70134ced6261302aa5cd6c536c9b Mon Sep 17 00:00:00 2001 From: Roxedus Date: Mon, 25 Jan 2021 10:40:49 +0100 Subject: [PATCH 001/248] Init nightly tag --- .dockerignore | 6 - .gitattributes | 17 - .github/CONTRIBUTING.md | 122 --- .github/FUNDING.yml | 2 - .github/ISSUE_TEMPLATE/config.yml | 13 - .github/ISSUE_TEMPLATE/issue.bug.md | 40 - .github/ISSUE_TEMPLATE/issue.feature.md | 25 - .github/PULL_REQUEST_TEMPLATE.md | 43 - .github/workflows/external_trigger.yml | 92 -- .../workflows/external_trigger_scheduler.yml | 43 - .github/workflows/greetings.yml | 13 - .github/workflows/package_trigger.yml | 38 - .../workflows/package_trigger_scheduler.yml | 50 -- .github/workflows/stale.yml | 23 - .gitignore | 43 - Dockerfile | 73 -- Dockerfile.aarch64 | 87 -- Dockerfile.armhf | 89 -- Jenkinsfile | 785 ------------------ LICENSE | 674 --------------- jenkins-vars.yml | 29 - package_versions.txt | 244 ------ readme-vars.yml | 95 --- root/defaults/app.db | Bin 81920 -> 0 bytes root/defaults/policy.xml | 80 -- root/etc/cont-init.d/30-config | 49 -- root/etc/services.d/calibre-web/run | 6 - 27 files changed, 2781 deletions(-) delete mode 100644 .dockerignore delete mode 100644 .gitattributes delete mode 100755 .github/CONTRIBUTING.md delete mode 100755 .github/FUNDING.yml delete mode 100755 .github/ISSUE_TEMPLATE/config.yml delete mode 100755 .github/ISSUE_TEMPLATE/issue.bug.md delete mode 100755 .github/ISSUE_TEMPLATE/issue.feature.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100755 .github/workflows/external_trigger.yml delete mode 100755 .github/workflows/external_trigger_scheduler.yml delete mode 100755 .github/workflows/greetings.yml delete mode 100755 .github/workflows/package_trigger.yml delete mode 100755 .github/workflows/package_trigger_scheduler.yml delete mode 100755 .github/workflows/stale.yml delete mode 100644 .gitignore delete mode 100644 Dockerfile delete mode 100644 Dockerfile.aarch64 delete mode 100644 Dockerfile.armhf delete mode 100644 Jenkinsfile delete mode 100755 LICENSE delete mode 100644 jenkins-vars.yml delete mode 100755 package_versions.txt delete mode 100644 readme-vars.yml delete mode 100644 root/defaults/app.db delete mode 100644 root/defaults/policy.xml delete mode 100644 root/etc/cont-init.d/30-config delete mode 100644 root/etc/services.d/calibre-web/run diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index cdb1a82fc..000000000 --- a/.dockerignore +++ /dev/null @@ -1,6 +0,0 @@ -.git -.gitignore -.github -.gitattributes -READMETEMPLATE.md -README.md diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index bdb0cabc8..000000000 --- a/.gitattributes +++ /dev/null @@ -1,17 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# Custom for Visual Studio -*.cs diff=csharp - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md deleted file mode 100755 index 3dea55a20..000000000 --- a/.github/CONTRIBUTING.md +++ /dev/null @@ -1,122 +0,0 @@ -# Contributing to calibre-web - -## Gotchas - -* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open. -* Read, and fill the Pull Request template - * If this is a fix for a typo in code or documentation in the README please file an issue - * If the PR is addressing an existing issue include, closes #\, in the body of the PR commit message -* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn) - -## Common files - -| File | Use case | -| :----: | --- | -| `Dockerfile` | Dockerfile used to build amd64 images | -| `Dockerfile.aarch64` | Dockerfile used to build 64bit ARM architectures | -| `Dockerfile.armhf` | Dockerfile used to build 32bit ARM architectures | -| `Jenkinsfile` | This file is a product of our builder and should not be edited directly. This is used to build the image | -| `jenkins-vars.yml` | This file is used to generate the `Jenkinsfile` mentioned above, it only affects the build-process | -| `package_versions.txt` | This file is generated as a part of the build-process and should not be edited directly. It lists all the installed packages and their versions | -| `README.md` | This file is a product of our builder and should not be edited directly. This displays the readme for the repository and image registries | -| `readme-vars.yml` | This file is used to generate the `README.md` | - -## Readme - -If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit. -Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-calibre-web/edit/master/readme-vars.yml). - -These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play. -Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-calibre-web) - -### Fixing typos or clarify the text in the readme - -There are variables for multiple parts of the readme, the most common ones are: - -| Variable | Description | -| :----: | --- | -| `project_blurb` | This is the short excerpt shown above the project logo. | -| `app_setup_block` | This is the text that shows up under "Application Setup" if enabled | - -### Parameters - -The compose and run examples are also generated from these variables. - -We have a [reference file](https://github.com/linuxserver/docker-jenkins-builder/blob/master/vars/_container-vars-blank) in our Jenkins Builder. - -These are prefixed with `param_` for required parameters, or `opt_param` for optional parameters, except for `cap_add`. -Remember to enable param, if currently disabled. This differs between parameters, and can be seen in the reference file. - -Devices, environment variables, ports and volumes expects its variables in a certain way. - -### Devices - -```yml -param_devices: - - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" } -opt_param_devices: - - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" } -``` - -### Environment variables - -```yml -param_env_vars: - - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } -opt_param_env_vars: - - { env_var: "VERSION", env_value: "latest", desc: "Supported values are LATEST, PLEXPASS or a specific version number." } -``` - -### Ports - -```yml -param_ports: - - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" } -opt_param_ports: - - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" } -``` - -### Volumes - -```yml -param_volumes: - - { vol_path: "/config", vol_host_path: "", desc: "Configuration files." } -opt_param_volumes: - - { vol_path: "/config", vol_host_path: "", desc: "Configuration files." } -``` - -### Testing template changes - -After you make any changes to the templates, you can use our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) to have the files updated from the modified templates. Please use the command found under `Running Locally` [on this page](https://github.com/linuxserver/docker-jenkins-builder/blob/master/README.md) to generate them prior to submitting a PR. - -## Dockerfiles - -We use multiple Dockerfiles in our repos, this is because sometimes some CPU architectures needs different packages to work. -If you are proposing additional packages to be added, ensure that you added the packages to all the Dockerfiles in alphabetical order. - -### Testing your changes - -``` -git clone https://github.com/linuxserver/docker-calibre-web.git -cd docker-calibre-web -docker build \ - --no-cache \ - --pull \ - -t linuxserver/calibre-web:latest . -``` - -The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` -``` -docker run --rm --privileged multiarch/qemu-user-static:register --reset -``` - -Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. - -## Update the chagelog - -If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-calibre-web/tree/master/root), add an entry to the changelog - -```yml -changelogs: - - { date: "DD.MM.YY:", desc: "Added some love to templates" } -``` diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100755 index 7eaac7717..000000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: linuxserver -open_collective: linuxserver diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100755 index 1d0b5a02a..000000000 --- a/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,13 +0,0 @@ -blank_issues_enabled: false -contact_links: - - name: Discord chat support - url: https://discord.gg/YWrKVTn - about: Realtime support / chat with the community and the team. - - - name: Discourse discussion forum - url: https://discourse.linuxserver.io - about: Post on our community forum. - - - name: Documentation - url: https://docs.linuxserver.io/images/docker-calibre-web - about: Documentation - information about all of our containers. diff --git a/.github/ISSUE_TEMPLATE/issue.bug.md b/.github/ISSUE_TEMPLATE/issue.bug.md deleted file mode 100755 index 41f6150bc..000000000 --- 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 20a91fdb1..000000000 --- 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 - diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index dec28f35d..000000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,43 +0,0 @@ - - -[linuxserverurl]: https://linuxserver.io -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - - - - - - - - - - - - - - - - ------------------------------- - - - [ ] I have read the [contributing](https://github.com/linuxserver/docker-calibre-web/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications - ------------------------------- - - - -## Description: - - -## Benefits of this PR and context: - - -## How Has This Been Tested? - - - - - -## Source / References: - diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml deleted file mode 100755 index c52d194c2..000000000 --- a/.github/workflows/external_trigger.yml +++ /dev/null @@ -1,92 +0,0 @@ -name: External Trigger Main - -on: - workflow_dispatch: - -jobs: - external-trigger-master: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.3.3 - - - name: External Trigger - if: github.ref == 'refs/heads/master' - run: | - if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_CALIBRE_WEB_MASTER }}" ]; then - echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_CALIBRE_WEB_MASTER is set; skipping trigger. ****" - exit 0 - fi - echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_CALIBRE_WEB_MASTER\". ****" - echo "**** Retrieving external version ****" - EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/janeczku/calibre-web/releases/latest" | jq -r '. | .tag_name') - if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then - echo "**** Can't retrieve external version, exiting ****" - FAILURE_REASON="Can't retrieve external version for calibre-web branch master" - GHA_TRIGGER_URL="https://github.com/linuxserver/docker-calibre-web/actions/runs/${{ github.run_id }}" - curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, - "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}], - "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} - exit 1 - fi - EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') - echo "**** External version: ${EXT_RELEASE} ****" - echo "**** Retrieving last pushed version ****" - image="linuxserver/calibre-web" - tag="latest" - token=$(curl -sX GET \ - "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fcalibre-web%3Apull" \ - | jq -r '.token') - multidigest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/manifests/${tag}" \ - | jq -r 'first(.manifests[].digest)') - digest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ - | jq -r '.config.digest') - image_info=$(curl -sL \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/blobs/${digest}" \ - | jq -r '.container_config') - 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 - echo "**** Can't retrieve last pushed version, exiting ****" - FAILURE_REASON="Can't retrieve last pushed version for calibre-web tag latest" - curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, - "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], - "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} - exit 1 - fi - echo "**** Last pushed version: ${IMAGE_VERSION} ****" - if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then - echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" - exit 0 - elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then - echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****" - exit 0 - else - echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****" - response=$(curl -iX POST \ - https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/master/buildWithParameters?PACKAGE_CHECK=false \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "**** Jenkins job queue url: ${response%$'\r'} ****" - echo "**** Sleeping 10 seconds until job starts ****" - sleep 10 - buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') - buildurl="${buildurl%$'\r'}" - echo "**** Jenkins job build url: ${buildurl} ****" - echo "**** Attempting to change the Jenkins job description ****" - curl -iX POST \ - "${buildurl}submitDescription" \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ - --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ - --data-urlencode "Submit=Submit" - echo "**** Notifying Discord ****" - TRIGGER_REASON="A version change was detected for calibre-web tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}" - curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, - "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}], - "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} - fi diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml deleted file mode 100755 index 646d1da86..000000000 --- a/.github/workflows/external_trigger_scheduler.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: External Trigger Scheduler - -on: - schedule: - - cron: '55 * * * *' - workflow_dispatch: - -jobs: - external-trigger-scheduler: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.3.3 - with: - fetch-depth: '0' - - - name: External Trigger Scheduler - run: | - echo "**** Branches found: ****" - git for-each-ref --format='%(refname:short)' refs/remotes - echo "**** Pulling the yq docker image ****" - docker pull ghcr.io/linuxserver/yq - for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) - do - br=$(echo "$br" | sed 's|origin/||g') - echo "**** Evaluating branch ${br} ****" - ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-calibre-web/${br}/jenkins-vars.yml \ - | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) - if [ "$br" == "$ls_branch" ]; then - echo "**** Branch ${br} appears to be live; checking workflow. ****" - if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-calibre-web/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then - echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****." - curl -iX POST \ - -H "Authorization: token ${{ secrets.CR_PAT }}" \ - -H "Accept: application/vnd.github.v3+json" \ - -d "{\"ref\":\"refs/heads/${br}\"}" \ - https://api.github.com/repos/linuxserver/docker-calibre-web/actions/workflows/external_trigger.yml/dispatches - else - echo "**** Workflow doesn't exist; skipping trigger. ****" - fi - else - echo "**** ${br} appears to be a dev branch; skipping trigger. ****" - fi - done diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml deleted file mode 100755 index 17e3bc054..000000000 --- a/.github/workflows/greetings.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Greetings - -on: [pull_request_target, issues] - -jobs: - greeting: - runs-on: ubuntu-latest - 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-calibre-web/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-calibre-web/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!' - pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-calibre-web/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 deleted file mode 100755 index 3db3dad48..000000000 --- a/.github/workflows/package_trigger.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Package Trigger Main - -on: - workflow_dispatch: - -jobs: - package-trigger-master: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.3.3 - - - name: Package Trigger - if: github.ref == 'refs/heads/master' - run: | - if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_CALIBRE_WEB_MASTER }}" ]; then - echo "**** Github secret PAUSE_PACKAGE_TRIGGER_CALIBRE_WEB_MASTER is set; skipping trigger. ****" - exit 0 - fi - if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then - echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" - exit 0 - fi - echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_CALIBRE_WEB_MASTER\". ****" - response=$(curl -iX POST \ - https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/master/buildWithParameters?PACKAGE_CHECK=true \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "**** Jenkins job queue url: ${response%$'\r'} ****" - echo "**** Sleeping 10 seconds until job starts ****" - sleep 10 - buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') - buildurl="${buildurl%$'\r'}" - echo "**** Jenkins job build url: ${buildurl} ****" - echo "**** Attempting to change the Jenkins job description ****" - curl -iX POST \ - "${buildurl}submitDescription" \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ - --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ - --data-urlencode "Submit=Submit" diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml deleted file mode 100755 index 8f9f9b2a9..000000000 --- a/.github/workflows/package_trigger_scheduler.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: Package Trigger Scheduler - -on: - schedule: - - cron: '31 9 * * 2' - workflow_dispatch: - -jobs: - package-trigger-scheduler: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.3.3 - with: - fetch-depth: '0' - - - name: Package Trigger Scheduler - run: | - echo "**** Branches found: ****" - git for-each-ref --format='%(refname:short)' refs/remotes - echo "**** Pulling the yq docker image ****" - docker pull ghcr.io/linuxserver/yq - for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) - do - br=$(echo "$br" | sed 's|origin/||g') - echo "**** Evaluating branch ${br} ****" - ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-calibre-web/${br}/jenkins-vars.yml \ - | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) - if [ "${br}" == "${ls_branch}" ]; then - echo "**** Branch ${br} appears to be live; checking workflow. ****" - if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-calibre-web/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then - echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" - triggered_branches="${triggered_branches}${br} " - curl -iX POST \ - -H "Authorization: token ${{ secrets.CR_PAT }}" \ - -H "Accept: application/vnd.github.v3+json" \ - -d "{\"ref\":\"refs/heads/${br}\"}" \ - https://api.github.com/repos/linuxserver/docker-calibre-web/actions/workflows/package_trigger.yml/dispatches - sleep 30 - else - echo "**** Workflow doesn't exist; skipping trigger. ****" - fi - else - echo "**** ${br} appears to be a dev branch; skipping trigger. ****" - fi - done - echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" - echo "**** Notifying Discord ****" - curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, - "description": "**Package Check Build(s) Triggered for calibre-web** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-calibre-web/activity/"' \n"}], - "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml deleted file mode 100755 index 1806420a2..000000000 --- a/.github/workflows/stale.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Mark stale issues and pull requests - -on: - schedule: - - cron: "30 1 * * *" - -jobs: - stale: - - runs-on: ubuntu-latest - - steps: - - uses: actions/stale@v1 - 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." - stale-issue-label: 'no-issue-activity' - stale-pr-label: 'no-pr-activity' - days-before-stale: 30 - days-before-close: 365 - exempt-issue-labels: 'awaiting-approval,work-in-progress' - exempt-pr-labels: 'awaiting-approval,work-in-progress' - repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 96374c4e7..000000000 --- a/.gitignore +++ /dev/null @@ -1,43 +0,0 @@ -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# Windows shortcuts -*.lnk - -# ========================= -# Operating System Files -# ========================= - -# OSX -# ========================= - -.DS_Store -.AppleDouble -.LSOverride - -# Thumbnails -._* - -# Files that might appear on external disk -.Spotlight-V100 -.Trashes - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index cee66dfd4..000000000 --- a/Dockerfile +++ /dev/null @@ -1,73 +0,0 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:focal - -# set version label -ARG BUILD_DATE -ARG VERSION -ARG CALIBREWEB_RELEASE -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="chbmb" - -RUN \ - echo "**** install build packages ****" && \ - apt-get update && \ - apt-get install -y \ - git \ - libldap2-dev \ - libsasl2-dev \ - python3-pip && \ - echo "**** install runtime packages ****" && \ - apt-get install -y \ - imagemagick \ - libnss3 \ - libxcomposite1 \ - libxi6 \ - libxslt1.1 \ - libldap-2.4-2 \ - libsasl2-2 \ - python3-minimal \ - python3-pkg-resources \ - unrar && \ - echo "**** install calibre-web ****" && \ - if [ -z ${CALIBREWEB_RELEASE+x} ]; then \ - CALIBREWEB_RELEASE=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/calibre-web.tar.gz -L \ - https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_RELEASE}.tar.gz && \ - mkdir -p \ - /app/calibre-web && \ - tar xf \ - /tmp/calibre-web.tar.gz -C \ - /app/calibre-web --strip-components=1 && \ - cd /app/calibre-web && \ - pip3 install --no-cache-dir -U -r \ - requirements.txt && \ - pip3 install --no-cache-dir -U -r \ - optional-requirements.txt && \ - echo "***install kepubify" && \ - if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ - KEPUBIFY_RELEASE=$(curl -sX GET "https://api.github.com/repos/pgaskin/kepubify/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /usr/bin/kepubify -L \ - https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-64bit && \ - echo "**** cleanup ****" && \ - apt-get -y purge \ - git \ - libldap2-dev \ - libsasl2-dev \ - python3-pip && \ - apt-get -y autoremove && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* - -# add local files -COPY root/ / - -# ports and volumes -EXPOSE 8083 -VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 deleted file mode 100644 index cb957db41..000000000 --- a/Dockerfile.aarch64 +++ /dev/null @@ -1,87 +0,0 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal - -# set version label -ARG BUILD_DATE -ARG VERSION -ARG CALIBREWEB_RELEASE -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="chbmb" - -RUN \ - echo "**** install build packages ****" && \ - apt-get update && \ - apt-get install -y \ - g++ \ - gcc \ - git \ - libffi-dev \ - libjpeg-dev \ - libldap2-dev \ - libsasl2-dev \ - libxml2-dev \ - libxslt1-dev \ - python3-pip \ - zlib1g-dev && \ - echo "**** install runtime packages ****" && \ - apt-get install -y \ - imagemagick \ - libldap-2.4-2 \ - libnss3 \ - libsasl2-2 \ - libxcomposite1 \ - libxi6 \ - libxslt1.1 \ - python3-minimal \ - python3-pkg-resources \ - unrar && \ - echo "**** install calibre-web ****" && \ - if [ -z ${CALIBREWEB_RELEASE+x} ]; then \ - CALIBREWEB_RELEASE=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/calibre-web.tar.gz -L \ - https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_RELEASE}.tar.gz && \ - mkdir -p \ - /app/calibre-web && \ - tar xf \ - /tmp/calibre-web.tar.gz -C \ - /app/calibre-web --strip-components=1 && \ - cd /app/calibre-web && \ - pip3 install --no-cache-dir -U -r \ - requirements.txt && \ - pip3 install --no-cache-dir -U -r \ - optional-requirements.txt && \ - echo "***install kepubify" && \ - if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ - KEPUBIFY_RELEASE=$(curl -sX GET "https://api.github.com/repos/pgaskin/kepubify/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /usr/bin/kepubify -L \ - https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-arm64 && \ - echo "**** cleanup ****" && \ - apt-get -y purge \ - g++ \ - gcc \ - git \ - libffi-dev \ - libjpeg-dev \ - libldap2-dev \ - libsasl2-dev \ - libxml2-dev \ - libxslt1-dev \ - python3-pip \ - zlib1g-dev && \ - apt-get -y autoremove && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* - -# add local files -COPY root/ / - -# ports and volumes -EXPOSE 8083 -VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf deleted file mode 100644 index 5a36033bb..000000000 --- a/Dockerfile.armhf +++ /dev/null @@ -1,89 +0,0 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal - -# set version label -ARG BUILD_DATE -ARG VERSION -ARG CALIBREWEB_RELEASE -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="chbmb" - -RUN \ - echo "**** install build packages ****" && \ - apt-get update && \ - apt-get install -y \ - g++ \ - gcc \ - git \ - libffi-dev \ - libjpeg-dev \ - libldap2-dev \ - libsasl2-dev \ - libssl-dev \ - libxml2-dev \ - libxslt1-dev \ - python3-pip \ - zlib1g-dev && \ - echo "**** install runtime packages ****" && \ - apt-get install -y \ - imagemagick \ - libldap-2.4-2 \ - libnss3 \ - libsasl2-2 \ - libxcomposite1 \ - libxi6 \ - libxslt1.1 \ - python3-minimal \ - python3-pkg-resources \ - unrar && \ - echo "**** install calibre-web ****" && \ - if [ -z ${CALIBREWEB_RELEASE+x} ]; then \ - CALIBREWEB_RELEASE=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/calibre-web.tar.gz -L \ - https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_RELEASE}.tar.gz && \ - mkdir -p \ - /app/calibre-web && \ - tar xf \ - /tmp/calibre-web.tar.gz -C \ - /app/calibre-web --strip-components=1 && \ - cd /app/calibre-web && \ - pip3 install --no-cache-dir -U -r \ - requirements.txt && \ - pip3 install --no-cache-dir -U -r \ - optional-requirements.txt && \ - echo "***install kepubify" && \ - if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ - KEPUBIFY_RELEASE=$(curl -sX GET "https://api.github.com/repos/pgaskin/kepubify/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /usr/bin/kepubify -L \ - https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-arm && \ - echo "**** cleanup ****" && \ - apt-get -y purge \ - g++ \ - gcc \ - git \ - libffi-dev \ - libjpeg-dev \ - libldap2-dev \ - libsasl2-dev \ - libssl-dev \ - libxml2-dev \ - libxslt1-dev \ - python3-pip \ - zlib1g-dev && \ - apt-get -y autoremove && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* - -# add local files -COPY root/ / - -# ports and volumes -EXPOSE 8083 -VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 86f677d19..000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,785 +0,0 @@ -pipeline { - agent { - label 'X86-64-MULTI' - } - options { - buildDiscarder(logRotator(numToKeepStr: '10', daysToKeepStr: '60')) - parallelsAlwaysFailFast() - } - // Input to determine if this is a package check - parameters { - string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') - } - // Configuration for the variables used for this specific repo - environment { - BUILDS_DISCORD=credentials('build_webhook_url') - GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') - GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') - GITLAB_NAMESPACE=credentials('gitlab-namespace-id') - EXT_GIT_BRANCH = 'master' - EXT_USER = 'janeczku' - EXT_REPO = 'calibre-web' - BUILD_VERSION_ARG = 'CALIBREWEB_RELEASE' - LS_USER = 'linuxserver' - LS_REPO = 'docker-calibre-web' - CONTAINER_NAME = 'calibre-web' - DOCKERHUB_IMAGE = 'linuxserver/calibre-web' - DEV_DOCKERHUB_IMAGE = 'lsiodev/calibre-web' - PR_DOCKERHUB_IMAGE = 'lspipepr/calibre-web' - DIST_IMAGE = 'ubuntu' - MULTIARCH='true' - CI='true' - CI_WEB='true' - CI_PORT='8083' - CI_SSL='false' - CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' - CI_WEBPATH='' - } - stages { - // Setup all the basic environment variables needed for the build - stage("Set ENV Variables base"){ - steps{ - script{ - env.EXIT_STATUS = '' - env.LS_RELEASE = sh( - script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', - returnStdout: true).trim() - env.LS_RELEASE_NOTES = sh( - script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', - returnStdout: true).trim() - env.GITHUB_DATE = sh( - script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', - returnStdout: true).trim() - env.COMMIT_SHA = sh( - script: '''git rev-parse HEAD''', - 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 ./.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/greetings.yml ./.github/workflows/stale.yml ./.github/workflows/package_trigger.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler.yml' - } - script{ - env.LS_RELEASE_NUMBER = sh( - script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''', - returnStdout: true).trim() - } - script{ - env.LS_TAG_NUMBER = sh( - script: '''#! /bin/bash - tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null) - if [ "${tagsha}" == "${COMMIT_SHA}" ]; then - echo ${LS_RELEASE_NUMBER} - elif [ -z "${GIT_COMMIT}" ]; then - echo ${LS_RELEASE_NUMBER} - else - echo $((${LS_RELEASE_NUMBER} + 1)) - fi''', - returnStdout: true).trim() - } - } - } - /* ####################### - Package Version Tagging - ####################### */ - // Grab the current package versions in Git to determine package tag - stage("Set Package tag"){ - steps{ - script{ - env.PACKAGE_TAG = sh( - script: '''#!/bin/bash - if [ -e package_versions.txt ] ; then - cat package_versions.txt | md5sum | cut -c1-8 - else - echo none - fi''', - returnStdout: true).trim() - } - } - } - /* ######################## - External Release Tagging - ######################## */ - // If this is a stable github release use the latest endpoint from github to determine the ext tag - stage("Set ENV github_stable"){ - steps{ - script{ - env.EXT_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''', - returnStdout: true).trim() - } - } - } - // If this is a stable or devel github release generate the link for the build message - stage("Set ENV github_link"){ - steps{ - script{ - env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE - } - } - } - // Sanitize the release tag and strip illegal docker or github characters - stage("Sanitize tag"){ - steps{ - script{ - env.EXT_RELEASE_CLEAN = sh( - script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', - returnStdout: true).trim() - } - } - } - // If this is a master build use live docker endpoints - stage("Set ENV live build"){ - when { - branch "master" - environment name: 'CHANGE_ID', value: '' - } - steps { - script{ - env.IMAGE = env.DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME - env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME - if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER - } else { - env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER - } - env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER - env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER - env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN - } - } - } - // If this is a dev build use dev docker endpoints - stage("Set ENV dev build"){ - when { - not {branch "master"} - environment name: 'CHANGE_ID', value: '' - } - steps { - script{ - env.IMAGE = env.DEV_DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME - env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME - if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - } else { - env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - } - env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN - env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' - } - } - } - // If this is a pull request build use dev docker endpoints - stage("Set ENV PR build"){ - when { - not {environment name: 'CHANGE_ID', value: ''} - } - steps { - script{ - env.IMAGE = env.PR_DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME - env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME - if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST - } else { - env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST - } - env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST - env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST - env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN - env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST - env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' - } - } - } - // Run ShellCheck - stage('ShellCheck') { - when { - environment name: 'CI', value: 'true' - } - steps { - withCredentials([ - string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'), - string(credentialsId: 'ci-tests-s3-secret-access-key', variable: 'S3_SECRET') - ]) { - script{ - env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' - } - sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' - sh '''#! /bin/bash - set -e - docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest - docker run --rm \ - -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \ - -e FILE_NAME="shellcheck-result.xml" \ - -e MIMETYPE="text/xml" \ - -v ${WORKSPACE}:/mnt \ - -e SECRET_KEY=\"${S3_SECRET}\" \ - -e ACCESS_KEY=\"${S3_KEY}\" \ - -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \ - python /upload.py''' - } - } - } - // Use helper containers to render templated files - stage('Update-Templates') { - when { - branch "master" - environment name: 'CHANGE_ID', value: '' - expression { - env.CONTAINER_NAME != null - } - } - 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=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - 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}" ]]; 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 master - cd ${TEMPDIR}/docker-${CONTAINER_NAME} - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE - rm -f ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md - cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : - cd ${TEMPDIR}/repo/${LS_REPO}/ - git add ${TEMPLATED_FILES} - git rm .github/ISSUE_TEMPLATE.md || : - 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}/gitbook - git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ - cd ${TEMPDIR}/gitbook/docker-documentation/ - git add 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}-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}/${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}/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then - if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, skipping Unraid template upload" - else - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - cd ${TEMPDIR}/unraid/templates/ - git add unraid/${CONTAINER_NAME}.xml - git commit -m 'Bot Updating Unraid Template' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all - fi - fi - rm -Rf ${TEMPDIR}''' - script{ - env.FILES_UPDATED = sh( - script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', - returnStdout: true).trim() - } - } - } - // Exit the build if the Templated files were just updated - stage('Template-exit') { - when { - branch "master" - environment name: 'CHANGE_ID', value: '' - environment name: 'FILES_UPDATED', value: 'true' - expression { - env.CONTAINER_NAME != null - } - } - steps { - script{ - env.EXIT_STATUS = 'ABORTED' - } - } - } - /* ####################### - GitLab Mirroring - ####################### */ - // Ping into Gitlab to mirror this repo and have a registry endpoint - stage("GitLab Mirror"){ - when { - environment name: 'EXIT_STATUS', value: '' - } - steps{ - sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \ - -d '{"namespace_id":'${GITLAB_NAMESPACE}',\ - "name":"'${LS_REPO}'", - "mirror":true,\ - "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\ - "issues_access_level":"disabled",\ - "merge_requests_access_level":"disabled",\ - "repository_access_level":"enabled",\ - "visibility":"public"}' ''' - } - } - /* ############### - Build Container - ############### */ - // Build Docker container for push to LS Repo - stage('Build-Single') { - when { - environment name: 'MULTIARCH', value: 'false' - environment name: 'EXIT_STATUS', value: '' - } - steps { - echo "Running on node: ${NODE_NAME}" - sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - } - } - // Build MultiArch Docker containers for push to LS Repo - stage('Build-Multi') { - when { - environment name: 'MULTIARCH', value: 'true' - environment name: 'EXIT_STATUS', value: '' - } - parallel { - stage('Build X86') { - steps { - echo "Running on node: ${NODE_NAME}" - sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - } - } - stage('Build ARMHF') { - agent { - label 'ARMHF' - } - steps { - echo "Running on node: ${NODE_NAME}" - echo 'Logging into Github' - sh '''#! /bin/bash - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - ''' - sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { - sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - } - sh '''docker rmi \ - ${IMAGE}:arm32v7-${META_TAG} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' - } - } - stage('Build ARM64') { - agent { - label 'ARM64' - } - steps { - echo "Running on node: ${NODE_NAME}" - echo 'Logging into Github' - sh '''#! /bin/bash - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - ''' - sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { - sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - } - sh '''docker rmi \ - ${IMAGE}:arm64v8-${META_TAG} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' - } - } - } - } - // Take the image we just built and dump package versions for comparison - stage('Update-packages') { - when { - branch "master" - environment name: 'CHANGE_ID', value: '' - environment name: 'EXIT_STATUS', value: '' - } - steps { - sh '''#! /bin/bash - set -e - TEMPDIR=$(mktemp -d) - if [ "${MULTIARCH}" == "true" ]; then - LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} - else - LOCAL_CONTAINER=${IMAGE}:${META_TAG} - fi - if [ "${DIST_IMAGE}" == "alpine" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apk info -v > /tmp/package_versions.txt && \ - sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - elif [ "${DIST_IMAGE}" == "ubuntu" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \ - sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - fi - NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) - echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" - if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO} - git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master - cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ - cd ${TEMPDIR}/${LS_REPO}/ - 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 - echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} - echo "Package tag updated, stopping build process" - else - echo "false" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} - echo "Package tag is same as previous continue with build process" - fi - rm -Rf ${TEMPDIR}''' - script{ - env.PACKAGE_UPDATED = sh( - script: '''cat /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}''', - returnStdout: true).trim() - } - } - } - // Exit the build if the package file was just updated - stage('PACKAGE-exit') { - when { - branch "master" - environment name: 'CHANGE_ID', value: '' - environment name: 'PACKAGE_UPDATED', value: 'true' - environment name: 'EXIT_STATUS', value: '' - } - steps { - sh '''#! /bin/bash - echo "Packages were updated. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ]; then - docker rmi ${IMAGE}:amd64-${META_TAG} - else - docker rmi ${IMAGE}:${META_TAG} - fi''' - script{ - env.EXIT_STATUS = 'ABORTED' - } - } - } - // Exit the build if this is just a package check and there are no changes to push - stage('PACKAGECHECK-exit') { - when { - branch "master" - environment name: 'CHANGE_ID', value: '' - environment name: 'PACKAGE_UPDATED', value: 'false' - environment name: 'EXIT_STATUS', value: '' - expression { - params.PACKAGE_CHECK == 'true' - } - } - steps { - sh '''#! /bin/bash - echo "There are no package updates. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ]; then - docker rmi ${IMAGE}:amd64-${META_TAG} - else - docker rmi ${IMAGE}:${META_TAG} - fi''' - script{ - env.EXIT_STATUS = 'ABORTED' - } - } - } - /* ####### - Testing - ####### */ - // Run Container tests - stage('Test') { - when { - environment name: 'CI', value: 'true' - environment name: 'EXIT_STATUS', value: '' - } - steps { - withCredentials([ - string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'), - string(credentialsId: 'ci-tests-s3-secret-access-key ', variable: 'S3_SECRET') - ]) { - script{ - env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html' - } - sh '''#! /bin/bash - set -e - docker pull ghcr.io/linuxserver/lsiodev-ci:latest - if [ "${MULTIARCH}" == "true" ]; 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 tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} - fi - docker run --rm \ - --shm-size=1gb \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -e IMAGE=\"${IMAGE}\" \ - -e DELAY_START=\"${CI_DELAY}\" \ - -e TAGS=\"${CI_TAGS}\" \ - -e META_TAG=\"${META_TAG}\" \ - -e PORT=\"${CI_PORT}\" \ - -e SSL=\"${CI_SSL}\" \ - -e BASE=\"${DIST_IMAGE}\" \ - -e SECRET_KEY=\"${S3_SECRET}\" \ - -e ACCESS_KEY=\"${S3_KEY}\" \ - -e DOCKER_ENV=\"${CI_DOCKERENV}\" \ - -e WEB_SCREENSHOT=\"${CI_WEB}\" \ - -e WEB_AUTH=\"${CI_AUTH}\" \ - -e WEB_PATH=\"${CI_WEBPATH}\" \ - -e DO_REGION="ams3" \ - -e DO_BUCKET="lsio-ci" \ - -t ghcr.io/linuxserver/lsiodev-ci:latest \ - python /ci/ci.py''' - } - } - } - /* ################## - Release Logic - ################## */ - // If this is an amd64 only image only push a single image - stage('Docker-Push-Single') { - when { - environment name: 'MULTIARCH', value: 'false' - environment name: 'EXIT_STATUS', value: '' - } - steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - retry(5) { - sh '''#! /bin/bash - set -e - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do - docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} - docker push ${PUSHIMAGE}:latest - docker push ${PUSHIMAGE}:${META_TAG} - docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} - done - ''' - } - sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do - docker rmi \ - ${DELETEIMAGE}:${META_TAG} \ - ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:latest || : - done - ''' - } - } - } - // If this is a multi arch release push all images and define the manifest - stage('Docker-Push-Multi') { - when { - environment name: 'MULTIARCH', value: 'true' - environment name: 'EXIT_STATUS', value: '' - } - steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - retry(5) { - sh '''#! /bin/bash - set -e - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --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 tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} - fi - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}"; 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 ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - 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}:arm32v7-${EXT_RELEASE_TAG} - docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker manifest push --purge ${MANIFESTIMAGE}:latest || : - docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:latest - docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} - docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} - done - ''' - } - sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do - docker rmi \ - ${DELETEIMAGE}:amd64-${META_TAG} \ - ${DELETEIMAGE}:amd64-latest \ - ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm32v7-${META_TAG} \ - ${DELETEIMAGE}:arm32v7-latest \ - ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm64v8-${META_TAG} \ - ${DELETEIMAGE}:arm64v8-latest \ - ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : - done - docker rmi \ - ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : - ''' - } - } - } - // If this is a public release tag it in the LS Github - stage('Github-Tag-Push-Release') { - when { - branch "master" - expression { - env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER - } - environment name: 'CHANGE_ID', value: '' - environment name: 'EXIT_STATUS', value: '' - } - steps { - echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}" - sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ - -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ - "object": "'${COMMIT_SHA}'",\ - "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\ - "type": "commit",\ - "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' - echo "Pushing New release for Tag" - sh '''#! /bin/bash - curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json - echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ - "target_commitish": "master",\ - "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ - "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start - printf '","draft": false,"prerelease": false}' >> releasebody.json - paste -d'\\0' start releasebody.json > releasebody.json.done - curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' - } - } - // 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/lsiodev-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/lsiodev-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 { - not {environment name: 'CHANGE_ID', value: ''} - environment name: 'CI', value: 'true' - environment name: 'EXIT_STATUS', value: '' - } - steps { - sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \ - -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' ''' - } - } - } - /* ###################### - Send status to Discord - ###################### */ - post { - always { - script{ - if (env.EXIT_STATUS == "ABORTED"){ - 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,\ - "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,\ - "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} ''' - } - } - } - cleanup { - cleanWs() - } - } -} diff --git a/LICENSE b/LICENSE deleted file mode 100755 index f288702d2..000000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/jenkins-vars.yml b/jenkins-vars.yml deleted file mode 100644 index f31a209a7..000000000 --- a/jenkins-vars.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -# jenkins variables -project_name: docker-calibre-web -external_type: github_stable -release_type: stable -release_tag: latest -ls_branch: master -repo_vars: - - EXT_GIT_BRANCH = 'master' - - EXT_USER = 'janeczku' - - EXT_REPO = 'calibre-web' - - BUILD_VERSION_ARG = 'CALIBREWEB_RELEASE' - - LS_USER = 'linuxserver' - - LS_REPO = 'docker-calibre-web' - - CONTAINER_NAME = 'calibre-web' - - DOCKERHUB_IMAGE = 'linuxserver/calibre-web' - - DEV_DOCKERHUB_IMAGE = 'lsiodev/calibre-web' - - PR_DOCKERHUB_IMAGE = 'lspipepr/calibre-web' - - DIST_IMAGE = 'ubuntu' - - MULTIARCH='true' - - CI='true' - - CI_WEB='true' - - CI_PORT='8083' - - CI_SSL='false' - - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' - - CI_WEBPATH='' diff --git a/package_versions.txt b/package_versions.txt deleted file mode 100755 index ad814d3ec..000000000 --- a/package_versions.txt +++ /dev/null @@ -1,244 +0,0 @@ -adduser3.118ubuntu2 -apt2.0.2ubuntu0.2 -apt-utils2.0.2ubuntu0.2 -base-files11ubuntu5.2 -base-passwd3.5.47 -bash5.0-6ubuntu1.1 -bsdutils1:2.34-0.1ubuntu9.1 -bzip21.0.8-2 -ca-certificates20201027ubuntu0.20.04.1 -coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.4 -dash0.5.10.2-6 -dbus1.12.16-2ubuntu2.1 -debconf1.5.73 -debianutils4.9.1 -diffutils1:3.7-3 -dirmngr2.2.19-3ubuntu2 -dpkg1.19.7ubuntu3 -e2fsprogs1.45.5-2ubuntu1 -fdisk2.34-0.1ubuntu9.1 -file1:5.38-4 -findutils4.7.0-1ubuntu1 -fontconfig2.13.1-2ubuntu3 -fontconfig-config2.13.1-2ubuntu3 -fonts-dejavu-core2.37-1 -fonts-droid-fallback1:6.0.1r16-1.1 -fonts-noto-mono20200323-1build1~ubuntu20.04.1 -fonts-urw-base3520170801.1-3 -gcc-10-base10.2.0-5ubuntu1~20.04 -ghostscript9.50~dfsg-5ubuntu4.2 -gnupg2.2.19-3ubuntu2 -gnupg-l10n2.2.19-3ubuntu2 -gnupg-utils2.2.19-3ubuntu2 -gpg2.2.19-3ubuntu2 -gpg-agent2.2.19-3ubuntu2 -gpgconf2.2.19-3ubuntu2 -gpgsm2.2.19-3ubuntu2 -gpgv2.2.19-3ubuntu2 -gpg-wks-client2.2.19-3ubuntu2 -gpg-wks-server2.2.19-3ubuntu2 -grep3.4-1 -gsfonts1:8.11+urwcyr1.0.7~pre44-4.4 -gzip1.10-0ubuntu4 -hicolor-icon-theme0.17-2 -hostname3.23 -imagemagick-6-common8:6.9.10.23+dfsg-2.1ubuntu11.2 -imagemagick-6.q168:6.9.10.23+dfsg-2.1ubuntu11.2 -imagemagick8:6.9.10.23+dfsg-2.1ubuntu11.2 -init-system-helpers1.57 -krb5-locales1.17-6ubuntu4.1 -libacl12.2.53-6 -libapparmor12.13.3-7ubuntu5.1 -libapt-pkg6.02.0.2ubuntu0.2 -libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 -libassuan02.5.3-7ubuntu2 -libattr11:2.4.48-5 -libaudit11:2.8.5-2ubuntu6 -libaudit-common1:2.8.5-2ubuntu6 -libavahi-client30.7-4ubuntu7 -libavahi-common30.7-4ubuntu7 -libavahi-common-data0.7-4ubuntu7 -libblkid12.34-0.1ubuntu9.1 -libbrotli11.0.7-6ubuntu0.1 -libbsd00.10.0-1 -libbz2-1.01.0.8-2 -libc62.31-0ubuntu9.1 -libcairo21.16.0-4ubuntu1 -libcap-ng00.7.9-2.1build1 -libc-bin2.31-0ubuntu9.1 -libcom-err21.45.5-2ubuntu1 -libcrypt11:4.4.10-10ubuntu4 -libcups22.3.1-9ubuntu1.1 -libcurl47.68.0-1ubuntu2.4 -libdatrie10.2.12-3 -libdb5.35.3.28+dfsg1-0.6ubuntu2 -libdbus-1-31.12.16-2ubuntu2.1 -libdebconfclient00.251ubuntu1 -libdjvulibre213.5.27.1-14build1 -libdjvulibre-text3.5.27.1-14build1 -libexpat12.2.9-1build1 -libext2fs21.45.5-2ubuntu1 -libfdisk12.34-0.1ubuntu9.1 -libffi73.3-4 -libfftw3-double33.3.8-2ubuntu1 -libfontconfig12.13.1-2ubuntu3 -libfreetype62.10.1-2ubuntu0.1 -libfribidi01.0.8-2 -libgcc-s110.2.0-5ubuntu1~20.04 -libgcrypt201.8.5-5ubuntu1 -libglib2.0-02.64.3-1~ubuntu20.04.1 -libglib2.0-data2.64.3-1~ubuntu20.04.1 -libgmp102:6.2.0+dfsg-4 -libgnutls303.6.13-2ubuntu1.3 -libgomp110.2.0-5ubuntu1~20.04 -libgpg-error01.37-1 -libgraphite2-31.3.13-11build1 -libgs99.50~dfsg-5ubuntu4.2 -libgs9-common9.50~dfsg-5ubuntu4.2 -libgssapi3-heimdal7.7.0+dfsg-1ubuntu1 -libgssapi-krb5-21.17-6ubuntu4.1 -libharfbuzz0b2.6.4-1ubuntu4 -libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1 -libheimbase1-heimdal7.7.0+dfsg-1ubuntu1 -libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 -libhogweed53.5.1+really3.5.1-2 -libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 -libicu6666.1-2ubuntu2 -libidn111.33-2.2ubuntu2 -libidn2-02.2.0-2 -libijs-0.350.35-15 -libilmbase242.3.0-6build1 -libjbig02.1-3.1build1 -libjbig2dec00.18-1ubuntu1 -libjpeg88c-2ubuntu8 -libjpeg-turbo82.0.3-0ubuntu1.20.04.1 -libk5crypto31.17-6ubuntu4.1 -libkeyutils11.6-6ubuntu1 -libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1 -libkrb5-31.17-6ubuntu4.1 -libkrb5support01.17-6ubuntu4.1 -libksba81.3.5-2 -liblcms2-22.9-4 -libldap-2.4-22.4.49+dfsg-2ubuntu1.5 -libldap-common2.4.49+dfsg-2ubuntu1.5 -liblqr-1-00.4.2-2.1 -libltdl72.4.6-14 -liblz4-11.9.2-2 -liblzma55.2.4-1ubuntu1 -libmagic11:5.38-4 -libmagickcore-6.q16-68:6.9.10.23+dfsg-2.1ubuntu11.2 -libmagickcore-6.q16-6-extra8:6.9.10.23+dfsg-2.1ubuntu11.2 -libmagickwand-6.q16-68:6.9.10.23+dfsg-2.1ubuntu11.2 -libmagic-mgc1:5.38-4 -libmount12.34-0.1ubuntu9.1 -libmpdec22.4.2-3 -libncurses66.2-0ubuntu2 -libncursesw66.2-0ubuntu2 -libnetpbm102:10.0-15.3build1 -libnettle73.5.1+really3.5.1-2 -libnghttp2-141.40.0-1build1 -libnpth01.6-1 -libnspr42:4.25-1 -libnss32:3.49.1-1ubuntu1.5 -libopenexr242.3.0-6ubuntu0.3 -libopenjp2-72.3.1-1ubuntu4.20.04.1 -libp11-kit00.23.20-1ubuntu0.1 -libpam0g1.3.1-5ubuntu4.1 -libpam-modules1.3.1-5ubuntu4.1 -libpam-modules-bin1.3.1-5ubuntu4.1 -libpam-runtime1.3.1-5ubuntu4.1 -libpango-1.0-01.44.7-2ubuntu4 -libpangocairo-1.0-01.44.7-2ubuntu4 -libpangoft2-1.0-01.44.7-2ubuntu4 -libpaper11.1.28 -libpaper-utils1.1.28 -libpcre2-8-010.34-7 -libpcre32:8.39-12build1 -libpixman-1-00.38.4-0ubuntu1 -libpng16-161.6.37-2 -libprocps82:3.3.16-1ubuntu2 -libpsl50.21.0-1ubuntu1 -libpython3.8-minimal3.8.5-1~20.04 -libpython3.8-stdlib3.8.5-1~20.04 -libpython3-stdlib3.8.2-0ubuntu2 -libreadline88.0-4 -libroken18-heimdal7.7.0+dfsg-1ubuntu1 -librtmp12.4+20151223.gitfa8646d.1-2build1 -libsasl2-22.1.27+dfsg-2 -libsasl2-modules2.1.27+dfsg-2 -libsasl2-modules-db2.1.27+dfsg-2 -libseccomp22.4.3-1ubuntu3.20.04.3 -libselinux13.0-1build2 -libsemanage13.0-1build2 -libsemanage-common3.0-1build2 -libsepol13.0-1 -libsmartcols12.34-0.1ubuntu9.1 -libsqlite3-03.31.1-4ubuntu0.2 -libss21.45.5-2ubuntu1 -libssh-40.9.3-2ubuntu2.1 -libssl1.11.1.1f-1ubuntu2.1 -libstdc++610.2.0-5ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.4 -libtasn1-64.16.0-2 -libthai00.1.28-3 -libthai-data0.1.28-3 -libtiff54.1.0+git191117-2build1 -libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.4 -libunistring20.9.10-2 -libuuid12.34-0.1ubuntu9.1 -libwebp60.6.1-2 -libwebpmux30.6.1-2 -libwind0-heimdal7.7.0+dfsg-1ubuntu1 -libwmf0.2-70.2.8.4-17ubuntu1 -libx11-62:1.6.9-2ubuntu1.1 -libx11-data2:1.6.9-2ubuntu1.1 -libxau61:1.0.9-0ubuntu1 -libxcb11.14-2 -libxcb-render01.14-2 -libxcb-shm01.14-2 -libxcomposite11:0.4.5-1 -libxdmcp61:1.1.3-0ubuntu1 -libxext62:1.3.4-0ubuntu1 -libxi62:1.7.10-0ubuntu1 -libxml22.9.10+dfsg-5 -libxrender11:0.9.10-1 -libxslt1.11.1.34-4 -libzstd11.4.4+dfsg-3 -locales2.31-0ubuntu9.1 -login1:4.8.1-1ubuntu5.20.04 -logsave1.45.5-2ubuntu1 -lsb-base11.1.0ubuntu2 -mawk1.3.4.20200120-2 -mime-support3.64ubuntu1 -mount2.34-0.1ubuntu9.1 -ncurses-base6.2-0ubuntu2 -ncurses-bin6.2-0ubuntu2 -netpbm2:10.0-15.3build1 -openssl1.1.1f-1ubuntu2.1 -passwd1:4.8.1-1ubuntu5.20.04 -perl-base5.30.0-9ubuntu0.2 -pinentry-curses1.1.0-3build1 -poppler-data0.4.9-2 -procps2:3.3.16-1ubuntu2 -publicsuffix20200303.0012-1 -python33.8.2-0ubuntu2 -python3.83.8.5-1~20.04 -python3.8-minimal3.8.5-1~20.04 -python3-minimal3.8.2-0ubuntu2 -python3-pkg-resources45.2.0-1 -readline-common8.0-4 -sed4.7-1 -sensible-utils0.0.12+nmu1 -shared-mime-info1.15-1 -sysvinit-utils2.96-2.1ubuntu1 -tar1.30+dfsg-7ubuntu0.20.04.1 -tzdata2020f-0ubuntu0.20.04.1 -ubuntu-keyring2020.02.11.2 -ucf3.0038+nmu1 -unrar1:5.6.6-2build1 -util-linux2.34-0.1ubuntu9.1 -xdg-user-dirs0.17-2ubuntu1 -xz-utils5.2.4-1ubuntu1 -zlib1g1:1.2.11.dfsg-2ubuntu1.2 diff --git a/readme-vars.yml b/readme-vars.yml deleted file mode 100644 index b0ace4f76..000000000 --- a/readme-vars.yml +++ /dev/null @@ -1,95 +0,0 @@ ---- - -# project information -project_name: calibre-web -project_url: "https://github.com/janeczku/calibre-web" -project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/calibre-web-icon.png" -project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" -project_blurb: | - [{{ project_name|capitalize }}]({{ project_url }}) is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself. - - This software is a fork of library and licensed under the GPL v3 License. - -# supported architectures -available_architectures: - - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} - -# container parameters -common_param_env_vars_enabled: true -param_container_name: "{{ project_name }}" -param_usage_include_env: true -param_env_vars: - - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } - - { env_var: "DOCKER_MODS", env_value: "linuxserver/calibre-web:calibre", desc: "#optional & **x86-64 only** Adds the ability to perform ebook conversion"} -param_usage_include_vols: true -param_volumes: - - { vol_path: "/config", vol_host_path: "", desc: "Where calibre-web stores the internal database and config." } - - { vol_path: "/books", vol_host_path: "", desc: "Where your preexisting calibre database is locate." } -param_usage_include_ports: true -param_ports: - - { external_port: "8083", internal_port: "8083", port_desc: "WebUI" } - -# optional container parameters -opt_param_usage_include_env: false -opt_param_usage_include_vols: false -opt_param_usage_include_ports: false -opt_param_device_map: false -opt_cap_add_param: false -optional_block_1: false - -# application setup block -app_setup_block_enabled: true -app_setup_block: | - Webui can be found at `http://your-ip:8083` - - On the initial setup screen, enter `/books` as your calibre library location. - - **Default admin login:** - *Username:* admin - *Password:* admin123 - - Unrar is included by default and needs to be set in the Calibre-Web admin page (Basic Configuration:External Binaries) with a path of `/usr/bin/unrar` - - **x86-64 only** We have implemented the optional ability to pull in the dependencies to enable ebook conversion utilising Calibre, this means if you don't require this feature the container isn't uneccessarily bloated but should you require it, it is easily available. - This optional layer will be rebuilt automatically on our CI pipeline upon new Calibre releases so you can stay up to date. - To use this option add the optional environmental variable as detailed above to pull an addition docker layer to enable ebook conversion and then in the Calibre-Web admin page (Basic Configuration:External Binaries) set the **Path to Calibre E-Book Converter** to `/usr/bin/ebook-convert` - - This image contains the [kepubify](https://pgaskin.net/kepubify/) ebook conversion tool (MIT License) to convert epub to kepub. In the Calibre-Web admin page (Basic Configuration:External Binaries) set the **Path to Kepubify E-Book Converter** to `/usr/bin/kepubify` - - To reverse proxy with our Letsencrypt docker container we include a preconfigured reverse proxy config, for other instances of Nginx use the following location block: - ``` - location /calibre-web { - proxy_pass http://:8083; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Scheme $scheme; - proxy_set_header X-Script-Name /calibre-web; - } - ``` - -# changelog -changelogs: - - { date: "19.01.21:", desc: "Add python3-pkg-resources"} - - { date: "13.01.21:", desc: "Rebase to Ubuntu Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf." } - - { date: "12.10.20:", desc: "Add libxi6"} - - { date: "12.07.20:", desc: "Add kepubify for arm64v8" } - - { date: "05.06.20:", desc: "Add kepubify for x86-64 and arm32v7" } - - { date: "06.05.20:", desc: "Add libxslt1.1 and update ImageMagick policy" } - - { date: "19.01.20:", desc: "Adding LDAP libs." } - - { date: "13.10.19:", desc: "Migrate to Python3." } - - { date: "01.08.19:", desc: "Add libxcomposite1." } - - { date: "13.06.19:", desc: "Add docker mod to enable optional ebook conversion on x86-64. Add unrar." } - - { date: "02.06.19:", desc: "Rebase to Ubuntu Bionic & add Gdrive support." } - - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - - { date: "23.02.19:", desc: "Rebase to alpine 3.9, use repo version of imagemagick." } - - { date: "11.02.19:", desc: "Add pipeline logic and multi arch." } - - { date: "03.01.19:", desc: "Remove guest user from default app.db." } - - { date: "16.08.18:", desc: "Rebase to alpine 3.8." } - - { date: "03.07.18:", desc: "New build pushed, all versions below `67` have [vulnerability](https://github.com/janeczku/calibre-web/issues/534)." } - - { date: "05.01.18:", desc: "Deprecate cpu_core routine lack of scaling." } - - { date: "06.12.17:", desc: "Rebase to alpine 3.7." } - - { date: "27.11.17:", desc: "Use cpu core counting routine to speed up build time." } - - { date: "24.07.17:", desc: "Curl version for imagemagick." } - - { date: "17.07.17:", desc: "Initial release." } diff --git a/root/defaults/app.db b/root/defaults/app.db deleted file mode 100644 index 752e6916ddd7769ac4e43dd8447d2394fb340fd4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81920 zcmeI)?Qh%09S3kyPAtieqNGV63|ku3ZD0#g5?g+VlNM_fTS<*NcIt-(0g5pv@?>$Q zNQI>Q02mmYY$&jo+aIu3d$$++XZB|lMc*vIHlY0-MM|VhEA3JYt@;%#TjD+N?sIqK z-9^ggXRC(CmAdUTnWxN37bIDh?kkEUN%!b^nVx6qIYQ4eJuX%18aNetqpP zOUyKC4!`-7*FHM)+o{UYR)Zf^tfOV_94#CCXqmb6+B&Kl{*#Lr^mdsy>FN6Kn*MLM z__=%Ia^V}()|lC_T~Gd_sk7G4s9{l62tWV=5P$##AOHafKmY;|fB*y_009U<00Izz z00bZa0SG_<0uX?}unW)!9sKY1i|_g40Rad=00Izz00bZa0SG_<0uX?}kO_3Y|NmOb zzaFxRp*j$N00bZa0SG_<0uX=z1Rwwb2&CmR(xvS6Ti3<eAb|Bhx&j0s009U<00Izz z00bZa0SG`~_yw^3AO1E*4Iuyl2tWV=5P$##AOHafKmY<`f&kzDM@N7F1Rwwb2tWV= z5P$##AOHaf47C9M{eP&N7nOqm1Rwwb2tWV=5P$##AOHaf_ySn}qa#270uX=z1Rwwb z2tWV=5P$##hF<{d|KV?A)DQv?fB*y_009U<00Izz00bZ)*8i#ej+Fm`e&GQD2tWV= z5P$##AOHafKmY;|fWX@byqg-A3RmS^?qc>*_EDR=o@L+XO=g%1x0q?}%jcv*E_M7U zcQJJ-%k-vUNq=qCcJ+Gsp4(vM`GtG))AaaY?NFP3yuZBtfyVjWxjSVxT`y1b^88(1 zXKeOPeX(9&m}a%IUeo8w3yXJV7N=*+<%RO>oOXA%L9x2Yh~LI45~fB*y_009U<00Izz00bcLBN51s6l8z%A(a^^baoj!>;JE$ z{D1Rb{YXlQVn6@_5P$##AOHafKmY;|fB*y_@OA>{My|@?Cl691Be|^j{Qt<=Gt${J zdHekD-!5~ch5!U0@KY1`^MRZ$T)is)ZOLOble^sW3~R>?|E88Us+Fy(vQ>GoT2;cM z%G6la(3O?7t?HxdhO)N4rL1kQu9lRstoT@$>T+j~JIZe=8%v*5HoAvfw&R6~x(C}X zS6$asHXm13S1HGCfNAd-*2z4W>+ai*ej=dm*v;rc&9>^sj;b-!s5xBKjaYet(EbvI ziMZp{4U;G2x62Pt2?@`%&ugk@c!{ZNw!Q1BE$*l-w!@Rq>2_1~<0S=irmLE5 zwwqQ$sDD<~;XC{wq2%PLntYGPse|*jTc*u)YWY|@1cA)5t(s%+yF4kh)vlR_CQh3a zs?%rl+NP&EHi1OjILJE;cN_M8Qh2AbuIkyUv18dzQk#e_v}4;lCN;BT>~ZD6`ub|M zvL?DxaGGeaTDMI--aV6I?K4kns9J+rJKUw}xh>lwfk>wgQaQY7dtB}G*OR9XN~b&2 zc5ZUfI$W1eA02KMuSk+r>s?YL@_9Xt8S zl_Z zyLoiuO-}YoP9Hh7_rFt2>TRB5XdXrG41mEE2};n3s_rqf-K)*Ol6?0Re(zSj!`5JW zU##WW2Zsa6Or5nXay2Cu|3!NNAq*ibXIxSLgM|(4Xi0GN_nMcWVqo5tmvV~bc+ zNUw2P0d?!N5K({CuKkW{be?1ayTvVGF|Zu%md-pbuALUAwhbo=38UGeJCZ{VexK=F zL)8XdDXAQ%G=x8j=z1JY7o_kzX=1^~vQIWv9#=M=DW6uKDN}}C6j!ySPpV6wDpSD) zNHjmQ%r~)yXX&!7~~pU{(CXUipR}Sf9mz>ra$!(*WM;`cEi8v*wiaL zI$-MMH(qaACMqaWsqsT~+o9V;*tp8l`s%8f;7zQpFI6_H6JaV*lKz`f65+%3jq1vy zHNiR+6riYVR3BD1s%uNtO+_5@y{W$E&!!94ugk}DsidhUO&AQi%K3ML=Q0j;7M(3l`n_Z_?0KSA{iPo(<}xj5eDq@}|KR+ea&zat9{=~aGFBS>IP>?+tIWGU zwV6E13jqi~00RFffmffOPZzFSk-zw*e?Jpqaj>EkNxfmnvNE2cl;ZF*{9u2|}PWiFVNP0f_2i>3IgI-Hn>sY<(srPG?r|EgUq zoj9F;F!$@LMsI#rd~$KLaN~yj ztg|on!Zc`&@6tq^TeP~2zr7r5^1i?+(U2udSKmj$h=`g~>_z)q8$_u*Gi0lVAZGdviY4 z7baq1bR9T#N7F3b9YPVNdZ&Fk9@i(Ya17C}Me-TtED{Sw|bRGB#S+zJ1!&CRoyno=w}WyWCP|P8=G4xtUEDZr_&w zuGJlN%tscl3(n7vz6wmu^X;4Rbu7Nf)kNlV9HTRdsvc68rIP_eD0Q z*gZTzFJW9IxV>o@4eV_+jy_DM3x$IGveO&rLl uzVzbX|KKSv0uX=z1Rwwb2tWV=5P$##AOL}(63ECSS7fo7kop!hptcVH diff --git a/root/defaults/policy.xml b/root/defaults/policy.xml deleted file mode 100644 index 5ec3385c0..000000000 --- a/root/defaults/policy.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config deleted file mode 100644 index 384f5cba3..000000000 --- a/root/etc/cont-init.d/30-config +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/with-contenv bash - -# create symlinks for imagemagick policy.xml -[[ -f /etc/ImageMagick-6/policy.xml ]] && \ - rm /etc/ImageMagick-6/policy.xml -[[ ! -L /etc/ImageMagick-6/policy.xml ]] && \ - ln -s /defaults/policy.xml /etc/ImageMagick-6/policy.xml - -# create symlinks for database and log -[[ ! -f /config/app.db ]] && \ - cp /defaults/app.db /config/app.db -[[ -f /app/calibre-web/app.db ]] && \ - rm /app/calibre-web/app.db -[[ ! -L /app/calibre-web/app.db ]] && \ - ln -s /config/app.db /app/calibre-web/app.db - -# create symlinks for log -[[ ! -f /config/calibre-web.log ]] && \ - touch /config/calibre-web.log -[[ -f /app/calibre-web/calibre-web.log ]] && \ - rm /app/calibre-web/calibre-web.log -[[ ! -L /app/calibre-web/calibre-web.log ]] && \ - ln -s /config/calibre-web.log /app/calibre-web/calibre-web.log - -# create Google drive client_secrets.json file -[[ ! -f /config/client_secrets.json ]] && \ - echo "{}" > /config/client_secrets.json -[[ -f /app/calibre-web/client_secrets.json ]] && - rm /app/calibre-web/client_secrets.json -[[ ! -L /app/calibre-web/client_secrets.json ]] && - ln -s /config/client_secrets.json /app/calibre-web/client_secrets.json - -# create Google drive symlinks for database -[[ ! -f /config/gdrive.db ]] && \ - cp /app/calibre-web/gdrive.db /config/gdrive.db -[[ -f /app/calibre-web/gdrive.db ]] && \ - rm /app/calibre-web/gdrive.db -[[ ! -L /app/calibre-web/gdrive.db ]] && \ - ln -s /config/gdrive.db /app/calibre-web/gdrive.db - -# check if kepubify is present and if so make executable -[[ -f /usr/bin/kepubify ]] && \ -[[ ! -x /usr/bin/kepubify ]] && \ - chmod +x /usr/bin/kepubify - -# permissions -chown -R abc:abc \ - /config \ - /app/calibre-web diff --git a/root/etc/services.d/calibre-web/run b/root/etc/services.d/calibre-web/run deleted file mode 100644 index 228e498fc..000000000 --- a/root/etc/services.d/calibre-web/run +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/with-contenv bash - -cd /app/calibre-web || exit - -exec \ - s6-setuidgid abc python3 /app/calibre-web/cps.py From 9e44a9cdd49ec4b29d344bbf4e4dca5f0117e389 Mon Sep 17 00:00:00 2001 From: Roxedus Date: Mon, 25 Jan 2021 11:02:37 +0100 Subject: [PATCH 002/248] Add nightly --- .dockerignore | 6 + .gitattributes | 17 + .github/CONTRIBUTING.md | 122 +++ .github/FUNDING.yml | 2 + .github/ISSUE_TEMPLATE/config.yml | 13 + .github/ISSUE_TEMPLATE/issue.bug.md | 40 + .github/ISSUE_TEMPLATE/issue.feature.md | 25 + .github/PULL_REQUEST_TEMPLATE.md | 43 + .github/workflows/external_trigger.yml | 95 +++ .../workflows/external_trigger_scheduler.yml | 43 + .github/workflows/greetings.yml | 13 + .github/workflows/package_trigger.yml | 38 + .../workflows/package_trigger_scheduler.yml | 50 ++ .github/workflows/stale.yml | 23 + .gitignore | 43 + Dockerfile | 73 ++ Dockerfile.aarch64 | 87 ++ Dockerfile.armhf | 89 ++ Jenkinsfile | 785 ++++++++++++++++++ LICENSE | 674 +++++++++++++++ README.md | 21 +- jenkins-vars.yml | 29 + package_versions.txt | 244 ++++++ readme-vars.yml | 102 +++ root/defaults/app.db | Bin 0 -> 81920 bytes root/defaults/policy.xml | 80 ++ root/etc/cont-init.d/30-config | 49 ++ root/etc/services.d/calibre-web/run | 6 + 28 files changed, 2806 insertions(+), 6 deletions(-) create mode 100644 .dockerignore create mode 100644 .gitattributes create mode 100644 .github/CONTRIBUTING.md create mode 100644 .github/FUNDING.yml create mode 100644 .github/ISSUE_TEMPLATE/config.yml create mode 100644 .github/ISSUE_TEMPLATE/issue.bug.md create mode 100644 .github/ISSUE_TEMPLATE/issue.feature.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 .github/workflows/external_trigger.yml create mode 100644 .github/workflows/external_trigger_scheduler.yml create mode 100644 .github/workflows/greetings.yml create mode 100644 .github/workflows/package_trigger.yml create mode 100644 .github/workflows/package_trigger_scheduler.yml create mode 100644 .github/workflows/stale.yml create mode 100644 .gitignore create mode 100644 Dockerfile create mode 100644 Dockerfile.aarch64 create mode 100644 Dockerfile.armhf create mode 100644 Jenkinsfile create mode 100644 LICENSE create mode 100644 jenkins-vars.yml create mode 100644 package_versions.txt create mode 100644 readme-vars.yml create mode 100644 root/defaults/app.db create mode 100644 root/defaults/policy.xml create mode 100644 root/etc/cont-init.d/30-config create mode 100644 root/etc/services.d/calibre-web/run diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..cdb1a82fc --- /dev/null +++ b/.dockerignore @@ -0,0 +1,6 @@ +.git +.gitignore +.github +.gitattributes +READMETEMPLATE.md +README.md diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..bdb0cabc8 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,17 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 000000000..3dea55a20 --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,122 @@ +# Contributing to calibre-web + +## Gotchas + +* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open. +* Read, and fill the Pull Request template + * If this is a fix for a typo in code or documentation in the README please file an issue + * If the PR is addressing an existing issue include, closes #\, in the body of the PR commit message +* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn) + +## Common files + +| File | Use case | +| :----: | --- | +| `Dockerfile` | Dockerfile used to build amd64 images | +| `Dockerfile.aarch64` | Dockerfile used to build 64bit ARM architectures | +| `Dockerfile.armhf` | Dockerfile used to build 32bit ARM architectures | +| `Jenkinsfile` | This file is a product of our builder and should not be edited directly. This is used to build the image | +| `jenkins-vars.yml` | This file is used to generate the `Jenkinsfile` mentioned above, it only affects the build-process | +| `package_versions.txt` | This file is generated as a part of the build-process and should not be edited directly. It lists all the installed packages and their versions | +| `README.md` | This file is a product of our builder and should not be edited directly. This displays the readme for the repository and image registries | +| `readme-vars.yml` | This file is used to generate the `README.md` | + +## Readme + +If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit. +Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-calibre-web/edit/master/readme-vars.yml). + +These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play. +Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-calibre-web) + +### Fixing typos or clarify the text in the readme + +There are variables for multiple parts of the readme, the most common ones are: + +| Variable | Description | +| :----: | --- | +| `project_blurb` | This is the short excerpt shown above the project logo. | +| `app_setup_block` | This is the text that shows up under "Application Setup" if enabled | + +### Parameters + +The compose and run examples are also generated from these variables. + +We have a [reference file](https://github.com/linuxserver/docker-jenkins-builder/blob/master/vars/_container-vars-blank) in our Jenkins Builder. + +These are prefixed with `param_` for required parameters, or `opt_param` for optional parameters, except for `cap_add`. +Remember to enable param, if currently disabled. This differs between parameters, and can be seen in the reference file. + +Devices, environment variables, ports and volumes expects its variables in a certain way. + +### Devices + +```yml +param_devices: + - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" } +opt_param_devices: + - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" } +``` + +### Environment variables + +```yml +param_env_vars: + - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } +opt_param_env_vars: + - { env_var: "VERSION", env_value: "latest", desc: "Supported values are LATEST, PLEXPASS or a specific version number." } +``` + +### Ports + +```yml +param_ports: + - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" } +opt_param_ports: + - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" } +``` + +### Volumes + +```yml +param_volumes: + - { vol_path: "/config", vol_host_path: "", desc: "Configuration files." } +opt_param_volumes: + - { vol_path: "/config", vol_host_path: "", desc: "Configuration files." } +``` + +### Testing template changes + +After you make any changes to the templates, you can use our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) to have the files updated from the modified templates. Please use the command found under `Running Locally` [on this page](https://github.com/linuxserver/docker-jenkins-builder/blob/master/README.md) to generate them prior to submitting a PR. + +## Dockerfiles + +We use multiple Dockerfiles in our repos, this is because sometimes some CPU architectures needs different packages to work. +If you are proposing additional packages to be added, ensure that you added the packages to all the Dockerfiles in alphabetical order. + +### Testing your changes + +``` +git clone https://github.com/linuxserver/docker-calibre-web.git +cd docker-calibre-web +docker build \ + --no-cache \ + --pull \ + -t linuxserver/calibre-web:latest . +``` + +The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` +``` +docker run --rm --privileged multiarch/qemu-user-static:register --reset +``` + +Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. + +## Update the chagelog + +If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-calibre-web/tree/master/root), add an entry to the changelog + +```yml +changelogs: + - { date: "DD.MM.YY:", desc: "Added some love to templates" } +``` diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000000000..7eaac7717 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,2 @@ +github: linuxserver +open_collective: linuxserver diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..1d0b5a02a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,13 @@ +blank_issues_enabled: false +contact_links: + - name: Discord chat support + url: https://discord.gg/YWrKVTn + about: Realtime support / chat with the community and the team. + + - name: Discourse discussion forum + url: https://discourse.linuxserver.io + about: Post on our community forum. + + - name: Documentation + url: https://docs.linuxserver.io/images/docker-calibre-web + about: Documentation - information about all of our containers. diff --git a/.github/ISSUE_TEMPLATE/issue.bug.md b/.github/ISSUE_TEMPLATE/issue.bug.md new file mode 100644 index 000000000..41f6150bc --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.bug.md @@ -0,0 +1,40 @@ +--- +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 new file mode 100644 index 000000000..20a91fdb1 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.feature.md @@ -0,0 +1,25 @@ +--- +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 + diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..dec28f35d --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,43 @@ + + +[linuxserverurl]: https://linuxserver.io +[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] + + + + + + + + + + + + + + + + + +------------------------------ + + - [ ] I have read the [contributing](https://github.com/linuxserver/docker-calibre-web/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications + +------------------------------ + + + +## Description: + + +## Benefits of this PR and context: + + +## How Has This Been Tested? + + + + + +## Source / References: + diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml new file mode 100644 index 000000000..9ab5a22fe --- /dev/null +++ b/.github/workflows/external_trigger.yml @@ -0,0 +1,95 @@ +name: External Trigger Main + +on: + workflow_dispatch: + +jobs: + external-trigger-nightly: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + + - name: External Trigger + if: github.ref == 'refs/heads/nightly' + run: | + if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_CALIBRE_WEB_NIGHTLY }}" ]; then + echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_CALIBRE_WEB_NIGHTLY is set; skipping trigger. ****" + exit 0 + fi + echo "**** External trigger running off of nightly branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_CALIBRE_WEB_NIGHTLY\". ****" + echo "**** Retrieving external version ****" + EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/janeczku/calibre-web/commits/master" | jq -r '. | .sha' | cut -c1-8) + if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then + echo "**** Can't retrieve external version, exiting ****" + FAILURE_REASON="Can't retrieve external version for calibre-web branch nightly" + GHA_TRIGGER_URL="https://github.com/linuxserver/docker-calibre-web/actions/runs/${{ github.run_id }}" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + exit 1 + fi + EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') + echo "**** External version: ${EXT_RELEASE} ****" + echo "**** Retrieving last pushed version ****" + image="linuxserver/calibre-web" + tag="nightly" + token=$(curl -sX GET \ + "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fcalibre-web%3Apull" \ + | jq -r '.token') + multidigest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${tag}" \ + | jq -r 'first(.manifests[].digest)') + digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ + | jq -r '.config.digest') + image_info=$(curl -sL \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/blobs/${digest}" \ + | jq -r '.container_config') + 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 + echo "**** Can't retrieve last pushed version, exiting ****" + FAILURE_REASON="Can't retrieve last pushed version for calibre-web tag nightly" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + exit 1 + fi + echo "**** Last pushed version: ${IMAGE_VERSION} ****" + if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then + echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" + exit 0 + elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/nightly/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****" + exit 0 + elif [[ $(( $(date +%s%3N) - $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/nightly/lastBuild/api/json | jq -r '.timestamp') )) -lt $(( 6 * 3600000 )) ]]; then + echo "**** New version ${EXT_RELEASE} found; but the last build was less than 6 hours ago; skipping trigger ****" + exit 0 + else + echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****" + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/nightly/buildWithParameters?PACKAGE_CHECK=false \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "**** Jenkins job queue url: ${response%$'\r'} ****" + echo "**** Sleeping 10 seconds until job starts ****" + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "**** Jenkins job build url: ${buildurl} ****" + echo "**** Attempting to change the Jenkins job description ****" + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" + echo "**** Notifying Discord ****" + TRIGGER_REASON="A version change was detected for calibre-web tag nightly. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + fi diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml new file mode 100644 index 000000000..646d1da86 --- /dev/null +++ b/.github/workflows/external_trigger_scheduler.yml @@ -0,0 +1,43 @@ +name: External Trigger Scheduler + +on: + schedule: + - cron: '55 * * * *' + workflow_dispatch: + +jobs: + external-trigger-scheduler: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + with: + fetch-depth: '0' + + - name: External Trigger Scheduler + run: | + echo "**** Branches found: ****" + git for-each-ref --format='%(refname:short)' refs/remotes + echo "**** Pulling the yq docker image ****" + docker pull ghcr.io/linuxserver/yq + for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + do + br=$(echo "$br" | sed 's|origin/||g') + echo "**** Evaluating branch ${br} ****" + ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-calibre-web/${br}/jenkins-vars.yml \ + | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) + if [ "$br" == "$ls_branch" ]; then + echo "**** Branch ${br} appears to be live; checking workflow. ****" + if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-calibre-web/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then + echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****." + curl -iX POST \ + -H "Authorization: token ${{ secrets.CR_PAT }}" \ + -H "Accept: application/vnd.github.v3+json" \ + -d "{\"ref\":\"refs/heads/${br}\"}" \ + https://api.github.com/repos/linuxserver/docker-calibre-web/actions/workflows/external_trigger.yml/dispatches + else + echo "**** Workflow doesn't exist; skipping trigger. ****" + fi + else + echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + fi + done diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml new file mode 100644 index 000000000..17e3bc054 --- /dev/null +++ b/.github/workflows/greetings.yml @@ -0,0 +1,13 @@ +name: Greetings + +on: [pull_request_target, issues] + +jobs: + greeting: + runs-on: ubuntu-latest + 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-calibre-web/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-calibre-web/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!' + pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-calibre-web/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 new file mode 100644 index 000000000..f865451f7 --- /dev/null +++ b/.github/workflows/package_trigger.yml @@ -0,0 +1,38 @@ +name: Package Trigger Main + +on: + workflow_dispatch: + +jobs: + package-trigger-nightly: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + + - name: Package Trigger + if: github.ref == 'refs/heads/nightly' + run: | + if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_CALIBRE_WEB_NIGHTLY }}" ]; then + echo "**** Github secret PAUSE_PACKAGE_TRIGGER_CALIBRE_WEB_NIGHTLY is set; skipping trigger. ****" + exit 0 + fi + if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/nightly/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" + exit 0 + fi + echo "**** Package trigger running off of nightly branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_CALIBRE_WEB_NIGHTLY\". ****" + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/nightly/buildWithParameters?PACKAGE_CHECK=true \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "**** Jenkins job queue url: ${response%$'\r'} ****" + echo "**** Sleeping 10 seconds until job starts ****" + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "**** Jenkins job build url: ${buildurl} ****" + echo "**** Attempting to change the Jenkins job description ****" + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml new file mode 100644 index 000000000..8f9f9b2a9 --- /dev/null +++ b/.github/workflows/package_trigger_scheduler.yml @@ -0,0 +1,50 @@ +name: Package Trigger Scheduler + +on: + schedule: + - cron: '31 9 * * 2' + workflow_dispatch: + +jobs: + package-trigger-scheduler: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + with: + fetch-depth: '0' + + - name: Package Trigger Scheduler + run: | + echo "**** Branches found: ****" + git for-each-ref --format='%(refname:short)' refs/remotes + echo "**** Pulling the yq docker image ****" + docker pull ghcr.io/linuxserver/yq + for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + do + br=$(echo "$br" | sed 's|origin/||g') + echo "**** Evaluating branch ${br} ****" + ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-calibre-web/${br}/jenkins-vars.yml \ + | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) + if [ "${br}" == "${ls_branch}" ]; then + echo "**** Branch ${br} appears to be live; checking workflow. ****" + if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-calibre-web/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then + echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" + triggered_branches="${triggered_branches}${br} " + curl -iX POST \ + -H "Authorization: token ${{ secrets.CR_PAT }}" \ + -H "Accept: application/vnd.github.v3+json" \ + -d "{\"ref\":\"refs/heads/${br}\"}" \ + https://api.github.com/repos/linuxserver/docker-calibre-web/actions/workflows/package_trigger.yml/dispatches + sleep 30 + else + echo "**** Workflow doesn't exist; skipping trigger. ****" + fi + else + echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + fi + done + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" + echo "**** Notifying Discord ****" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Package Check Build(s) Triggered for calibre-web** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-calibre-web/activity/"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 000000000..1806420a2 --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,23 @@ +name: Mark stale issues and pull requests + +on: + schedule: + - cron: "30 1 * * *" + +jobs: + stale: + + runs-on: ubuntu-latest + + steps: + - uses: actions/stale@v1 + 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." + stale-issue-label: 'no-issue-activity' + stale-pr-label: 'no-pr-activity' + days-before-stale: 30 + days-before-close: 365 + exempt-issue-labels: 'awaiting-approval,work-in-progress' + exempt-pr-labels: 'awaiting-approval,work-in-progress' + repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..96374c4e7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,43 @@ +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# ========================= +# Operating System Files +# ========================= + +# OSX +# ========================= + +.DS_Store +.AppleDouble +.LSOverride + +# Thumbnails +._* + +# Files that might appear on external disk +.Spotlight-V100 +.Trashes + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..348727f08 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,73 @@ +FROM ghcr.io/linuxserver/baseimage-ubuntu:focal + +# set version label +ARG BUILD_DATE +ARG VERSION +ARG CALIBREWEB_COMMIT +LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" +LABEL maintainer="chbmb" + +RUN \ + echo "**** install build packages ****" && \ + apt-get update && \ + apt-get install -y \ + git \ + libldap2-dev \ + libsasl2-dev \ + python3-pip && \ + echo "**** install runtime packages ****" && \ + apt-get install -y \ + imagemagick \ + libnss3 \ + libxcomposite1 \ + libxi6 \ + libxslt1.1 \ + libldap-2.4-2 \ + libsasl2-2 \ + python3-minimal \ + python3-pkg-resources \ + unrar && \ + echo "**** install calibre-web ****" && \ + if [ -z ${CALIBREWEB_COMMIT+x} ]; then \ + CALIBREWEB_COMMIT=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/commits/master" \ + | awk '/sha/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/calibre-web.tar.gz -L \ + "https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_COMMIT}.tar.gz" && \ + mkdir -p \ + /app/calibre-web && \ + tar xf \ + /tmp/calibre-web.tar.gz -C \ + /app/calibre-web --strip-components=1 && \ + cd /app/calibre-web && \ + pip3 install --no-cache-dir -U -r \ + requirements.txt && \ + pip3 install --no-cache-dir -U -r \ + optional-requirements.txt && \ + echo "***install kepubify" && \ + if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ + KEPUBIFY_RELEASE=$(curl -sX GET "https://api.github.com/repos/pgaskin/kepubify/releases/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /usr/bin/kepubify -L \ + https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-64bit && \ + echo "**** cleanup ****" && \ + apt-get -y purge \ + git \ + libldap2-dev \ + libsasl2-dev \ + python3-pip && \ + apt-get -y autoremove && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* + +# add local files +COPY root/ / + +# ports and volumes +EXPOSE 8083 +VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 new file mode 100644 index 000000000..8e8df8f31 --- /dev/null +++ b/Dockerfile.aarch64 @@ -0,0 +1,87 @@ +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal + +# set version label +ARG BUILD_DATE +ARG VERSION +ARG CALIBREWEB_COMMIT +LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" +LABEL maintainer="chbmb" + +RUN \ + echo "**** install build packages ****" && \ + apt-get update && \ + apt-get install -y \ + g++ \ + gcc \ + git \ + libffi-dev \ + libjpeg-dev \ + libldap2-dev \ + libsasl2-dev \ + libxml2-dev \ + libxslt1-dev \ + python3-pip \ + zlib1g-dev && \ + echo "**** install runtime packages ****" && \ + apt-get install -y \ + imagemagick \ + libldap-2.4-2 \ + libnss3 \ + libsasl2-2 \ + libxcomposite1 \ + libxi6 \ + libxslt1.1 \ + python3-minimal \ + python3-pkg-resources \ + unrar && \ + echo "**** install calibre-web ****" && \ + if [ -z ${CALIBREWEB_COMMIT+x} ]; then \ + CALIBREWEB_COMMIT=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/commits/master" \ + | awk '/sha/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/calibre-web.tar.gz -L \ + "https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_COMMIT}.tar.gz" && \ + mkdir -p \ + /app/calibre-web && \ + tar xf \ + /tmp/calibre-web.tar.gz -C \ + /app/calibre-web --strip-components=1 && \ + cd /app/calibre-web && \ + pip3 install --no-cache-dir -U -r \ + requirements.txt && \ + pip3 install --no-cache-dir -U -r \ + optional-requirements.txt && \ + echo "***install kepubify" && \ + if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ + KEPUBIFY_RELEASE=$(curl -sX GET "https://api.github.com/repos/pgaskin/kepubify/releases/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /usr/bin/kepubify -L \ + https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-arm64 && \ + echo "**** cleanup ****" && \ + apt-get -y purge \ + g++ \ + gcc \ + git \ + libffi-dev \ + libjpeg-dev \ + libldap2-dev \ + libsasl2-dev \ + libxml2-dev \ + libxslt1-dev \ + python3-pip \ + zlib1g-dev && \ + apt-get -y autoremove && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* + +# add local files +COPY root/ / + +# ports and volumes +EXPOSE 8083 +VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf new file mode 100644 index 000000000..b1373e462 --- /dev/null +++ b/Dockerfile.armhf @@ -0,0 +1,89 @@ +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal + +# set version label +ARG BUILD_DATE +ARG VERSION +ARG CALIBREWEB_COMMIT +LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" +LABEL maintainer="chbmb" + +RUN \ + echo "**** install build packages ****" && \ + apt-get update && \ + apt-get install -y \ + g++ \ + gcc \ + git \ + libffi-dev \ + libjpeg-dev \ + libldap2-dev \ + libsasl2-dev \ + libssl-dev \ + libxml2-dev \ + libxslt1-dev \ + python3-pip \ + zlib1g-dev && \ + echo "**** install runtime packages ****" && \ + apt-get install -y \ + imagemagick \ + libldap-2.4-2 \ + libnss3 \ + libsasl2-2 \ + libxcomposite1 \ + libxi6 \ + libxslt1.1 \ + python3-minimal \ + python3-pkg-resources \ + unrar && \ + echo "**** install calibre-web ****" && \ + if [ -z ${CALIBREWEB_COMMIT+x} ]; then \ + CALIBREWEB_COMMIT=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/commits/master" \ + | awk '/sha/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/calibre-web.tar.gz -L \ + "https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_COMMIT}.tar.gz" && \ + mkdir -p \ + /app/calibre-web && \ + tar xf \ + /tmp/calibre-web.tar.gz -C \ + /app/calibre-web --strip-components=1 && \ + cd /app/calibre-web && \ + pip3 install --no-cache-dir -U -r \ + requirements.txt && \ + pip3 install --no-cache-dir -U -r \ + optional-requirements.txt && \ + echo "***install kepubify" && \ + if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ + KEPUBIFY_RELEASE=$(curl -sX GET "https://api.github.com/repos/pgaskin/kepubify/releases/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /usr/bin/kepubify -L \ + https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-arm && \ + echo "**** cleanup ****" && \ + apt-get -y purge \ + g++ \ + gcc \ + git \ + libffi-dev \ + libjpeg-dev \ + libldap2-dev \ + libsasl2-dev \ + libssl-dev \ + libxml2-dev \ + libxslt1-dev \ + python3-pip \ + zlib1g-dev && \ + apt-get -y autoremove && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* + +# add local files +COPY root/ / + +# ports and volumes +EXPOSE 8083 +VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..4769640bb --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,785 @@ +pipeline { + agent { + label 'X86-64-MULTI' + } + options { + buildDiscarder(logRotator(numToKeepStr: '10', daysToKeepStr: '60')) + parallelsAlwaysFailFast() + } + // Input to determine if this is a package check + parameters { + string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') + } + // Configuration for the variables used for this specific repo + environment { + BUILDS_DISCORD=credentials('build_webhook_url') + GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') + GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') + GITLAB_NAMESPACE=credentials('gitlab-namespace-id') + EXT_GIT_BRANCH = 'master' + EXT_USER = 'janeczku' + EXT_REPO = 'calibre-web' + BUILD_VERSION_ARG = 'CALIBREWEB_COMMIT' + LS_USER = 'linuxserver' + LS_REPO = 'docker-calibre-web' + CONTAINER_NAME = 'calibre-web' + DOCKERHUB_IMAGE = 'linuxserver/calibre-web' + DEV_DOCKERHUB_IMAGE = 'lsiodev/calibre-web' + PR_DOCKERHUB_IMAGE = 'lspipepr/calibre-web' + DIST_IMAGE = 'ubuntu' + MULTIARCH='true' + CI='true' + CI_WEB='true' + CI_PORT='8083' + CI_SSL='false' + CI_DELAY='120' + CI_DOCKERENV='TZ=US/Pacific' + CI_AUTH='user:password' + CI_WEBPATH='' + } + stages { + // Setup all the basic environment variables needed for the build + stage("Set ENV Variables base"){ + steps{ + script{ + env.EXIT_STATUS = '' + env.LS_RELEASE = sh( + script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':nightly 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', + returnStdout: true).trim() + env.LS_RELEASE_NOTES = sh( + script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', + returnStdout: true).trim() + env.GITHUB_DATE = sh( + script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', + returnStdout: true).trim() + env.COMMIT_SHA = sh( + script: '''git rev-parse HEAD''', + 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 ./.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/greetings.yml ./.github/workflows/stale.yml ./.github/workflows/package_trigger.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler.yml' + } + script{ + env.LS_RELEASE_NUMBER = sh( + script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''', + returnStdout: true).trim() + } + script{ + env.LS_TAG_NUMBER = sh( + script: '''#! /bin/bash + tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null) + if [ "${tagsha}" == "${COMMIT_SHA}" ]; then + echo ${LS_RELEASE_NUMBER} + elif [ -z "${GIT_COMMIT}" ]; then + echo ${LS_RELEASE_NUMBER} + else + echo $((${LS_RELEASE_NUMBER} + 1)) + fi''', + returnStdout: true).trim() + } + } + } + /* ####################### + Package Version Tagging + ####################### */ + // Grab the current package versions in Git to determine package tag + stage("Set Package tag"){ + steps{ + script{ + env.PACKAGE_TAG = sh( + script: '''#!/bin/bash + if [ -e package_versions.txt ] ; then + cat package_versions.txt | md5sum | cut -c1-8 + else + echo none + fi''', + returnStdout: true).trim() + } + } + } + /* ######################## + External Release Tagging + ######################## */ + // If this is a github commit trigger determine the current commit at head + stage("Set ENV github_commit"){ + steps{ + script{ + env.EXT_RELEASE = sh( + script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq -r '. | .sha' | cut -c1-8 ''', + returnStdout: true).trim() + } + } + } + // If this is a github commit trigger Set the external release link + stage("Set ENV commit_link"){ + steps{ + script{ + env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/commit/' + env.EXT_RELEASE + } + } + } + // Sanitize the release tag and strip illegal docker or github characters + stage("Sanitize tag"){ + steps{ + script{ + env.EXT_RELEASE_CLEAN = sh( + script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', + returnStdout: true).trim() + } + } + } + // If this is a nightly build use live docker endpoints + stage("Set ENV live build"){ + when { + branch "nightly" + environment name: 'CHANGE_ID', value: '' + } + steps { + script{ + env.IMAGE = env.DOCKERHUB_IMAGE + env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME + env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME + if (env.MULTIARCH == 'true') { + env.CI_TAGS = 'amd64-nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + } else { + env.CI_TAGS = 'nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + } + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.META_TAG = 'nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.EXT_RELEASE_TAG = 'nightly-version-' + env.EXT_RELEASE_CLEAN + } + } + } + // If this is a dev build use dev docker endpoints + stage("Set ENV dev build"){ + when { + not {branch "nightly"} + environment name: 'CHANGE_ID', value: '' + } + steps { + script{ + env.IMAGE = env.DEV_DOCKERHUB_IMAGE + env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME + env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME + if (env.MULTIARCH == 'true') { + env.CI_TAGS = 'amd64-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + } else { + env.CI_TAGS = 'nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + } + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.META_TAG = 'nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.EXT_RELEASE_TAG = 'nightly-version-' + env.EXT_RELEASE_CLEAN + env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' + } + } + } + // If this is a pull request build use dev docker endpoints + stage("Set ENV PR build"){ + when { + not {environment name: 'CHANGE_ID', value: ''} + } + steps { + script{ + env.IMAGE = env.PR_DOCKERHUB_IMAGE + env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME + env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME + if (env.MULTIARCH == 'true') { + env.CI_TAGS = 'amd64-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + } else { + env.CI_TAGS = 'nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + } + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.META_TAG = 'nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.EXT_RELEASE_TAG = 'nightly-version-' + env.EXT_RELEASE_CLEAN + env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST + env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' + } + } + } + // Run ShellCheck + stage('ShellCheck') { + when { + environment name: 'CI', value: 'true' + } + steps { + withCredentials([ + string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'), + string(credentialsId: 'ci-tests-s3-secret-access-key', variable: 'S3_SECRET') + ]) { + script{ + env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' + } + sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' + sh '''#! /bin/bash + set -e + docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest + docker run --rm \ + -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \ + -e FILE_NAME="shellcheck-result.xml" \ + -e MIMETYPE="text/xml" \ + -v ${WORKSPACE}:/mnt \ + -e SECRET_KEY=\"${S3_SECRET}\" \ + -e ACCESS_KEY=\"${S3_KEY}\" \ + -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \ + python /upload.py''' + } + } + } + // Use helper containers to render templated files + stage('Update-Templates') { + when { + branch "nightly" + environment name: 'CHANGE_ID', value: '' + expression { + env.CONTAINER_NAME != null + } + } + 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=nightly -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + 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}" ]]; 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 nightly + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE + rm -f ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md + cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : + cd ${TEMPDIR}/repo/${LS_REPO}/ + git add ${TEMPLATED_FILES} + git rm .github/ISSUE_TEMPLATE.md || : + 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}/gitbook + git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ + cd ${TEMPDIR}/gitbook/docker-documentation/ + git add 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}-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}/${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}/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "Image is on the ignore list, skipping Unraid template upload" + else + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + cd ${TEMPDIR}/unraid/templates/ + git add unraid/${CONTAINER_NAME}.xml + git commit -m 'Bot Updating Unraid Template' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all + fi + fi + rm -Rf ${TEMPDIR}''' + script{ + env.FILES_UPDATED = sh( + script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', + returnStdout: true).trim() + } + } + } + // Exit the build if the Templated files were just updated + stage('Template-exit') { + when { + branch "nightly" + environment name: 'CHANGE_ID', value: '' + environment name: 'FILES_UPDATED', value: 'true' + expression { + env.CONTAINER_NAME != null + } + } + steps { + script{ + env.EXIT_STATUS = 'ABORTED' + } + } + } + /* ####################### + GitLab Mirroring + ####################### */ + // Ping into Gitlab to mirror this repo and have a registry endpoint + stage("GitLab Mirror"){ + when { + environment name: 'EXIT_STATUS', value: '' + } + steps{ + sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \ + -d '{"namespace_id":'${GITLAB_NAMESPACE}',\ + "name":"'${LS_REPO}'", + "mirror":true,\ + "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\ + "issues_access_level":"disabled",\ + "merge_requests_access_level":"disabled",\ + "repository_access_level":"enabled",\ + "visibility":"public"}' ''' + } + } + /* ############### + Build Container + ############### */ + // Build Docker container for push to LS Repo + stage('Build-Single') { + when { + environment name: 'MULTIARCH', value: 'false' + environment name: 'EXIT_STATUS', value: '' + } + steps { + echo "Running on node: ${NODE_NAME}" + sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + } + } + // Build MultiArch Docker containers for push to LS Repo + stage('Build-Multi') { + when { + environment name: 'MULTIARCH', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + parallel { + stage('Build X86') { + steps { + echo "Running on node: ${NODE_NAME}" + sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + } + } + stage('Build ARMHF') { + agent { + label 'ARMHF' + } + steps { + echo "Running on node: ${NODE_NAME}" + echo 'Logging into Github' + sh '''#! /bin/bash + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + ''' + sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" + retry(5) { + sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" + } + sh '''docker rmi \ + ${IMAGE}:arm32v7-${META_TAG} \ + ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + } + } + stage('Build ARM64') { + agent { + label 'ARM64' + } + steps { + echo "Running on node: ${NODE_NAME}" + echo 'Logging into Github' + sh '''#! /bin/bash + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + ''' + sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + retry(5) { + sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + } + sh '''docker rmi \ + ${IMAGE}:arm64v8-${META_TAG} \ + ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + } + } + } + } + // Take the image we just built and dump package versions for comparison + stage('Update-packages') { + when { + branch "nightly" + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + sh '''#! /bin/bash + set -e + TEMPDIR=$(mktemp -d) + if [ "${MULTIARCH}" == "true" ]; then + LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} + else + LOCAL_CONTAINER=${IMAGE}:${META_TAG} + fi + if [ "${DIST_IMAGE}" == "alpine" ]; then + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ + apk info -v > /tmp/package_versions.txt && \ + sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' + elif [ "${DIST_IMAGE}" == "ubuntu" ]; then + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ + apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \ + sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' + fi + NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) + echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" + if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO} + git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f nightly + cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ + cd ${TEMPDIR}/${LS_REPO}/ + 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 + echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} + echo "Package tag updated, stopping build process" + else + echo "false" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} + echo "Package tag is same as previous continue with build process" + fi + rm -Rf ${TEMPDIR}''' + script{ + env.PACKAGE_UPDATED = sh( + script: '''cat /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}''', + returnStdout: true).trim() + } + } + } + // Exit the build if the package file was just updated + stage('PACKAGE-exit') { + when { + branch "nightly" + environment name: 'CHANGE_ID', value: '' + environment name: 'PACKAGE_UPDATED', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + steps { + sh '''#! /bin/bash + echo "Packages were updated. Cleaning up the image and exiting." + if [ "${MULTIARCH}" == "true" ]; then + docker rmi ${IMAGE}:amd64-${META_TAG} + else + docker rmi ${IMAGE}:${META_TAG} + fi''' + script{ + env.EXIT_STATUS = 'ABORTED' + } + } + } + // Exit the build if this is just a package check and there are no changes to push + stage('PACKAGECHECK-exit') { + when { + branch "nightly" + environment name: 'CHANGE_ID', value: '' + environment name: 'PACKAGE_UPDATED', value: 'false' + environment name: 'EXIT_STATUS', value: '' + expression { + params.PACKAGE_CHECK == 'true' + } + } + steps { + sh '''#! /bin/bash + echo "There are no package updates. Cleaning up the image and exiting." + if [ "${MULTIARCH}" == "true" ]; then + docker rmi ${IMAGE}:amd64-${META_TAG} + else + docker rmi ${IMAGE}:${META_TAG} + fi''' + script{ + env.EXIT_STATUS = 'ABORTED' + } + } + } + /* ####### + Testing + ####### */ + // Run Container tests + stage('Test') { + when { + environment name: 'CI', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + steps { + withCredentials([ + string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'), + string(credentialsId: 'ci-tests-s3-secret-access-key ', variable: 'S3_SECRET') + ]) { + script{ + env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html' + } + sh '''#! /bin/bash + set -e + docker pull ghcr.io/linuxserver/lsiodev-ci:latest + if [ "${MULTIARCH}" == "true" ]; 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 tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} + fi + docker run --rm \ + --shm-size=1gb \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -e IMAGE=\"${IMAGE}\" \ + -e DELAY_START=\"${CI_DELAY}\" \ + -e TAGS=\"${CI_TAGS}\" \ + -e META_TAG=\"${META_TAG}\" \ + -e PORT=\"${CI_PORT}\" \ + -e SSL=\"${CI_SSL}\" \ + -e BASE=\"${DIST_IMAGE}\" \ + -e SECRET_KEY=\"${S3_SECRET}\" \ + -e ACCESS_KEY=\"${S3_KEY}\" \ + -e DOCKER_ENV=\"${CI_DOCKERENV}\" \ + -e WEB_SCREENSHOT=\"${CI_WEB}\" \ + -e WEB_AUTH=\"${CI_AUTH}\" \ + -e WEB_PATH=\"${CI_WEBPATH}\" \ + -e DO_REGION="ams3" \ + -e DO_BUCKET="lsio-ci" \ + -t ghcr.io/linuxserver/lsiodev-ci:latest \ + python /ci/ci.py''' + } + } + } + /* ################## + Release Logic + ################## */ + // If this is an amd64 only image only push a single image + stage('Docker-Push-Single') { + when { + environment name: 'MULTIARCH', value: 'false' + environment name: 'EXIT_STATUS', value: '' + } + steps { + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + retry(5) { + sh '''#! /bin/bash + set -e + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:nightly + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} + docker push ${PUSHIMAGE}:nightly + docker push ${PUSHIMAGE}:${META_TAG} + docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} + done + ''' + } + sh '''#! /bin/bash + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + docker rmi \ + ${DELETEIMAGE}:${META_TAG} \ + ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:nightly || : + done + ''' + } + } + } + // If this is a multi arch release push all images and define the manifest + stage('Docker-Push-Multi') { + when { + environment name: 'MULTIARCH', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + steps { + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + retry(5) { + sh '''#! /bin/bash + set -e + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --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 tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} + fi + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}"; 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-nightly + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-nightly + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-nightly + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:amd64-${META_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:amd64-nightly + docker push ${MANIFESTIMAGE}:arm32v7-nightly + docker push ${MANIFESTIMAGE}:arm64v8-nightly + docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker manifest push --purge ${MANIFESTIMAGE}:nightly || : + docker manifest create ${MANIFESTIMAGE}:nightly ${MANIFESTIMAGE}:amd64-nightly ${MANIFESTIMAGE}:arm32v7-nightly ${MANIFESTIMAGE}:arm64v8-nightly + docker manifest annotate ${MANIFESTIMAGE}:nightly ${MANIFESTIMAGE}:arm32v7-nightly --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:nightly ${MANIFESTIMAGE}:arm64v8-nightly --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : + docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || : + docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:nightly + docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} + docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} + done + ''' + } + sh '''#! /bin/bash + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + docker rmi \ + ${DELETEIMAGE}:amd64-${META_TAG} \ + ${DELETEIMAGE}:amd64-nightly \ + ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:arm32v7-${META_TAG} \ + ${DELETEIMAGE}:arm32v7-nightly \ + ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:arm64v8-${META_TAG} \ + ${DELETEIMAGE}:arm64v8-nightly \ + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : + done + docker rmi \ + ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ + ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : + ''' + } + } + } + // If this is a public release tag it in the LS Github + stage('Github-Tag-Push-Release') { + when { + branch "nightly" + expression { + env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + } + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}" + sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ + -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + "object": "'${COMMIT_SHA}'",\ + "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to nightly",\ + "type": "commit",\ + "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' + echo "Pushing New release for Tag" + sh '''#! /bin/bash + curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json + echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + "target_commitish": "nightly",\ + "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start + printf '","draft": false,"prerelease": true}' >> releasebody.json + paste -d'\\0' start releasebody.json > releasebody.json.done + curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' + } + } + // 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/lsiodev-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/lsiodev-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 { + not {environment name: 'CHANGE_ID', value: ''} + environment name: 'CI', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + steps { + sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \ + -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' ''' + } + } + } + /* ###################### + Send status to Discord + ###################### */ + post { + always { + script{ + if (env.EXIT_STATUS == "ABORTED"){ + 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,\ + "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,\ + "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} ''' + } + } + } + cleanup { + cleanWs() + } + } +} diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..f288702d2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md index 3aec9a124..c17d1a9f4 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Find us at: [![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/calibre-web.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/calibre-web "Get your own version badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/calibre-web.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/calibre-web) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/calibre-web.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/calibre-web) -[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-calibre-web%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/master/) +[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-calibre-web%2Fjob%2Fnightly%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/nightly/) [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fcalibre-web%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/calibre-web/latest/index.html) [Calibre-web](https://github.com/janeczku/calibre-web) is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself. @@ -59,6 +59,14 @@ The architectures supported by this image are: | arm64 | arm64v8-latest | | armhf | arm32v7-latest | +## Version Tags + +This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. + +| Tag | Description | +| :----: | --- | +| latest | Releases of Calibre-Web | +| nightly | Commits to the master branch of Calibre-Web | ## Usage @@ -81,8 +89,8 @@ services: - TZ=Europe/London - DOCKER_MODS=linuxserver/calibre-web:calibre volumes: - - :/config - - :/books + - /path/to/data:/config + - /path/to/calibre/library:/books ports: - 8083:8083 restart: unless-stopped @@ -98,8 +106,8 @@ docker run -d \ -e TZ=Europe/London \ -e DOCKER_MODS=linuxserver/calibre-web:calibre \ -p 8083:8083 \ - -v :/config \ - -v :/books \ + -v /path/to/data:/config \ + -v /path/to/calibre/library:/books \ --restart unless-stopped \ ghcr.io/linuxserver/calibre-web ``` @@ -165,7 +173,7 @@ Unrar is included by default and needs to be set in the Calibre-Web admin page ( **x86-64 only** We have implemented the optional ability to pull in the dependencies to enable ebook conversion utilising Calibre, this means if you don't require this feature the container isn't uneccessarily bloated but should you require it, it is easily available. This optional layer will be rebuilt automatically on our CI pipeline upon new Calibre releases so you can stay up to date. -To use this option add the optional environmental variable as detailed above to pull an addition docker layer to enable ebook conversion and then in the Calibre-Web admin page (Basic Configuration:External Binaries) set the **Path to Calibre E-Book Converter** to `/usr/bin/ebook-convert` +To use this option add the optional environmental variable as detailed above to pull an addition docker layer to enable ebook conversion and then in the Calibre-Web admin page (Basic Configuration:External Binaries) set the **Path to Calibre E-Book Converter** to `/usr/bin/ebook-convert` This image contains the [kepubify](https://pgaskin.net/kepubify/) ebook conversion tool (MIT License) to convert epub to kepub. In the Calibre-Web admin page (Basic Configuration:External Binaries) set the **Path to Kepubify E-Book Converter** to `/usr/bin/kepubify` @@ -252,6 +260,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **25.01.21:** - Add nightly tag * **19.01.21:** - Add python3-pkg-resources * **13.01.21:** - Rebase to Ubuntu Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf. * **12.10.20:** - Add libxi6 diff --git a/jenkins-vars.yml b/jenkins-vars.yml new file mode 100644 index 000000000..94999a87b --- /dev/null +++ b/jenkins-vars.yml @@ -0,0 +1,29 @@ +--- +# jenkins variables +project_name: docker-calibre-web +external_type: github_commit +release_type: prerelease +release_tag: nightly +ls_branch: nightly +external_trigger_delay_hours: 6 +repo_vars: + - EXT_GIT_BRANCH = 'master' + - EXT_USER = 'janeczku' + - EXT_REPO = 'calibre-web' + - BUILD_VERSION_ARG = 'CALIBREWEB_COMMIT' + - LS_USER = 'linuxserver' + - LS_REPO = 'docker-calibre-web' + - CONTAINER_NAME = 'calibre-web' + - DOCKERHUB_IMAGE = 'linuxserver/calibre-web' + - DEV_DOCKERHUB_IMAGE = 'lsiodev/calibre-web' + - PR_DOCKERHUB_IMAGE = 'lspipepr/calibre-web' + - DIST_IMAGE = 'ubuntu' + - MULTIARCH='true' + - CI='true' + - CI_WEB='true' + - CI_PORT='8083' + - CI_SSL='false' + - CI_DELAY='120' + - CI_DOCKERENV='TZ=US/Pacific' + - CI_AUTH='user:password' + - CI_WEBPATH='' diff --git a/package_versions.txt b/package_versions.txt new file mode 100644 index 000000000..ad814d3ec --- /dev/null +++ b/package_versions.txt @@ -0,0 +1,244 @@ +adduser3.118ubuntu2 +apt2.0.2ubuntu0.2 +apt-utils2.0.2ubuntu0.2 +base-files11ubuntu5.2 +base-passwd3.5.47 +bash5.0-6ubuntu1.1 +bsdutils1:2.34-0.1ubuntu9.1 +bzip21.0.8-2 +ca-certificates20201027ubuntu0.20.04.1 +coreutils8.30-3ubuntu2 +curl7.68.0-1ubuntu2.4 +dash0.5.10.2-6 +dbus1.12.16-2ubuntu2.1 +debconf1.5.73 +debianutils4.9.1 +diffutils1:3.7-3 +dirmngr2.2.19-3ubuntu2 +dpkg1.19.7ubuntu3 +e2fsprogs1.45.5-2ubuntu1 +fdisk2.34-0.1ubuntu9.1 +file1:5.38-4 +findutils4.7.0-1ubuntu1 +fontconfig2.13.1-2ubuntu3 +fontconfig-config2.13.1-2ubuntu3 +fonts-dejavu-core2.37-1 +fonts-droid-fallback1:6.0.1r16-1.1 +fonts-noto-mono20200323-1build1~ubuntu20.04.1 +fonts-urw-base3520170801.1-3 +gcc-10-base10.2.0-5ubuntu1~20.04 +ghostscript9.50~dfsg-5ubuntu4.2 +gnupg2.2.19-3ubuntu2 +gnupg-l10n2.2.19-3ubuntu2 +gnupg-utils2.2.19-3ubuntu2 +gpg2.2.19-3ubuntu2 +gpg-agent2.2.19-3ubuntu2 +gpgconf2.2.19-3ubuntu2 +gpgsm2.2.19-3ubuntu2 +gpgv2.2.19-3ubuntu2 +gpg-wks-client2.2.19-3ubuntu2 +gpg-wks-server2.2.19-3ubuntu2 +grep3.4-1 +gsfonts1:8.11+urwcyr1.0.7~pre44-4.4 +gzip1.10-0ubuntu4 +hicolor-icon-theme0.17-2 +hostname3.23 +imagemagick-6-common8:6.9.10.23+dfsg-2.1ubuntu11.2 +imagemagick-6.q168:6.9.10.23+dfsg-2.1ubuntu11.2 +imagemagick8:6.9.10.23+dfsg-2.1ubuntu11.2 +init-system-helpers1.57 +krb5-locales1.17-6ubuntu4.1 +libacl12.2.53-6 +libapparmor12.13.3-7ubuntu5.1 +libapt-pkg6.02.0.2ubuntu0.2 +libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 +libassuan02.5.3-7ubuntu2 +libattr11:2.4.48-5 +libaudit11:2.8.5-2ubuntu6 +libaudit-common1:2.8.5-2ubuntu6 +libavahi-client30.7-4ubuntu7 +libavahi-common30.7-4ubuntu7 +libavahi-common-data0.7-4ubuntu7 +libblkid12.34-0.1ubuntu9.1 +libbrotli11.0.7-6ubuntu0.1 +libbsd00.10.0-1 +libbz2-1.01.0.8-2 +libc62.31-0ubuntu9.1 +libcairo21.16.0-4ubuntu1 +libcap-ng00.7.9-2.1build1 +libc-bin2.31-0ubuntu9.1 +libcom-err21.45.5-2ubuntu1 +libcrypt11:4.4.10-10ubuntu4 +libcups22.3.1-9ubuntu1.1 +libcurl47.68.0-1ubuntu2.4 +libdatrie10.2.12-3 +libdb5.35.3.28+dfsg1-0.6ubuntu2 +libdbus-1-31.12.16-2ubuntu2.1 +libdebconfclient00.251ubuntu1 +libdjvulibre213.5.27.1-14build1 +libdjvulibre-text3.5.27.1-14build1 +libexpat12.2.9-1build1 +libext2fs21.45.5-2ubuntu1 +libfdisk12.34-0.1ubuntu9.1 +libffi73.3-4 +libfftw3-double33.3.8-2ubuntu1 +libfontconfig12.13.1-2ubuntu3 +libfreetype62.10.1-2ubuntu0.1 +libfribidi01.0.8-2 +libgcc-s110.2.0-5ubuntu1~20.04 +libgcrypt201.8.5-5ubuntu1 +libglib2.0-02.64.3-1~ubuntu20.04.1 +libglib2.0-data2.64.3-1~ubuntu20.04.1 +libgmp102:6.2.0+dfsg-4 +libgnutls303.6.13-2ubuntu1.3 +libgomp110.2.0-5ubuntu1~20.04 +libgpg-error01.37-1 +libgraphite2-31.3.13-11build1 +libgs99.50~dfsg-5ubuntu4.2 +libgs9-common9.50~dfsg-5ubuntu4.2 +libgssapi3-heimdal7.7.0+dfsg-1ubuntu1 +libgssapi-krb5-21.17-6ubuntu4.1 +libharfbuzz0b2.6.4-1ubuntu4 +libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1 +libheimbase1-heimdal7.7.0+dfsg-1ubuntu1 +libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 +libhogweed53.5.1+really3.5.1-2 +libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 +libicu6666.1-2ubuntu2 +libidn111.33-2.2ubuntu2 +libidn2-02.2.0-2 +libijs-0.350.35-15 +libilmbase242.3.0-6build1 +libjbig02.1-3.1build1 +libjbig2dec00.18-1ubuntu1 +libjpeg88c-2ubuntu8 +libjpeg-turbo82.0.3-0ubuntu1.20.04.1 +libk5crypto31.17-6ubuntu4.1 +libkeyutils11.6-6ubuntu1 +libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1 +libkrb5-31.17-6ubuntu4.1 +libkrb5support01.17-6ubuntu4.1 +libksba81.3.5-2 +liblcms2-22.9-4 +libldap-2.4-22.4.49+dfsg-2ubuntu1.5 +libldap-common2.4.49+dfsg-2ubuntu1.5 +liblqr-1-00.4.2-2.1 +libltdl72.4.6-14 +liblz4-11.9.2-2 +liblzma55.2.4-1ubuntu1 +libmagic11:5.38-4 +libmagickcore-6.q16-68:6.9.10.23+dfsg-2.1ubuntu11.2 +libmagickcore-6.q16-6-extra8:6.9.10.23+dfsg-2.1ubuntu11.2 +libmagickwand-6.q16-68:6.9.10.23+dfsg-2.1ubuntu11.2 +libmagic-mgc1:5.38-4 +libmount12.34-0.1ubuntu9.1 +libmpdec22.4.2-3 +libncurses66.2-0ubuntu2 +libncursesw66.2-0ubuntu2 +libnetpbm102:10.0-15.3build1 +libnettle73.5.1+really3.5.1-2 +libnghttp2-141.40.0-1build1 +libnpth01.6-1 +libnspr42:4.25-1 +libnss32:3.49.1-1ubuntu1.5 +libopenexr242.3.0-6ubuntu0.3 +libopenjp2-72.3.1-1ubuntu4.20.04.1 +libp11-kit00.23.20-1ubuntu0.1 +libpam0g1.3.1-5ubuntu4.1 +libpam-modules1.3.1-5ubuntu4.1 +libpam-modules-bin1.3.1-5ubuntu4.1 +libpam-runtime1.3.1-5ubuntu4.1 +libpango-1.0-01.44.7-2ubuntu4 +libpangocairo-1.0-01.44.7-2ubuntu4 +libpangoft2-1.0-01.44.7-2ubuntu4 +libpaper11.1.28 +libpaper-utils1.1.28 +libpcre2-8-010.34-7 +libpcre32:8.39-12build1 +libpixman-1-00.38.4-0ubuntu1 +libpng16-161.6.37-2 +libprocps82:3.3.16-1ubuntu2 +libpsl50.21.0-1ubuntu1 +libpython3.8-minimal3.8.5-1~20.04 +libpython3.8-stdlib3.8.5-1~20.04 +libpython3-stdlib3.8.2-0ubuntu2 +libreadline88.0-4 +libroken18-heimdal7.7.0+dfsg-1ubuntu1 +librtmp12.4+20151223.gitfa8646d.1-2build1 +libsasl2-22.1.27+dfsg-2 +libsasl2-modules2.1.27+dfsg-2 +libsasl2-modules-db2.1.27+dfsg-2 +libseccomp22.4.3-1ubuntu3.20.04.3 +libselinux13.0-1build2 +libsemanage13.0-1build2 +libsemanage-common3.0-1build2 +libsepol13.0-1 +libsmartcols12.34-0.1ubuntu9.1 +libsqlite3-03.31.1-4ubuntu0.2 +libss21.45.5-2ubuntu1 +libssh-40.9.3-2ubuntu2.1 +libssl1.11.1.1f-1ubuntu2.1 +libstdc++610.2.0-5ubuntu1~20.04 +libsystemd0245.4-4ubuntu3.4 +libtasn1-64.16.0-2 +libthai00.1.28-3 +libthai-data0.1.28-3 +libtiff54.1.0+git191117-2build1 +libtinfo66.2-0ubuntu2 +libudev1245.4-4ubuntu3.4 +libunistring20.9.10-2 +libuuid12.34-0.1ubuntu9.1 +libwebp60.6.1-2 +libwebpmux30.6.1-2 +libwind0-heimdal7.7.0+dfsg-1ubuntu1 +libwmf0.2-70.2.8.4-17ubuntu1 +libx11-62:1.6.9-2ubuntu1.1 +libx11-data2:1.6.9-2ubuntu1.1 +libxau61:1.0.9-0ubuntu1 +libxcb11.14-2 +libxcb-render01.14-2 +libxcb-shm01.14-2 +libxcomposite11:0.4.5-1 +libxdmcp61:1.1.3-0ubuntu1 +libxext62:1.3.4-0ubuntu1 +libxi62:1.7.10-0ubuntu1 +libxml22.9.10+dfsg-5 +libxrender11:0.9.10-1 +libxslt1.11.1.34-4 +libzstd11.4.4+dfsg-3 +locales2.31-0ubuntu9.1 +login1:4.8.1-1ubuntu5.20.04 +logsave1.45.5-2ubuntu1 +lsb-base11.1.0ubuntu2 +mawk1.3.4.20200120-2 +mime-support3.64ubuntu1 +mount2.34-0.1ubuntu9.1 +ncurses-base6.2-0ubuntu2 +ncurses-bin6.2-0ubuntu2 +netpbm2:10.0-15.3build1 +openssl1.1.1f-1ubuntu2.1 +passwd1:4.8.1-1ubuntu5.20.04 +perl-base5.30.0-9ubuntu0.2 +pinentry-curses1.1.0-3build1 +poppler-data0.4.9-2 +procps2:3.3.16-1ubuntu2 +publicsuffix20200303.0012-1 +python33.8.2-0ubuntu2 +python3.83.8.5-1~20.04 +python3.8-minimal3.8.5-1~20.04 +python3-minimal3.8.2-0ubuntu2 +python3-pkg-resources45.2.0-1 +readline-common8.0-4 +sed4.7-1 +sensible-utils0.0.12+nmu1 +shared-mime-info1.15-1 +sysvinit-utils2.96-2.1ubuntu1 +tar1.30+dfsg-7ubuntu0.20.04.1 +tzdata2020f-0ubuntu0.20.04.1 +ubuntu-keyring2020.02.11.2 +ucf3.0038+nmu1 +unrar1:5.6.6-2build1 +util-linux2.34-0.1ubuntu9.1 +xdg-user-dirs0.17-2ubuntu1 +xz-utils5.2.4-1ubuntu1 +zlib1g1:1.2.11.dfsg-2ubuntu1.2 diff --git a/readme-vars.yml b/readme-vars.yml new file mode 100644 index 000000000..5c7830a1d --- /dev/null +++ b/readme-vars.yml @@ -0,0 +1,102 @@ +--- + +# project information +project_name: calibre-web +project_url: "https://github.com/janeczku/calibre-web" +project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/calibre-web-icon.png" +project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" +project_blurb: | + [{{ project_name|capitalize }}]({{ project_url }}) is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself. + + This software is a fork of library and licensed under the GPL v3 License. + +# supported architectures +available_architectures: + - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} + - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} + - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} + +# development version +development_versions: true +development_versions_items: + - { tag: "latest", desc: "Releases of Calibre-Web" } + - { tag: "nightly", desc: "Commits to the master branch of Calibre-Web" } + +# container parameters +common_param_env_vars_enabled: true +param_container_name: "{{ project_name }}" +param_usage_include_env: true +param_env_vars: + - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } + - { env_var: "DOCKER_MODS", env_value: "linuxserver/calibre-web:calibre", desc: "#optional & **x86-64 only** Adds the ability to perform ebook conversion"} +param_usage_include_vols: true +param_volumes: + - { vol_path: "/config", vol_host_path: "/path/to/data", desc: "Where calibre-web stores the internal database and config." } + - { vol_path: "/books", vol_host_path: "/path/to/calibre/library", desc: "Where your preexisting calibre database is locate." } +param_usage_include_ports: true +param_ports: + - { external_port: "8083", internal_port: "8083", port_desc: "WebUI" } + +# optional container parameters +opt_param_usage_include_env: false +opt_param_usage_include_vols: false +opt_param_usage_include_ports: false +opt_param_device_map: false +opt_cap_add_param: false +optional_block_1: false + +# application setup block +app_setup_block_enabled: true +app_setup_block: | + Webui can be found at `http://your-ip:8083` + + On the initial setup screen, enter `/books` as your calibre library location. + + **Default admin login:** + *Username:* admin + *Password:* admin123 + + Unrar is included by default and needs to be set in the Calibre-Web admin page (Basic Configuration:External Binaries) with a path of `/usr/bin/unrar` + + **x86-64 only** We have implemented the optional ability to pull in the dependencies to enable ebook conversion utilising Calibre, this means if you don't require this feature the container isn't uneccessarily bloated but should you require it, it is easily available. + This optional layer will be rebuilt automatically on our CI pipeline upon new Calibre releases so you can stay up to date. + To use this option add the optional environmental variable as detailed above to pull an addition docker layer to enable ebook conversion and then in the Calibre-Web admin page (Basic Configuration:External Binaries) set the **Path to Calibre E-Book Converter** to `/usr/bin/ebook-convert` + + This image contains the [kepubify](https://pgaskin.net/kepubify/) ebook conversion tool (MIT License) to convert epub to kepub. In the Calibre-Web admin page (Basic Configuration:External Binaries) set the **Path to Kepubify E-Book Converter** to `/usr/bin/kepubify` + + To reverse proxy with our Letsencrypt docker container we include a preconfigured reverse proxy config, for other instances of Nginx use the following location block: + ``` + location /calibre-web { + proxy_pass http://:8083; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Scheme $scheme; + proxy_set_header X-Script-Name /calibre-web; + } + ``` + +# changelog +changelogs: + - { date: "25.01.21:", desc: "Add nightly tag"} + - { date: "19.01.21:", desc: "Add python3-pkg-resources"} + - { date: "13.01.21:", desc: "Rebase to Ubuntu Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf." } + - { date: "12.10.20:", desc: "Add libxi6"} + - { date: "12.07.20:", desc: "Add kepubify for arm64v8" } + - { date: "05.06.20:", desc: "Add kepubify for x86-64 and arm32v7" } + - { date: "06.05.20:", desc: "Add libxslt1.1 and update ImageMagick policy" } + - { date: "19.01.20:", desc: "Adding LDAP libs." } + - { date: "13.10.19:", desc: "Migrate to Python3." } + - { date: "01.08.19:", desc: "Add libxcomposite1." } + - { date: "13.06.19:", desc: "Add docker mod to enable optional ebook conversion on x86-64. Add unrar." } + - { date: "02.06.19:", desc: "Rebase to Ubuntu Bionic & add Gdrive support." } + - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } + - { date: "23.02.19:", desc: "Rebase to alpine 3.9, use repo version of imagemagick." } + - { date: "11.02.19:", desc: "Add pipeline logic and multi arch." } + - { date: "03.01.19:", desc: "Remove guest user from default app.db." } + - { date: "16.08.18:", desc: "Rebase to alpine 3.8." } + - { date: "03.07.18:", desc: "New build pushed, all versions below `67` have [vulnerability](https://github.com/janeczku/calibre-web/issues/534)." } + - { date: "05.01.18:", desc: "Deprecate cpu_core routine lack of scaling." } + - { date: "06.12.17:", desc: "Rebase to alpine 3.7." } + - { date: "27.11.17:", desc: "Use cpu core counting routine to speed up build time." } + - { date: "24.07.17:", desc: "Curl version for imagemagick." } + - { date: "17.07.17:", desc: "Initial release." } diff --git a/root/defaults/app.db b/root/defaults/app.db new file mode 100644 index 0000000000000000000000000000000000000000..752e6916ddd7769ac4e43dd8447d2394fb340fd4 GIT binary patch literal 81920 zcmeI)?Qh%09S3kyPAtieqNGV63|ku3ZD0#g5?g+VlNM_fTS<*NcIt-(0g5pv@?>$Q zNQI>Q02mmYY$&jo+aIu3d$$++XZB|lMc*vIHlY0-MM|VhEA3JYt@;%#TjD+N?sIqK z-9^ggXRC(CmAdUTnWxN37bIDh?kkEUN%!b^nVx6qIYQ4eJuX%18aNetqpP zOUyKC4!`-7*FHM)+o{UYR)Zf^tfOV_94#CCXqmb6+B&Kl{*#Lr^mdsy>FN6Kn*MLM z__=%Ia^V}()|lC_T~Gd_sk7G4s9{l62tWV=5P$##AOHafKmY;|fB*y_009U<00Izz z00bZa0SG_<0uX?}unW)!9sKY1i|_g40Rad=00Izz00bZa0SG_<0uX?}kO_3Y|NmOb zzaFxRp*j$N00bZa0SG_<0uX=z1Rwwb2&CmR(xvS6Ti3<eAb|Bhx&j0s009U<00Izz z00bZa0SG`~_yw^3AO1E*4Iuyl2tWV=5P$##AOHafKmY<`f&kzDM@N7F1Rwwb2tWV= z5P$##AOHaf47C9M{eP&N7nOqm1Rwwb2tWV=5P$##AOHaf_ySn}qa#270uX=z1Rwwb z2tWV=5P$##hF<{d|KV?A)DQv?fB*y_009U<00Izz00bZ)*8i#ej+Fm`e&GQD2tWV= z5P$##AOHafKmY;|fWX@byqg-A3RmS^?qc>*_EDR=o@L+XO=g%1x0q?}%jcv*E_M7U zcQJJ-%k-vUNq=qCcJ+Gsp4(vM`GtG))AaaY?NFP3yuZBtfyVjWxjSVxT`y1b^88(1 zXKeOPeX(9&m}a%IUeo8w3yXJV7N=*+<%RO>oOXA%L9x2Yh~LI45~fB*y_009U<00Izz00bcLBN51s6l8z%A(a^^baoj!>;JE$ z{D1Rb{YXlQVn6@_5P$##AOHafKmY;|fB*y_@OA>{My|@?Cl691Be|^j{Qt<=Gt${J zdHekD-!5~ch5!U0@KY1`^MRZ$T)is)ZOLOble^sW3~R>?|E88Us+Fy(vQ>GoT2;cM z%G6la(3O?7t?HxdhO)N4rL1kQu9lRstoT@$>T+j~JIZe=8%v*5HoAvfw&R6~x(C}X zS6$asHXm13S1HGCfNAd-*2z4W>+ai*ej=dm*v;rc&9>^sj;b-!s5xBKjaYet(EbvI ziMZp{4U;G2x62Pt2?@`%&ugk@c!{ZNw!Q1BE$*l-w!@Rq>2_1~<0S=irmLE5 zwwqQ$sDD<~;XC{wq2%PLntYGPse|*jTc*u)YWY|@1cA)5t(s%+yF4kh)vlR_CQh3a zs?%rl+NP&EHi1OjILJE;cN_M8Qh2AbuIkyUv18dzQk#e_v}4;lCN;BT>~ZD6`ub|M zvL?DxaGGeaTDMI--aV6I?K4kns9J+rJKUw}xh>lwfk>wgQaQY7dtB}G*OR9XN~b&2 zc5ZUfI$W1eA02KMuSk+r>s?YL@_9Xt8S zl_Z zyLoiuO-}YoP9Hh7_rFt2>TRB5XdXrG41mEE2};n3s_rqf-K)*Ol6?0Re(zSj!`5JW zU##WW2Zsa6Or5nXay2Cu|3!NNAq*ibXIxSLgM|(4Xi0GN_nMcWVqo5tmvV~bc+ zNUw2P0d?!N5K({CuKkW{be?1ayTvVGF|Zu%md-pbuALUAwhbo=38UGeJCZ{VexK=F zL)8XdDXAQ%G=x8j=z1JY7o_kzX=1^~vQIWv9#=M=DW6uKDN}}C6j!ySPpV6wDpSD) zNHjmQ%r~)yXX&!7~~pU{(CXUipR}Sf9mz>ra$!(*WM;`cEi8v*wiaL zI$-MMH(qaACMqaWsqsT~+o9V;*tp8l`s%8f;7zQpFI6_H6JaV*lKz`f65+%3jq1vy zHNiR+6riYVR3BD1s%uNtO+_5@y{W$E&!!94ugk}DsidhUO&AQi%K3ML=Q0j;7M(3l`n_Z_?0KSA{iPo(<}xj5eDq@}|KR+ea&zat9{=~aGFBS>IP>?+tIWGU zwV6E13jqi~00RFffmffOPZzFSk-zw*e?Jpqaj>EkNxfmnvNE2cl;ZF*{9u2|}PWiFVNP0f_2i>3IgI-Hn>sY<(srPG?r|EgUq zoj9F;F!$@LMsI#rd~$KLaN~yj ztg|on!Zc`&@6tq^TeP~2zr7r5^1i?+(U2udSKmj$h=`g~>_z)q8$_u*Gi0lVAZGdviY4 z7baq1bR9T#N7F3b9YPVNdZ&Fk9@i(Ya17C}Me-TtED{Sw|bRGB#S+zJ1!&CRoyno=w}WyWCP|P8=G4xtUEDZr_&w zuGJlN%tscl3(n7vz6wmu^X;4Rbu7Nf)kNlV9HTRdsvc68rIP_eD0Q z*gZTzFJW9IxV>o@4eV_+jy_DM3x$IGveO&rLl uzVzbX|KKSv0uX=z1Rwwb2tWV=5P$##AOL}(63ECSS7fo7kop!hptcVH literal 0 HcmV?d00001 diff --git a/root/defaults/policy.xml b/root/defaults/policy.xml new file mode 100644 index 000000000..5ec3385c0 --- /dev/null +++ b/root/defaults/policy.xml @@ -0,0 +1,80 @@ + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config new file mode 100644 index 000000000..384f5cba3 --- /dev/null +++ b/root/etc/cont-init.d/30-config @@ -0,0 +1,49 @@ +#!/usr/bin/with-contenv bash + +# create symlinks for imagemagick policy.xml +[[ -f /etc/ImageMagick-6/policy.xml ]] && \ + rm /etc/ImageMagick-6/policy.xml +[[ ! -L /etc/ImageMagick-6/policy.xml ]] && \ + ln -s /defaults/policy.xml /etc/ImageMagick-6/policy.xml + +# create symlinks for database and log +[[ ! -f /config/app.db ]] && \ + cp /defaults/app.db /config/app.db +[[ -f /app/calibre-web/app.db ]] && \ + rm /app/calibre-web/app.db +[[ ! -L /app/calibre-web/app.db ]] && \ + ln -s /config/app.db /app/calibre-web/app.db + +# create symlinks for log +[[ ! -f /config/calibre-web.log ]] && \ + touch /config/calibre-web.log +[[ -f /app/calibre-web/calibre-web.log ]] && \ + rm /app/calibre-web/calibre-web.log +[[ ! -L /app/calibre-web/calibre-web.log ]] && \ + ln -s /config/calibre-web.log /app/calibre-web/calibre-web.log + +# create Google drive client_secrets.json file +[[ ! -f /config/client_secrets.json ]] && \ + echo "{}" > /config/client_secrets.json +[[ -f /app/calibre-web/client_secrets.json ]] && + rm /app/calibre-web/client_secrets.json +[[ ! -L /app/calibre-web/client_secrets.json ]] && + ln -s /config/client_secrets.json /app/calibre-web/client_secrets.json + +# create Google drive symlinks for database +[[ ! -f /config/gdrive.db ]] && \ + cp /app/calibre-web/gdrive.db /config/gdrive.db +[[ -f /app/calibre-web/gdrive.db ]] && \ + rm /app/calibre-web/gdrive.db +[[ ! -L /app/calibre-web/gdrive.db ]] && \ + ln -s /config/gdrive.db /app/calibre-web/gdrive.db + +# check if kepubify is present and if so make executable +[[ -f /usr/bin/kepubify ]] && \ +[[ ! -x /usr/bin/kepubify ]] && \ + chmod +x /usr/bin/kepubify + +# permissions +chown -R abc:abc \ + /config \ + /app/calibre-web diff --git a/root/etc/services.d/calibre-web/run b/root/etc/services.d/calibre-web/run new file mode 100644 index 000000000..228e498fc --- /dev/null +++ b/root/etc/services.d/calibre-web/run @@ -0,0 +1,6 @@ +#!/usr/bin/with-contenv bash + +cd /app/calibre-web || exit + +exec \ + s6-setuidgid abc python3 /app/calibre-web/cps.py From e8a887da2d338e30edc578ba6efffb29469d05ae Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 26 Jan 2021 10:19:11 +0000 Subject: [PATCH 003/248] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 package_versions.txt diff --git a/package_versions.txt b/package_versions.txt old mode 100644 new mode 100755 index ad814d3ec..21661b991 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ adduser3.118ubuntu2 -apt2.0.2ubuntu0.2 -apt-utils2.0.2ubuntu0.2 +apt2.0.4 +apt-utils2.0.4 base-files11ubuntu5.2 base-passwd3.5.47 bash5.0-6ubuntu1.1 @@ -50,7 +50,7 @@ init-system-helpers1.57 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 libapparmor12.13.3-7ubuntu5.1 -libapt-pkg6.02.0.2ubuntu0.2 +libapt-pkg6.02.0.4 libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 libassuan02.5.3-7ubuntu2 libattr11:2.4.48-5 From 45a2acd80803d3ea3e8a126f719f64fe0aa83726 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 27 Jan 2021 19:41:05 +0000 Subject: [PATCH 004/248] 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 21661b991..e95e478e1 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -63,7 +63,7 @@ libblkid12.34-0.1ubuntu9.1 libbrotli11.0.7-6ubuntu0.1 libbsd00.10.0-1 libbz2-1.01.0.8-2 -libc62.31-0ubuntu9.1 +libc62.31-0ubuntu9.2 libcairo21.16.0-4ubuntu1 libcap-ng00.7.9-2.1build1 libc-bin2.31-0ubuntu9.1 From a953a0aeb16aa8ab287102ca29cf286038d2e2d7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 28 Jan 2021 20:01:51 +0000 Subject: [PATCH 005/248] 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 e95e478e1..c417ef406 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -87,8 +87,8 @@ libfreetype62.10.1-2ubuntu0.1 libfribidi01.0.8-2 libgcc-s110.2.0-5ubuntu1~20.04 libgcrypt201.8.5-5ubuntu1 -libglib2.0-02.64.3-1~ubuntu20.04.1 -libglib2.0-data2.64.3-1~ubuntu20.04.1 +libglib2.0-02.64.6-1~ubuntu20.04.1 +libglib2.0-data2.64.6-1~ubuntu20.04.1 libgmp102:6.2.0+dfsg-4 libgnutls303.6.13-2ubuntu1.3 libgomp110.2.0-5ubuntu1~20.04 From dfdbf024f592fef3eba47879ec671a2a83d9dc2d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 30 Jan 2021 14:23:07 +0000 Subject: [PATCH 006/248] 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 c417ef406..16c2acd91 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -206,7 +206,7 @@ libxml22.9.10+dfsg-5 libxrender11:0.9.10-1 libxslt1.11.1.34-4 libzstd11.4.4+dfsg-3 -locales2.31-0ubuntu9.1 +locales2.31-0ubuntu9.2 login1:4.8.1-1ubuntu5.20.04 logsave1.45.5-2ubuntu1 lsb-base11.1.0ubuntu2 @@ -234,7 +234,7 @@ sensible-utils0.0.12+nmu1 shared-mime-info1.15-1 sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.1 -tzdata2020f-0ubuntu0.20.04.1 +tzdata2021a-0ubuntu0.20.04 ubuntu-keyring2020.02.11.2 ucf3.0038+nmu1 unrar1:5.6.6-2build1 From ae9a3d744b57f21c32ef1547e3ca5e9ebd694e78 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 2 Feb 2021 10:19:35 +0000 Subject: [PATCH 007/248] 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 16c2acd91..852f52bb0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ adduser3.118ubuntu2 apt2.0.4 apt-utils2.0.4 -base-files11ubuntu5.2 +base-files11ubuntu5.3 base-passwd3.5.47 bash5.0-6ubuntu1.1 bsdutils1:2.34-0.1ubuntu9.1 @@ -66,7 +66,7 @@ libbz2-1.01.0.8-2 libc62.31-0ubuntu9.2 libcairo21.16.0-4ubuntu1 libcap-ng00.7.9-2.1build1 -libc-bin2.31-0ubuntu9.1 +libc-bin2.31-0ubuntu9.2 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 libcups22.3.1-9ubuntu1.1 From 116b94741b0ec64f1b0ce21929ee4b5d265a9280 Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 8 Feb 2021 21:35:27 -0500 Subject: [PATCH 008/248] add rustc for py crypto --- Dockerfile.armhf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index b1373e462..fc8c74c7d 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -22,6 +22,7 @@ RUN \ libxml2-dev \ libxslt1-dev \ python3-pip \ + rustc \ zlib1g-dev && \ echo "**** install runtime packages ****" && \ apt-get install -y \ @@ -74,6 +75,7 @@ RUN \ libxml2-dev \ libxslt1-dev \ python3-pip \ + rustc \ zlib1g-dev && \ apt-get -y autoremove && \ rm -rf \ From ed4d5aa3e18b86dd5e276dfe6f566ee17ed9d951 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 9 Feb 2021 06:13:21 -0500 Subject: [PATCH 009/248] 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 852f52bb0..6e4af2e89 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ base-passwd3.5.47 bash5.0-6ubuntu1.1 bsdutils1:2.34-0.1ubuntu9.1 bzip21.0.8-2 -ca-certificates20201027ubuntu0.20.04.1 +ca-certificates20210119~20.04.1 coreutils8.30-3ubuntu2 curl7.68.0-1ubuntu2.4 dash0.5.10.2-6 @@ -120,8 +120,8 @@ libkrb5-31.17-6ubuntu4.1 libkrb5support01.17-6ubuntu4.1 libksba81.3.5-2 liblcms2-22.9-4 -libldap-2.4-22.4.49+dfsg-2ubuntu1.5 -libldap-common2.4.49+dfsg-2ubuntu1.5 +libldap-2.4-22.4.49+dfsg-2ubuntu1.6 +libldap-common2.4.49+dfsg-2ubuntu1.6 liblqr-1-00.4.2-2.1 libltdl72.4.6-14 liblz4-11.9.2-2 From 077aa54605ac300701a07c001600756c12cc6874 Mon Sep 17 00:00:00 2001 From: chbmb Date: Wed, 10 Feb 2021 20:44:10 +0000 Subject: [PATCH 010/248] Add libxrandr2 Necessary to convert to pdf --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + readme-vars.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 348727f08..3d7d1ad02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,6 +24,7 @@ RUN \ libxslt1.1 \ libldap-2.4-2 \ libsasl2-2 \ + libxrandr2 \ python3-minimal \ python3-pkg-resources \ unrar && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8e8df8f31..430346dba 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -30,6 +30,7 @@ RUN \ libsasl2-2 \ libxcomposite1 \ libxi6 \ + libxrandr2 \ libxslt1.1 \ python3-minimal \ python3-pkg-resources \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index fc8c74c7d..b76e3a666 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -32,6 +32,7 @@ RUN \ libsasl2-2 \ libxcomposite1 \ libxi6 \ + libxrandr2 \ libxslt1.1 \ python3-minimal \ python3-pkg-resources \ diff --git a/readme-vars.yml b/readme-vars.yml index 5c7830a1d..937797417 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -77,6 +77,7 @@ app_setup_block: | # changelog changelogs: + - { date: "10.02.21:", desc: "Add libxrandr2"} - { date: "25.01.21:", desc: "Add nightly tag"} - { date: "19.01.21:", desc: "Add python3-pkg-resources"} - { date: "13.01.21:", desc: "Rebase to Ubuntu Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf." } From 835896ab5feae8e5bc230e685717c444bf2d859d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 10 Feb 2021 19:17:11 -0500 Subject: [PATCH 011/248] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c17d1a9f4..bd0e9298e 100644 --- a/README.md +++ b/README.md @@ -260,6 +260,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **10.02.21:** - Add libxrandr2 * **25.01.21:** - Add nightly tag * **19.01.21:** - Add python3-pkg-resources * **13.01.21:** - Rebase to Ubuntu Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf. From 8b510ae4fd6e2975ca5cb00e4052ce28a001ca77 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 10 Feb 2021 20:52:03 -0500 Subject: [PATCH 012/248] Bot Updating Package Versions --- package_versions.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/package_versions.txt b/package_versions.txt index 6e4af2e89..6d5f559f1 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -203,6 +203,7 @@ libxdmcp61:1.1.3-0ubuntu1 libxext62:1.3.4-0ubuntu1 libxi62:1.7.10-0ubuntu1 libxml22.9.10+dfsg-5 +libxrandr22:1.5.2-0ubuntu1 libxrender11:0.9.10-1 libxslt1.11.1.34-4 libzstd11.4.4+dfsg-3 From 315b4d0bfc8c091b44a635eb75490e5c725a8c7b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 13 Feb 2021 09:00:30 -0500 Subject: [PATCH 013/248] Bot Updating Templated Files --- Jenkinsfile | 77 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 61 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4769640bb..dbe138630 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -241,10 +241,53 @@ pipeline { TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=nightly -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 nightly + 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" + for i in ${OLD_TEMPLATES}; do + if [[ -f "${i}" ]]; then + TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" + 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 nightly + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + for i in ${TEMPLATES_TO_DELETE}; do + git rm "${i}" + 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 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}" ]]; then + 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} @@ -252,11 +295,13 @@ pipeline { cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE - rm -f ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md cp --parents ${TEMPLATED_FILES} ${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 ${TEMPLATED_FILES} - git rm .github/ISSUE_TEMPLATE.md || : 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} @@ -265,8 +310,8 @@ pipeline { fi mkdir -p ${TEMPDIR}/gitbook git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/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}/gitbook/docker-documentation/images/ cd ${TEMPDIR}/gitbook/docker-documentation/ git add images/docker-${CONTAINER_NAME}.md git commit -m 'Bot Updating Documentation' @@ -276,13 +321,13 @@ pipeline { 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}-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}/${CONTAINER_NAME}.xml + 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}/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + 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 if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then echo "Image is on the ignore list, skipping Unraid template upload" else - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ cd ${TEMPDIR}/unraid/templates/ git add unraid/${CONTAINER_NAME}.xml git commit -m 'Bot Updating Unraid Template' @@ -522,7 +567,7 @@ pipeline { } sh '''#! /bin/bash set -e - docker pull ghcr.io/linuxserver/lsiodev-ci:latest + docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; 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} @@ -547,7 +592,7 @@ pipeline { -e WEB_PATH=\"${CI_WEBPATH}\" \ -e DO_REGION="ams3" \ -e DO_BUCKET="lsio-ci" \ - -t ghcr.io/linuxserver/lsiodev-ci:latest \ + -t ghcr.io/linuxserver/ci:latest \ python /ci/ci.py''' } } @@ -692,9 +737,9 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}" + echo "Pushing New tag for current commit ${META_TAG}" sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ - -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + -d '{"tag":"'${META_TAG}'",\ "object": "'${COMMIT_SHA}'",\ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to nightly",\ "type": "commit",\ @@ -702,9 +747,9 @@ pipeline { echo "Pushing New release for Tag" sh '''#! /bin/bash curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json - echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "nightly",\ - "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + "name": "'${META_TAG}'",\ "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start printf '","draft": false,"prerelease": true}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done @@ -731,7 +776,7 @@ pipeline { 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/lsiodev-readme-sync + docker pull ghcr.io/linuxserver/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ -e DOCKERHUB_PASSWORD=$DOCKERPASS \ @@ -739,7 +784,7 @@ pipeline { -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' + ghcr.io/linuxserver/readme-sync bash -c 'node sync' rm -Rf ${TEMPDIR} ''' } } From 1ef660d18dd998ba05bc78b48bf0bbf1f156945d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 13 Feb 2021 14:01:50 +0000 Subject: [PATCH 014/248] Bot Updating Templated Files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 96374c4e7..6e8ad9772 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ $RECYCLE.BIN/ Network Trash Folder Temporary Items .apdisk +.jenkins-external From 5f31ec5472cda472213cca7744c9839a1d9eaba6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 16 Feb 2021 05:14:59 -0500 Subject: [PATCH 015/248] 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 6d5f559f1..5b55ba5db 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,7 +14,7 @@ dbus1.12.16-2ubuntu2.1 debconf1.5.73 debianutils4.9.1 diffutils1:3.7-3 -dirmngr2.2.19-3ubuntu2 +dirmngr2.2.19-3ubuntu2.1 dpkg1.19.7ubuntu3 e2fsprogs1.45.5-2ubuntu1 fdisk2.34-0.1ubuntu9.1 @@ -28,16 +28,16 @@ fonts-noto-mono20200323-1build1~ubuntu20.04.1 fonts-urw-base3520170801.1-3 gcc-10-base10.2.0-5ubuntu1~20.04 ghostscript9.50~dfsg-5ubuntu4.2 -gnupg2.2.19-3ubuntu2 -gnupg-l10n2.2.19-3ubuntu2 -gnupg-utils2.2.19-3ubuntu2 -gpg2.2.19-3ubuntu2 -gpg-agent2.2.19-3ubuntu2 -gpgconf2.2.19-3ubuntu2 -gpgsm2.2.19-3ubuntu2 -gpgv2.2.19-3ubuntu2 -gpg-wks-client2.2.19-3ubuntu2 -gpg-wks-server2.2.19-3ubuntu2 +gnupg2.2.19-3ubuntu2.1 +gnupg-l10n2.2.19-3ubuntu2.1 +gnupg-utils2.2.19-3ubuntu2.1 +gpg2.2.19-3ubuntu2.1 +gpg-agent2.2.19-3ubuntu2.1 +gpgconf2.2.19-3ubuntu2.1 +gpgsm2.2.19-3ubuntu2.1 +gpgv2.2.19-3ubuntu2.1 +gpg-wks-client2.2.19-3ubuntu2.1 +gpg-wks-server2.2.19-3ubuntu2.1 grep3.4-1 gsfonts1:8.11+urwcyr1.0.7~pre44-4.4 gzip1.10-0ubuntu4 From bd1c63df9bdb9939e99c3b2ca84e4ec9a137ab42 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 23 Feb 2021 10:52:27 +0000 Subject: [PATCH 016/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5b55ba5db..4c246b544 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -120,8 +120,8 @@ libkrb5-31.17-6ubuntu4.1 libkrb5support01.17-6ubuntu4.1 libksba81.3.5-2 liblcms2-22.9-4 -libldap-2.4-22.4.49+dfsg-2ubuntu1.6 -libldap-common2.4.49+dfsg-2ubuntu1.6 +libldap-2.4-22.4.49+dfsg-2ubuntu1.7 +libldap-common2.4.49+dfsg-2ubuntu1.7 liblqr-1-00.4.2-2.1 libltdl72.4.6-14 liblz4-11.9.2-2 @@ -177,7 +177,7 @@ libsmartcols12.34-0.1ubuntu9.1 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 -libssl1.11.1.1f-1ubuntu2.1 +libssl1.11.1.1f-1ubuntu2.2 libstdc++610.2.0-5ubuntu1~20.04 libsystemd0245.4-4ubuntu3.4 libtasn1-64.16.0-2 @@ -217,7 +217,7 @@ mount2.34-0.1ubuntu9.1 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 netpbm2:10.0-15.3build1 -openssl1.1.1f-1ubuntu2.1 +openssl1.1.1f-1ubuntu2.2 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From e72fd23d0e53541055d494165fa91e2e6cb13d63 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 24 Feb 2021 10:54:48 -0500 Subject: [PATCH 017/248] fix up py cryptography builds, clean cache --- Dockerfile | 10 ++++++---- Dockerfile.aarch64 | 10 ++++++---- Dockerfile.armhf | 11 +++++++---- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d7d1ad02..2b35cc85f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,9 +42,10 @@ RUN \ /tmp/calibre-web.tar.gz -C \ /app/calibre-web --strip-components=1 && \ cd /app/calibre-web && \ - pip3 install --no-cache-dir -U -r \ - requirements.txt && \ - pip3 install --no-cache-dir -U -r \ + pip3 install --no-cache-dir -U \ + pip && \ + pip install --no-cache-dir -U -r \ + requirements.txt -r \ optional-requirements.txt && \ echo "***install kepubify" && \ if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ @@ -64,7 +65,8 @@ RUN \ rm -rf \ /tmp/* \ /var/lib/apt/lists/* \ - /var/tmp/* + /var/tmp/* \ + /root/.cache # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 430346dba..947e956c7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -49,9 +49,10 @@ RUN \ /tmp/calibre-web.tar.gz -C \ /app/calibre-web --strip-components=1 && \ cd /app/calibre-web && \ - pip3 install --no-cache-dir -U -r \ - requirements.txt && \ - pip3 install --no-cache-dir -U -r \ + pip3 install --no-cache-dir -U \ + pip && \ + pip install --no-cache-dir -U -r \ + requirements.txt -r \ optional-requirements.txt && \ echo "***install kepubify" && \ if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ @@ -78,7 +79,8 @@ RUN \ rm -rf \ /tmp/* \ /var/lib/apt/lists/* \ - /var/tmp/* + /var/tmp/* \ + /root/.cache # add local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index b76e3a666..d19bfad49 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -51,9 +51,10 @@ RUN \ /tmp/calibre-web.tar.gz -C \ /app/calibre-web --strip-components=1 && \ cd /app/calibre-web && \ - pip3 install --no-cache-dir -U -r \ - requirements.txt && \ - pip3 install --no-cache-dir -U -r \ + pip3 install --no-cache-dir -U \ + pip && \ + pip install --no-cache-dir -U -r \ + requirements.txt -r \ optional-requirements.txt && \ echo "***install kepubify" && \ if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ @@ -82,7 +83,9 @@ RUN \ rm -rf \ /tmp/* \ /var/lib/apt/lists/* \ - /var/tmp/* + /var/tmp/* \ + /root/.cache \ + /root/.cargo # add local files COPY root/ / From 86c162196a22ad5b39ca29bcb89d9a0072033302 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 27 Feb 2021 04:28:39 -0500 Subject: [PATCH 018/248] 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 4c246b544..be61763b7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -159,8 +159,8 @@ libpixman-1-00.38.4-0ubuntu1 libpng16-161.6.37-2 libprocps82:3.3.16-1ubuntu2 libpsl50.21.0-1ubuntu1 -libpython3.8-minimal3.8.5-1~20.04 -libpython3.8-stdlib3.8.5-1~20.04 +libpython3.8-minimal3.8.5-1~20.04.2 +libpython3.8-stdlib3.8.5-1~20.04.2 libpython3-stdlib3.8.2-0ubuntu2 libreadline88.0-4 libroken18-heimdal7.7.0+dfsg-1ubuntu1 @@ -183,7 +183,7 @@ libsystemd0245.4-4ubuntu3.4 libtasn1-64.16.0-2 libthai00.1.28-3 libthai-data0.1.28-3 -libtiff54.1.0+git191117-2build1 +libtiff54.1.0+git191117-2ubuntu0.20.04.1 libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.4 libunistring20.9.10-2 @@ -225,8 +225,8 @@ poppler-data0.4.9-2 procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 python33.8.2-0ubuntu2 -python3.83.8.5-1~20.04 -python3.8-minimal3.8.5-1~20.04 +python3.83.8.5-1~20.04.2 +python3.8-minimal3.8.5-1~20.04.2 python3-minimal3.8.2-0ubuntu2 python3-pkg-resources45.2.0-1 readline-common8.0-4 From b4dea3e0ea94762fc58696577739f2fa9e84dfad Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 9 Mar 2021 05:18:51 -0500 Subject: [PATCH 019/248] 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 be61763b7..b6077e001 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -87,8 +87,8 @@ libfreetype62.10.1-2ubuntu0.1 libfribidi01.0.8-2 libgcc-s110.2.0-5ubuntu1~20.04 libgcrypt201.8.5-5ubuntu1 -libglib2.0-02.64.6-1~ubuntu20.04.1 -libglib2.0-data2.64.6-1~ubuntu20.04.1 +libglib2.0-02.64.6-1~ubuntu20.04.2 +libglib2.0-data2.64.6-1~ubuntu20.04.2 libgmp102:6.2.0+dfsg-4 libgnutls303.6.13-2ubuntu1.3 libgomp110.2.0-5ubuntu1~20.04 @@ -206,7 +206,7 @@ libxml22.9.10+dfsg-5 libxrandr22:1.5.2-0ubuntu1 libxrender11:0.9.10-1 libxslt1.11.1.34-4 -libzstd11.4.4+dfsg-3 +libzstd11.4.4+dfsg-3ubuntu0.1 locales2.31-0ubuntu9.2 login1:4.8.1-1ubuntu5.20.04 logsave1.45.5-2ubuntu1 From 0093682a72f35c68c7a52da630d96bbb6ff7eb8c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 15 Mar 2021 16:28:02 -0400 Subject: [PATCH 020/248] 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 b6077e001..1ab939ab2 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -87,8 +87,8 @@ libfreetype62.10.1-2ubuntu0.1 libfribidi01.0.8-2 libgcc-s110.2.0-5ubuntu1~20.04 libgcrypt201.8.5-5ubuntu1 -libglib2.0-02.64.6-1~ubuntu20.04.2 -libglib2.0-data2.64.6-1~ubuntu20.04.2 +libglib2.0-02.64.6-1~ubuntu20.04.3 +libglib2.0-data2.64.6-1~ubuntu20.04.3 libgmp102:6.2.0+dfsg-4 libgnutls303.6.13-2ubuntu1.3 libgomp110.2.0-5ubuntu1~20.04 From c5017f7b0f6da6350baa7efb8cd24c514b859eae Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 30 Mar 2021 10:19:59 +0000 Subject: [PATCH 021/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1ab939ab2..fe7b0f350 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -177,15 +177,15 @@ libsmartcols12.34-0.1ubuntu9.1 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 -libssl1.11.1.1f-1ubuntu2.2 +libssl1.11.1.1f-1ubuntu2.3 libstdc++610.2.0-5ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.4 +libsystemd0245.4-4ubuntu3.5 libtasn1-64.16.0-2 libthai00.1.28-3 libthai-data0.1.28-3 libtiff54.1.0+git191117-2ubuntu0.20.04.1 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.4 +libudev1245.4-4ubuntu3.5 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwebp60.6.1-2 @@ -217,7 +217,7 @@ mount2.34-0.1ubuntu9.1 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 netpbm2:10.0-15.3build1 -openssl1.1.1f-1ubuntu2.2 +openssl1.1.1f-1ubuntu2.3 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From d2a0e1168aafbdfde8726bcc730a6a3ec88dc28c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 2 Apr 2021 07:39:40 +0000 Subject: [PATCH 022/248] 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 fe7b0f350..2a3e598b5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -141,7 +141,7 @@ libnghttp2-141.40.0-1build1 libnpth01.6-1 libnspr42:4.25-1 libnss32:3.49.1-1ubuntu1.5 -libopenexr242.3.0-6ubuntu0.3 +libopenexr242.3.0-6ubuntu0.5 libopenjp2-72.3.1-1ubuntu4.20.04.1 libp11-kit00.23.20-1ubuntu0.1 libpam0g1.3.1-5ubuntu4.1 From 1ed06b0e8f7f274ab691e89daa20941031ce51d8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 6 Apr 2021 12:00:44 +0100 Subject: [PATCH 023/248] 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 2a3e598b5..acf2f1b56 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bsdutils1:2.34-0.1ubuntu9.1 bzip21.0.8-2 ca-certificates20210119~20.04.1 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.4 +curl7.68.0-1ubuntu2.5 dash0.5.10.2-6 dbus1.12.16-2ubuntu2.1 debconf1.5.73 @@ -70,7 +70,7 @@ libc-bin2.31-0ubuntu9.2 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 libcups22.3.1-9ubuntu1.1 -libcurl47.68.0-1ubuntu2.4 +libcurl47.68.0-1ubuntu2.5 libdatrie10.2.12-3 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdbus-1-31.12.16-2ubuntu2.1 @@ -236,7 +236,7 @@ shared-mime-info1.15-1 sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.1 tzdata2021a-0ubuntu0.20.04 -ubuntu-keyring2020.02.11.2 +ubuntu-keyring2020.02.11.4 ucf3.0038+nmu1 unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.1 From d319d62d710c3c13f173dc85ece6eae0c09364af Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 13 Apr 2021 12:01:14 +0100 Subject: [PATCH 024/248] 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 acf2f1b56..6af56ef6c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ adduser3.118ubuntu2 -apt2.0.4 -apt-utils2.0.4 +apt2.0.5 +apt-utils2.0.5 base-files11ubuntu5.3 base-passwd3.5.47 bash5.0-6ubuntu1.1 @@ -50,7 +50,7 @@ init-system-helpers1.57 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 libapparmor12.13.3-7ubuntu5.1 -libapt-pkg6.02.0.4 +libapt-pkg6.02.0.5 libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 libassuan02.5.3-7ubuntu2 libattr11:2.4.48-5 @@ -179,13 +179,13 @@ libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 libssl1.11.1.1f-1ubuntu2.3 libstdc++610.2.0-5ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.5 +libsystemd0245.4-4ubuntu3.6 libtasn1-64.16.0-2 libthai00.1.28-3 libthai-data0.1.28-3 libtiff54.1.0+git191117-2ubuntu0.20.04.1 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.5 +libudev1245.4-4ubuntu3.6 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwebp60.6.1-2 From 88c57cfb0dcc65d458e032e19b91acb51552fd4f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 15 Apr 2021 17:34:32 +0000 Subject: [PATCH 025/248] Bot Updating Templated Files --- Jenkinsfile | 92 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dbe138630..e241486f7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,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 ./.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/greetings.yml ./.github/workflows/stale.yml ./.github/workflows/package_trigger.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.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' } script{ env.LS_RELEASE_NUMBER = sh( @@ -106,7 +106,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq -r '. | .sha' | cut -c1-8 ''', + script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq -r '. | .sha' | cut -c1-8 ''', returnStdout: true).trim() } } @@ -317,22 +317,24 @@ pipeline { 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 + 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}-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 + 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 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, skipping Unraid template upload" + echo "Image is on the ignore list, removing Unraid template" + git rm unraid/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Removing Deprecated Unraid Template' || : else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - cd ${TEMPDIR}/unraid/templates/ git add unraid/${CONTAINER_NAME}.xml git commit -m 'Bot Updating Unraid Template' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all fi + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all fi rm -Rf ${TEMPDIR}''' script{ @@ -389,8 +391,21 @@ pipeline { } steps { echo "Running on node: ${NODE_NAME}" - sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-calibre-web/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-calibre-web\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-calibre-web\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Calibre-web\" \ + --label \"org.opencontainers.image.description=[Calibre-web](https://github.com/janeczku/calibre-web) is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself. This software is a fork of library and licensed under the GPL v3 License. \" \ + --no-cache --pull -t ${IMAGE}:${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } // Build MultiArch Docker containers for push to LS Repo @@ -403,8 +418,21 @@ pipeline { stage('Build X86') { steps { echo "Running on node: ${NODE_NAME}" - sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-calibre-web/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-calibre-web\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-calibre-web\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Calibre-web\" \ + --label \"org.opencontainers.image.description=[Calibre-web](https://github.com/janeczku/calibre-web) is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself. This software is a fork of library and licensed under the GPL v3 License. \" \ + --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } stage('Build ARMHF') { @@ -417,8 +445,21 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-calibre-web/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-calibre-web\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-calibre-web\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Calibre-web\" \ + --label \"org.opencontainers.image.description=[Calibre-web](https://github.com/janeczku/calibre-web) is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself. This software is a fork of library and licensed under the GPL v3 License. \" \ + --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -438,8 +479,21 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-calibre-web/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-calibre-web\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-calibre-web\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Calibre-web\" \ + --label \"org.opencontainers.image.description=[Calibre-web](https://github.com/janeczku/calibre-web) is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself. This software is a fork of library and licensed under the GPL v3 License. \" \ + --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -746,11 +800,11 @@ pipeline { "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash - curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json + curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_RELEASE_CLEAN} | jq '.commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "nightly",\ "name": "'${META_TAG}'",\ - "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start + "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start printf '","draft": false,"prerelease": true}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' @@ -775,7 +829,7 @@ pipeline { 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 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 \ From 31070e4cc0f14b94cac1c9532aafab6e60de737b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 15 Apr 2021 18:35:59 +0100 Subject: [PATCH 026/248] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 11 ++-- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/greetings.yml | 4 +- README.md | 98 +++++++++++++++++--------------- 4 files changed, 60 insertions(+), 55 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 3dea55a20..601f202aa 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -24,7 +24,7 @@ ## Readme If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit. -Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-calibre-web/edit/master/readme-vars.yml). +Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-calibre-web/edit/nightly/readme-vars.yml). These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play. Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-calibre-web) @@ -96,7 +96,7 @@ If you are proposing additional packages to be added, ensure that you added the ### Testing your changes -``` +```bash git clone https://github.com/linuxserver/docker-calibre-web.git cd docker-calibre-web docker build \ @@ -106,15 +106,16 @@ docker build \ ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` -``` + +```bash docker run --rm --privileged multiarch/qemu-user-static:register --reset ``` Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. -## Update the chagelog +## Update the changelog -If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-calibre-web/tree/master/root), add an entry to the changelog +If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-calibre-web/tree/nightly/root), add an entry to the changelog ```yml changelogs: diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index dec28f35d..a85cabf8a 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -21,7 +21,7 @@ ------------------------------ - - [ ] I have read the [contributing](https://github.com/linuxserver/docker-calibre-web/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications + - [ ] I have read the [contributing](https://github.com/linuxserver/docker-calibre-web/blob/nightly/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications ------------------------------ diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 17e3bc054..862e3943e 100644 --- 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-calibre-web/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-calibre-web/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!' - pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-calibre-web/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-calibre-web/blob/nightly/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-calibre-web/blob/nightly/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!' + pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-calibre-web/blob/nightly/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index bd0e9298e..3304540a8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ - + [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) @@ -12,13 +12,14 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring: - * regular and timely application updates - * easy user mappings (PGID, PUID) - * custom base image with s6 overlay - * weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth - * regular security updates +* regular and timely application updates +* easy user mappings (PGID, PUID) +* custom base image with s6 overlay +* weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth +* regular security updates Find us at: + * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. * [Discourse](https://discourse.linuxserver.io) - post on our community forum. @@ -42,7 +43,6 @@ Find us at: This software is a fork of library and licensed under the GPL v3 License. - [![calibre-web](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/calibre-web-icon.png)](https://github.com/janeczku/calibre-web) ## Supported Architectures @@ -68,6 +68,35 @@ This image provides various versions that are available via tags. `latest` tag u | latest | Releases of Calibre-Web | | nightly | Commits to the master branch of Calibre-Web | +## Application Setup + +Webui can be found at `http://your-ip:8083` + +On the initial setup screen, enter `/books` as your calibre library location. + +**Default admin login:** +*Username:* admin +*Password:* admin123 + +Unrar is included by default and needs to be set in the Calibre-Web admin page (Basic Configuration:External Binaries) with a path of `/usr/bin/unrar` + +**x86-64 only** We have implemented the optional ability to pull in the dependencies to enable ebook conversion utilising Calibre, this means if you don't require this feature the container isn't uneccessarily bloated but should you require it, it is easily available. +This optional layer will be rebuilt automatically on our CI pipeline upon new Calibre releases so you can stay up to date. +To use this option add the optional environmental variable as detailed above to pull an addition docker layer to enable ebook conversion and then in the Calibre-Web admin page (Basic Configuration:External Binaries) set the **Path to Calibre E-Book Converter** to `/usr/bin/ebook-convert` + +This image contains the [kepubify](https://pgaskin.net/kepubify/) ebook conversion tool (MIT License) to convert epub to kepub. In the Calibre-Web admin page (Basic Configuration:External Binaries) set the **Path to Kepubify E-Book Converter** to `/usr/bin/kepubify` + +To reverse proxy with our Letsencrypt docker container we include a preconfigured reverse proxy config, for other instances of Nginx use the following location block: +``` + location /calibre-web { + proxy_pass http://:8083; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Scheme $scheme; + proxy_set_header X-Script-Name /calibre-web; + } +``` + ## Usage Here are some example snippets to help you get started creating a container. @@ -98,7 +127,7 @@ services: ### docker cli -``` +```bash docker run -d \ --name=calibre-web \ -e PUID=1000 \ @@ -112,7 +141,6 @@ docker run -d \ ghcr.io/linuxserver/calibre-web ``` - ## Parameters Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `:` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. @@ -133,7 +161,7 @@ You can set any environment variable from a file by using a special prepend `FIL As an example: -``` +```bash -e FILE__PASSWORD=/run/secrets/mysecretpassword ``` @@ -152,49 +180,17 @@ Ensure any volume directories on the host are owned by the same user you specify In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below: -``` +```bash $ id username uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup) ``` - -  -## Application Setup - -Webui can be found at `http://your-ip:8083` - -On the initial setup screen, enter `/books` as your calibre library location. - -**Default admin login:** -*Username:* admin -*Password:* admin123 - -Unrar is included by default and needs to be set in the Calibre-Web admin page (Basic Configuration:External Binaries) with a path of `/usr/bin/unrar` - -**x86-64 only** We have implemented the optional ability to pull in the dependencies to enable ebook conversion utilising Calibre, this means if you don't require this feature the container isn't uneccessarily bloated but should you require it, it is easily available. -This optional layer will be rebuilt automatically on our CI pipeline upon new Calibre releases so you can stay up to date. -To use this option add the optional environmental variable as detailed above to pull an addition docker layer to enable ebook conversion and then in the Calibre-Web admin page (Basic Configuration:External Binaries) set the **Path to Calibre E-Book Converter** to `/usr/bin/ebook-convert` - -This image contains the [kepubify](https://pgaskin.net/kepubify/) ebook conversion tool (MIT License) to convert epub to kepub. In the Calibre-Web admin page (Basic Configuration:External Binaries) set the **Path to Kepubify E-Book Converter** to `/usr/bin/kepubify` - -To reverse proxy with our Letsencrypt docker container we include a preconfigured reverse proxy config, for other instances of Nginx use the following location block: -``` - location /calibre-web { - proxy_pass http://:8083; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Scheme $scheme; - proxy_set_header X-Script-Name /calibre-web; - } -``` - - ## Docker Mods + [![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=calibre-web&query=%24.mods%5B%27calibre-web%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=calibre-web "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.") We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above. - ## Support Info * Shell access whilst the container is running: `docker exec -it calibre-web /bin/bash` @@ -211,6 +207,7 @@ Most of our images are static, versioned, and require an image update and contai Below are the instructions for updating containers: ### Via Docker Compose + * Update all images: `docker-compose pull` * or update a single image: `docker-compose pull calibre-web` * Let compose update all containers as necessary: `docker-compose up -d` @@ -218,6 +215,7 @@ Below are the instructions for updating containers: * You can also remove the old dangling images: `docker image prune` ### Via Docker Run + * Update the image: `docker pull ghcr.io/linuxserver/calibre-web` * Stop the running container: `docker stop calibre-web` * Delete the container: `docker rm calibre-web` @@ -225,24 +223,29 @@ Below are the instructions for updating containers: * You can also remove the old dangling images: `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 calibre-web ``` + * You can also remove the old dangling images: `docker image prune` **Note:** 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) + * We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. ## Building locally If you want to make local modifications to these images for development purposes or just to customize the logic: -``` + +```bash git clone https://github.com/linuxserver/docker-calibre-web.git cd docker-calibre-web docker build \ @@ -252,7 +255,8 @@ docker build \ ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` -``` + +```bash docker run --rm --privileged multiarch/qemu-user-static:register --reset ``` From fc4d63f02c08f4c64d81f5ae4b589be666b473f0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 20 Apr 2021 11:18:54 +0100 Subject: [PATCH 027/248] 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 6af56ef6c..ad0633998 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -102,7 +102,7 @@ libharfbuzz0b2.6.4-1ubuntu4 libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1 libheimbase1-heimdal7.7.0+dfsg-1ubuntu1 libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 -libhogweed53.5.1+really3.5.1-2 +libhogweed53.5.1+really3.5.1-2ubuntu0.1 libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 libicu6666.1-2ubuntu2 libidn111.33-2.2ubuntu2 @@ -136,7 +136,7 @@ libmpdec22.4.2-3 libncurses66.2-0ubuntu2 libncursesw66.2-0ubuntu2 libnetpbm102:10.0-15.3build1 -libnettle73.5.1+really3.5.1-2 +libnettle73.5.1+really3.5.1-2ubuntu0.1 libnghttp2-141.40.0-1build1 libnpth01.6-1 libnspr42:4.25-1 @@ -157,7 +157,7 @@ libpcre2-8-010.34-7 libpcre32:8.39-12build1 libpixman-1-00.38.4-0ubuntu1 libpng16-161.6.37-2 -libprocps82:3.3.16-1ubuntu2 +libprocps82:3.3.16-1ubuntu2.1 libpsl50.21.0-1ubuntu1 libpython3.8-minimal3.8.5-1~20.04.2 libpython3.8-stdlib3.8.5-1~20.04.2 @@ -168,7 +168,7 @@ librtmp12.4+20151223.gitfa8646d.1-2build1 libsasl2-22.1.27+dfsg-2 libsasl2-modules2.1.27+dfsg-2 libsasl2-modules-db2.1.27+dfsg-2 -libseccomp22.4.3-1ubuntu3.20.04.3 +libseccomp22.5.1-1ubuntu1~20.04.1 libselinux13.0-1build2 libsemanage13.0-1build2 libsemanage-common3.0-1build2 @@ -222,7 +222,7 @@ passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 poppler-data0.4.9-2 -procps2:3.3.16-1ubuntu2 +procps2:3.3.16-1ubuntu2.1 publicsuffix20200303.0012-1 python33.8.2-0ubuntu2 python3.83.8.5-1~20.04.2 From a7a5453c56838feebafe0abd17b86d8629b314e8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 26 Apr 2021 18:53:48 +0000 Subject: [PATCH 028/248] 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 ad0633998..b0a49b3a3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -63,7 +63,7 @@ libblkid12.34-0.1ubuntu9.1 libbrotli11.0.7-6ubuntu0.1 libbsd00.10.0-1 libbz2-1.01.0.8-2 -libc62.31-0ubuntu9.2 +libc62.31-0ubuntu9.3 libcairo21.16.0-4ubuntu1 libcap-ng00.7.9-2.1build1 libc-bin2.31-0ubuntu9.2 @@ -120,7 +120,7 @@ libkrb5-31.17-6ubuntu4.1 libkrb5support01.17-6ubuntu4.1 libksba81.3.5-2 liblcms2-22.9-4 -libldap-2.4-22.4.49+dfsg-2ubuntu1.7 +libldap-2.4-22.4.49+dfsg-2ubuntu1.8 libldap-common2.4.49+dfsg-2ubuntu1.7 liblqr-1-00.4.2-2.1 libltdl72.4.6-14 From 0ef5a2cbdf2cc38f062c4f3ddb972c761d692638 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 27 Apr 2021 11:19:31 +0100 Subject: [PATCH 029/248] 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 b0a49b3a3..e86e92997 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -121,7 +121,7 @@ libkrb5support01.17-6ubuntu4.1 libksba81.3.5-2 liblcms2-22.9-4 libldap-2.4-22.4.49+dfsg-2ubuntu1.8 -libldap-common2.4.49+dfsg-2ubuntu1.7 +libldap-common2.4.49+dfsg-2ubuntu1.8 liblqr-1-00.4.2-2.1 libltdl72.4.6-14 liblz4-11.9.2-2 @@ -207,7 +207,7 @@ libxrandr22:1.5.2-0ubuntu1 libxrender11:0.9.10-1 libxslt1.11.1.34-4 libzstd11.4.4+dfsg-3ubuntu0.1 -locales2.31-0ubuntu9.2 +locales2.31-0ubuntu9.3 login1:4.8.1-1ubuntu5.20.04 logsave1.45.5-2ubuntu1 lsb-base11.1.0ubuntu2 From 71e22794a749f237850082e48a9f0063fc3d77b0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 28 Apr 2021 21:27:35 +0100 Subject: [PATCH 030/248] 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 e86e92997..2f18ec9c3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -63,7 +63,7 @@ libblkid12.34-0.1ubuntu9.1 libbrotli11.0.7-6ubuntu0.1 libbsd00.10.0-1 libbz2-1.01.0.8-2 -libc62.31-0ubuntu9.3 +libc62.31-0ubuntu9.2 libcairo21.16.0-4ubuntu1 libcap-ng00.7.9-2.1build1 libc-bin2.31-0ubuntu9.2 From b910aec0a5dd22c213dcfd88e7191debe1c5f00f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 4 May 2021 06:18:05 -0400 Subject: [PATCH 031/248] 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 2f18ec9c3..41de67066 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -207,7 +207,7 @@ libxrandr22:1.5.2-0ubuntu1 libxrender11:0.9.10-1 libxslt1.11.1.34-4 libzstd11.4.4+dfsg-3ubuntu0.1 -locales2.31-0ubuntu9.3 +locales2.31-0ubuntu9.2 login1:4.8.1-1ubuntu5.20.04 logsave1.45.5-2ubuntu1 lsb-base11.1.0ubuntu2 From b6c0675041ac7a36f6774f661df279beb17dd599 Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 17 May 2021 16:02:08 -0400 Subject: [PATCH 032/248] update formatting, add lsio wheel index --- Dockerfile | 116 ++++++++++----------- Dockerfile.aarch64 | 144 +++++++++++++------------- Dockerfile.armhf | 152 ++++++++++++++-------------- root/etc/cont-init.d/30-config | 34 +++---- root/etc/services.d/calibre-web/run | 2 +- 5 files changed, 224 insertions(+), 224 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2b35cc85f..0c7642ce4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,65 +8,65 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="chbmb" RUN \ - echo "**** install build packages ****" && \ - apt-get update && \ - apt-get install -y \ - git \ - libldap2-dev \ - libsasl2-dev \ - python3-pip && \ - echo "**** install runtime packages ****" && \ - apt-get install -y \ - imagemagick \ - libnss3 \ - libxcomposite1 \ - libxi6 \ - libxslt1.1 \ - libldap-2.4-2 \ - libsasl2-2 \ - libxrandr2 \ - python3-minimal \ - python3-pkg-resources \ - unrar && \ - echo "**** install calibre-web ****" && \ - if [ -z ${CALIBREWEB_COMMIT+x} ]; then \ - CALIBREWEB_COMMIT=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/commits/master" \ - | awk '/sha/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/calibre-web.tar.gz -L \ - "https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_COMMIT}.tar.gz" && \ - mkdir -p \ - /app/calibre-web && \ - tar xf \ - /tmp/calibre-web.tar.gz -C \ - /app/calibre-web --strip-components=1 && \ - cd /app/calibre-web && \ - pip3 install --no-cache-dir -U \ - pip && \ - pip install --no-cache-dir -U -r \ - requirements.txt -r \ - optional-requirements.txt && \ - echo "***install kepubify" && \ - if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ + echo "**** install build packages ****" && \ + apt-get update && \ + apt-get install -y \ + git \ + libldap2-dev \ + libsasl2-dev \ + python3-pip && \ + echo "**** install runtime packages ****" && \ + apt-get install -y \ + imagemagick \ + libnss3 \ + libxcomposite1 \ + libxi6 \ + libxslt1.1 \ + libldap-2.4-2 \ + libsasl2-2 \ + libxrandr2 \ + python3-minimal \ + python3-pkg-resources \ + unrar && \ + echo "**** install calibre-web ****" && \ + if [ -z ${CALIBREWEB_COMMIT+x} ]; then \ + CALIBREWEB_COMMIT=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/commits/master" \ + | awk '/sha/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/calibre-web.tar.gz -L \ + "https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_COMMIT}.tar.gz" && \ + mkdir -p \ + /app/calibre-web && \ + tar xf \ + /tmp/calibre-web.tar.gz -C \ + /app/calibre-web --strip-components=1 && \ + cd /app/calibre-web && \ + pip3 install --no-cache-dir -U \ + pip && \ + pip install --no-cache-dir -U --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ + requirements.txt -r \ + optional-requirements.txt && \ + echo "***install kepubify" && \ + if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ KEPUBIFY_RELEASE=$(curl -sX GET "https://api.github.com/repos/pgaskin/kepubify/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /usr/bin/kepubify -L \ - https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-64bit && \ - echo "**** cleanup ****" && \ - apt-get -y purge \ - git \ - libldap2-dev \ - libsasl2-dev \ - python3-pip && \ - apt-get -y autoremove && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* \ - /root/.cache + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /usr/bin/kepubify -L \ + https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-64bit && \ + echo "**** cleanup ****" && \ + apt-get -y purge \ + git \ + libldap2-dev \ + libsasl2-dev \ + python3-pip && \ + apt-get -y autoremove && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* \ + /root/.cache # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 947e956c7..df26a2b83 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -8,79 +8,79 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="chbmb" RUN \ - echo "**** install build packages ****" && \ - apt-get update && \ - apt-get install -y \ - g++ \ - gcc \ - git \ - libffi-dev \ - libjpeg-dev \ - libldap2-dev \ - libsasl2-dev \ - libxml2-dev \ - libxslt1-dev \ - python3-pip \ - zlib1g-dev && \ - echo "**** install runtime packages ****" && \ - apt-get install -y \ - imagemagick \ - libldap-2.4-2 \ - libnss3 \ - libsasl2-2 \ - libxcomposite1 \ - libxi6 \ - libxrandr2 \ - libxslt1.1 \ - python3-minimal \ - python3-pkg-resources \ - unrar && \ - echo "**** install calibre-web ****" && \ - if [ -z ${CALIBREWEB_COMMIT+x} ]; then \ - CALIBREWEB_COMMIT=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/commits/master" \ - | awk '/sha/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/calibre-web.tar.gz -L \ - "https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_COMMIT}.tar.gz" && \ - mkdir -p \ - /app/calibre-web && \ - tar xf \ - /tmp/calibre-web.tar.gz -C \ - /app/calibre-web --strip-components=1 && \ - cd /app/calibre-web && \ - pip3 install --no-cache-dir -U \ - pip && \ - pip install --no-cache-dir -U -r \ - requirements.txt -r \ - optional-requirements.txt && \ - echo "***install kepubify" && \ - if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ + echo "**** install build packages ****" && \ + apt-get update && \ + apt-get install -y \ + g++ \ + gcc \ + git \ + libffi-dev \ + libjpeg-dev \ + libldap2-dev \ + libsasl2-dev \ + libxml2-dev \ + libxslt1-dev \ + python3-pip \ + zlib1g-dev && \ + echo "**** install runtime packages ****" && \ + apt-get install -y \ + imagemagick \ + libldap-2.4-2 \ + libnss3 \ + libsasl2-2 \ + libxcomposite1 \ + libxi6 \ + libxrandr2 \ + libxslt1.1 \ + python3-minimal \ + python3-pkg-resources \ + unrar && \ + echo "**** install calibre-web ****" && \ + if [ -z ${CALIBREWEB_COMMIT+x} ]; then \ + CALIBREWEB_COMMIT=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/commits/master" \ + | awk '/sha/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/calibre-web.tar.gz -L \ + "https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_COMMIT}.tar.gz" && \ + mkdir -p \ + /app/calibre-web && \ + tar xf \ + /tmp/calibre-web.tar.gz -C \ + /app/calibre-web --strip-components=1 && \ + cd /app/calibre-web && \ + pip3 install --no-cache-dir -U \ + pip && \ + pip install --no-cache-dir -U --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ + requirements.txt -r \ + optional-requirements.txt && \ + echo "***install kepubify" && \ + if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ KEPUBIFY_RELEASE=$(curl -sX GET "https://api.github.com/repos/pgaskin/kepubify/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /usr/bin/kepubify -L \ - https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-arm64 && \ - echo "**** cleanup ****" && \ - apt-get -y purge \ - g++ \ - gcc \ - git \ - libffi-dev \ - libjpeg-dev \ - libldap2-dev \ - libsasl2-dev \ - libxml2-dev \ - libxslt1-dev \ - python3-pip \ - zlib1g-dev && \ - apt-get -y autoremove && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* \ - /root/.cache + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /usr/bin/kepubify -L \ + https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-arm64 && \ + echo "**** cleanup ****" && \ + apt-get -y purge \ + g++ \ + gcc \ + git \ + libffi-dev \ + libjpeg-dev \ + libldap2-dev \ + libsasl2-dev \ + libxml2-dev \ + libxslt1-dev \ + python3-pip \ + zlib1g-dev && \ + apt-get -y autoremove && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* \ + /root/.cache # add local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index d19bfad49..f2e6b0adc 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -8,84 +8,84 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="chbmb" RUN \ - echo "**** install build packages ****" && \ - apt-get update && \ - apt-get install -y \ - g++ \ - gcc \ - git \ - libffi-dev \ - libjpeg-dev \ - libldap2-dev \ - libsasl2-dev \ - libssl-dev \ - libxml2-dev \ - libxslt1-dev \ - python3-pip \ - rustc \ - zlib1g-dev && \ - echo "**** install runtime packages ****" && \ - apt-get install -y \ - imagemagick \ - libldap-2.4-2 \ - libnss3 \ - libsasl2-2 \ - libxcomposite1 \ - libxi6 \ - libxrandr2 \ - libxslt1.1 \ - python3-minimal \ + echo "**** install build packages ****" && \ + apt-get update && \ + apt-get install -y \ + g++ \ + gcc \ + git \ + libffi-dev \ + libjpeg-dev \ + libldap2-dev \ + libsasl2-dev \ + libssl-dev \ + libxml2-dev \ + libxslt1-dev \ + python3-pip \ + rustc \ + zlib1g-dev && \ + echo "**** install runtime packages ****" && \ + apt-get install -y \ + imagemagick \ + libldap-2.4-2 \ + libnss3 \ + libsasl2-2 \ + libxcomposite1 \ + libxi6 \ + libxrandr2 \ + libxslt1.1 \ + python3-minimal \ python3-pkg-resources \ - unrar && \ - echo "**** install calibre-web ****" && \ - if [ -z ${CALIBREWEB_COMMIT+x} ]; then \ - CALIBREWEB_COMMIT=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/commits/master" \ - | awk '/sha/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/calibre-web.tar.gz -L \ - "https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_COMMIT}.tar.gz" && \ - mkdir -p \ - /app/calibre-web && \ - tar xf \ - /tmp/calibre-web.tar.gz -C \ - /app/calibre-web --strip-components=1 && \ - cd /app/calibre-web && \ - pip3 install --no-cache-dir -U \ - pip && \ - pip install --no-cache-dir -U -r \ - requirements.txt -r \ - optional-requirements.txt && \ - echo "***install kepubify" && \ - if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ + unrar && \ + echo "**** install calibre-web ****" && \ + if [ -z ${CALIBREWEB_COMMIT+x} ]; then \ + CALIBREWEB_COMMIT=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/commits/master" \ + | awk '/sha/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/calibre-web.tar.gz -L \ + "https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_COMMIT}.tar.gz" && \ + mkdir -p \ + /app/calibre-web && \ + tar xf \ + /tmp/calibre-web.tar.gz -C \ + /app/calibre-web --strip-components=1 && \ + cd /app/calibre-web && \ + pip3 install --no-cache-dir -U \ + pip && \ + pip install --no-cache-dir -U --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ + requirements.txt -r \ + optional-requirements.txt && \ + echo "***install kepubify" && \ + if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ KEPUBIFY_RELEASE=$(curl -sX GET "https://api.github.com/repos/pgaskin/kepubify/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /usr/bin/kepubify -L \ - https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-arm && \ - echo "**** cleanup ****" && \ - apt-get -y purge \ - g++ \ - gcc \ - git \ - libffi-dev \ - libjpeg-dev \ - libldap2-dev \ - libsasl2-dev \ - libssl-dev \ - libxml2-dev \ - libxslt1-dev \ - python3-pip \ - rustc \ - zlib1g-dev && \ - apt-get -y autoremove && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* \ - /root/.cache \ - /root/.cargo + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /usr/bin/kepubify -L \ + https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-arm && \ + echo "**** cleanup ****" && \ + apt-get -y purge \ + g++ \ + gcc \ + git \ + libffi-dev \ + libjpeg-dev \ + libldap2-dev \ + libsasl2-dev \ + libssl-dev \ + libxml2-dev \ + libxslt1-dev \ + python3-pip \ + rustc \ + zlib1g-dev && \ + apt-get -y autoremove && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* \ + /root/.cache \ + /root/.cargo # add local files COPY root/ / diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config index 384f5cba3..4ca17b9ea 100644 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/cont-init.d/30-config @@ -2,48 +2,48 @@ # create symlinks for imagemagick policy.xml [[ -f /etc/ImageMagick-6/policy.xml ]] && \ - rm /etc/ImageMagick-6/policy.xml + rm /etc/ImageMagick-6/policy.xml [[ ! -L /etc/ImageMagick-6/policy.xml ]] && \ - ln -s /defaults/policy.xml /etc/ImageMagick-6/policy.xml + ln -s /defaults/policy.xml /etc/ImageMagick-6/policy.xml # create symlinks for database and log [[ ! -f /config/app.db ]] && \ - cp /defaults/app.db /config/app.db + cp /defaults/app.db /config/app.db [[ -f /app/calibre-web/app.db ]] && \ - rm /app/calibre-web/app.db + rm /app/calibre-web/app.db [[ ! -L /app/calibre-web/app.db ]] && \ - ln -s /config/app.db /app/calibre-web/app.db + ln -s /config/app.db /app/calibre-web/app.db # create symlinks for log [[ ! -f /config/calibre-web.log ]] && \ - touch /config/calibre-web.log + touch /config/calibre-web.log [[ -f /app/calibre-web/calibre-web.log ]] && \ - rm /app/calibre-web/calibre-web.log + rm /app/calibre-web/calibre-web.log [[ ! -L /app/calibre-web/calibre-web.log ]] && \ - ln -s /config/calibre-web.log /app/calibre-web/calibre-web.log + ln -s /config/calibre-web.log /app/calibre-web/calibre-web.log # create Google drive client_secrets.json file [[ ! -f /config/client_secrets.json ]] && \ - echo "{}" > /config/client_secrets.json + echo "{}" > /config/client_secrets.json [[ -f /app/calibre-web/client_secrets.json ]] && - rm /app/calibre-web/client_secrets.json + rm /app/calibre-web/client_secrets.json [[ ! -L /app/calibre-web/client_secrets.json ]] && - ln -s /config/client_secrets.json /app/calibre-web/client_secrets.json + ln -s /config/client_secrets.json /app/calibre-web/client_secrets.json # create Google drive symlinks for database [[ ! -f /config/gdrive.db ]] && \ - cp /app/calibre-web/gdrive.db /config/gdrive.db + cp /app/calibre-web/gdrive.db /config/gdrive.db [[ -f /app/calibre-web/gdrive.db ]] && \ - rm /app/calibre-web/gdrive.db + rm /app/calibre-web/gdrive.db [[ ! -L /app/calibre-web/gdrive.db ]] && \ - ln -s /config/gdrive.db /app/calibre-web/gdrive.db + ln -s /config/gdrive.db /app/calibre-web/gdrive.db # check if kepubify is present and if so make executable [[ -f /usr/bin/kepubify ]] && \ [[ ! -x /usr/bin/kepubify ]] && \ - chmod +x /usr/bin/kepubify + chmod +x /usr/bin/kepubify # permissions chown -R abc:abc \ - /config \ - /app/calibre-web + /config \ + /app/calibre-web diff --git a/root/etc/services.d/calibre-web/run b/root/etc/services.d/calibre-web/run index 228e498fc..98523a391 100644 --- a/root/etc/services.d/calibre-web/run +++ b/root/etc/services.d/calibre-web/run @@ -3,4 +3,4 @@ cd /app/calibre-web || exit exec \ - s6-setuidgid abc python3 /app/calibre-web/cps.py + s6-setuidgid abc python3 /app/calibre-web/cps.py From a8e2eef44998e2f804d49e614f5ba2695043f3ee Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 17 May 2021 17:39:04 -0400 Subject: [PATCH 033/248] 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 41de67066..883619755 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -75,8 +75,8 @@ libdatrie10.2.12-3 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdbus-1-31.12.16-2ubuntu2.1 libdebconfclient00.251ubuntu1 -libdjvulibre213.5.27.1-14build1 -libdjvulibre-text3.5.27.1-14build1 +libdjvulibre213.5.27.1-14ubuntu0.1 +libdjvulibre-text3.5.27.1-14ubuntu0.1 libexpat12.2.9-1build1 libext2fs21.45.5-2ubuntu1 libfdisk12.34-0.1ubuntu9.1 From cd7473759b17c679899696cda8afd8d17bfa6beb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 25 May 2021 06:17:23 -0400 Subject: [PATCH 034/248] 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 883619755..a2aa8f12f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -177,7 +177,7 @@ libsmartcols12.34-0.1ubuntu9.1 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 -libssl1.11.1.1f-1ubuntu2.3 +libssl1.11.1.1f-1ubuntu2.4 libstdc++610.2.0-5ubuntu1~20.04 libsystemd0245.4-4ubuntu3.6 libtasn1-64.16.0-2 @@ -217,7 +217,7 @@ mount2.34-0.1ubuntu9.1 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 netpbm2:10.0-15.3build1 -openssl1.1.1f-1ubuntu2.3 +openssl1.1.1f-1ubuntu2.4 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From 9cd5c67358364cd1d5fe23d695ee4141394325da Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 26 May 2021 18:34:53 +0000 Subject: [PATCH 035/248] 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 a2aa8f12f..faf2df647 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -192,8 +192,8 @@ libwebp60.6.1-2 libwebpmux30.6.1-2 libwind0-heimdal7.7.0+dfsg-1ubuntu1 libwmf0.2-70.2.8.4-17ubuntu1 -libx11-62:1.6.9-2ubuntu1.1 -libx11-data2:1.6.9-2ubuntu1.1 +libx11-62:1.6.9-2ubuntu1.2 +libx11-data2:1.6.9-2ubuntu1.2 libxau61:1.0.9-0ubuntu1 libxcb11.14-2 libxcb-render01.14-2 From 26ee42c524ff8afe98a3c06244a6253d89202b2d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 3 Jun 2021 07:07:54 -0400 Subject: [PATCH 036/248] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index faf2df647..f04a436e9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -159,8 +159,8 @@ libpixman-1-00.38.4-0ubuntu1 libpng16-161.6.37-2 libprocps82:3.3.16-1ubuntu2.1 libpsl50.21.0-1ubuntu1 -libpython3.8-minimal3.8.5-1~20.04.2 -libpython3.8-stdlib3.8.5-1~20.04.2 +libpython3.8-minimal3.8.5-1~20.04.3 +libpython3.8-stdlib3.8.5-1~20.04.3 libpython3-stdlib3.8.2-0ubuntu2 libreadline88.0-4 libroken18-heimdal7.7.0+dfsg-1ubuntu1 @@ -188,8 +188,8 @@ libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.6 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 -libwebp60.6.1-2 -libwebpmux30.6.1-2 +libwebp60.6.1-2ubuntu0.20.04.1 +libwebpmux30.6.1-2ubuntu0.20.04.1 libwind0-heimdal7.7.0+dfsg-1ubuntu1 libwmf0.2-70.2.8.4-17ubuntu1 libx11-62:1.6.9-2ubuntu1.2 @@ -225,8 +225,8 @@ poppler-data0.4.9-2 procps2:3.3.16-1ubuntu2.1 publicsuffix20200303.0012-1 python33.8.2-0ubuntu2 -python3.83.8.5-1~20.04.2 -python3.8-minimal3.8.5-1~20.04.2 +python3.83.8.5-1~20.04.3 +python3.8-minimal3.8.5-1~20.04.3 python3-minimal3.8.2-0ubuntu2 python3-pkg-resources45.2.0-1 readline-common8.0-4 From dee0aaff8adb185c7ba3d950246b54046fb1e74c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 12 Jun 2021 07:23:45 +0000 Subject: [PATCH 037/248] 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 f04a436e9..734a06b88 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -124,7 +124,7 @@ libldap-2.4-22.4.49+dfsg-2ubuntu1.8 libldap-common2.4.49+dfsg-2ubuntu1.8 liblqr-1-00.4.2-2.1 libltdl72.4.6-14 -liblz4-11.9.2-2 +liblz4-11.9.2-2ubuntu0.20.04.1 liblzma55.2.4-1ubuntu1 libmagic11:5.38-4 libmagickcore-6.q16-68:6.9.10.23+dfsg-2.1ubuntu11.2 @@ -144,10 +144,10 @@ libnss32:3.49.1-1ubuntu1.5 libopenexr242.3.0-6ubuntu0.5 libopenjp2-72.3.1-1ubuntu4.20.04.1 libp11-kit00.23.20-1ubuntu0.1 -libpam0g1.3.1-5ubuntu4.1 -libpam-modules1.3.1-5ubuntu4.1 -libpam-modules-bin1.3.1-5ubuntu4.1 -libpam-runtime1.3.1-5ubuntu4.1 +libpam0g1.3.1-5ubuntu4.2 +libpam-modules1.3.1-5ubuntu4.2 +libpam-modules-bin1.3.1-5ubuntu4.2 +libpam-runtime1.3.1-5ubuntu4.2 libpango-1.0-01.44.7-2ubuntu4 libpangocairo-1.0-01.44.7-2ubuntu4 libpangoft2-1.0-01.44.7-2ubuntu4 From 0e2b448c03894aad43b2dcf5297ec7f73b0df3a6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 22 Jun 2021 06:03:14 -0400 Subject: [PATCH 038/248] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 734a06b88..76be589e0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -43,9 +43,9 @@ gsfonts1:8.11+urwcyr1.0.7~pre44-4.4 gzip1.10-0ubuntu4 hicolor-icon-theme0.17-2 hostname3.23 -imagemagick-6-common8:6.9.10.23+dfsg-2.1ubuntu11.2 -imagemagick-6.q168:6.9.10.23+dfsg-2.1ubuntu11.2 -imagemagick8:6.9.10.23+dfsg-2.1ubuntu11.2 +imagemagick-6-common8:6.9.10.23+dfsg-2.1ubuntu11.4 +imagemagick-6.q168:6.9.10.23+dfsg-2.1ubuntu11.4 +imagemagick8:6.9.10.23+dfsg-2.1ubuntu11.4 init-system-helpers1.57 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -127,9 +127,9 @@ libltdl72.4.6-14 liblz4-11.9.2-2ubuntu0.20.04.1 liblzma55.2.4-1ubuntu1 libmagic11:5.38-4 -libmagickcore-6.q16-68:6.9.10.23+dfsg-2.1ubuntu11.2 -libmagickcore-6.q16-6-extra8:6.9.10.23+dfsg-2.1ubuntu11.2 -libmagickwand-6.q16-68:6.9.10.23+dfsg-2.1ubuntu11.2 +libmagickcore-6.q16-68:6.9.10.23+dfsg-2.1ubuntu11.4 +libmagickcore-6.q16-6-extra8:6.9.10.23+dfsg-2.1ubuntu11.4 +libmagickwand-6.q16-68:6.9.10.23+dfsg-2.1ubuntu11.4 libmagic-mgc1:5.38-4 libmount12.34-0.1ubuntu9.1 libmpdec22.4.2-3 @@ -202,7 +202,7 @@ libxcomposite11:0.4.5-1 libxdmcp61:1.1.3-0ubuntu1 libxext62:1.3.4-0ubuntu1 libxi62:1.7.10-0ubuntu1 -libxml22.9.10+dfsg-5 +libxml22.9.10+dfsg-5ubuntu0.20.04.1 libxrandr22:1.5.2-0ubuntu1 libxrender11:0.9.10-1 libxslt1.11.1.34-4 From 78c2904f3f865d0358d9aad0a3b0feb6e24edaa2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 26 Jun 2021 19:41:49 +0000 Subject: [PATCH 039/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 76be589e0..515124462 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -26,7 +26,7 @@ fonts-dejavu-core2.37-1 fonts-droid-fallback1:6.0.1r16-1.1 fonts-noto-mono20200323-1build1~ubuntu20.04.1 fonts-urw-base3520170801.1-3 -gcc-10-base10.2.0-5ubuntu1~20.04 +gcc-10-base10.3.0-1ubuntu1~20.04 ghostscript9.50~dfsg-5ubuntu4.2 gnupg2.2.19-3ubuntu2.1 gnupg-l10n2.2.19-3ubuntu2.1 @@ -85,13 +85,13 @@ libfftw3-double33.3.8-2ubuntu1 libfontconfig12.13.1-2ubuntu3 libfreetype62.10.1-2ubuntu0.1 libfribidi01.0.8-2 -libgcc-s110.2.0-5ubuntu1~20.04 +libgcc-s110.3.0-1ubuntu1~20.04 libgcrypt201.8.5-5ubuntu1 libglib2.0-02.64.6-1~ubuntu20.04.3 libglib2.0-data2.64.6-1~ubuntu20.04.3 libgmp102:6.2.0+dfsg-4 libgnutls303.6.13-2ubuntu1.3 -libgomp110.2.0-5ubuntu1~20.04 +libgomp110.3.0-1ubuntu1~20.04 libgpg-error01.37-1 libgraphite2-31.3.13-11build1 libgs99.50~dfsg-5ubuntu4.2 @@ -178,7 +178,7 @@ libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 libssl1.11.1.1f-1ubuntu2.4 -libstdc++610.2.0-5ubuntu1~20.04 +libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.6 libtasn1-64.16.0-2 libthai00.1.28-3 From 772d026cb45dae8a75c9d9ea6a9856a9a84db305 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 29 Jun 2021 09:57:12 +0000 Subject: [PATCH 040/248] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 515124462..64bf610e1 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -102,7 +102,7 @@ libharfbuzz0b2.6.4-1ubuntu4 libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1 libheimbase1-heimdal7.7.0+dfsg-1ubuntu1 libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 -libhogweed53.5.1+really3.5.1-2ubuntu0.1 +libhogweed53.5.1+really3.5.1-2ubuntu0.2 libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 libicu6666.1-2ubuntu2 libidn111.33-2.2ubuntu2 @@ -136,7 +136,7 @@ libmpdec22.4.2-3 libncurses66.2-0ubuntu2 libncursesw66.2-0ubuntu2 libnetpbm102:10.0-15.3build1 -libnettle73.5.1+really3.5.1-2ubuntu0.1 +libnettle73.5.1+really3.5.1-2ubuntu0.2 libnghttp2-141.40.0-1build1 libnpth01.6-1 libnspr42:4.25-1 @@ -157,7 +157,7 @@ libpcre2-8-010.34-7 libpcre32:8.39-12build1 libpixman-1-00.38.4-0ubuntu1 libpng16-161.6.37-2 -libprocps82:3.3.16-1ubuntu2.1 +libprocps82:3.3.16-1ubuntu2.2 libpsl50.21.0-1ubuntu1 libpython3.8-minimal3.8.5-1~20.04.3 libpython3.8-stdlib3.8.5-1~20.04.3 @@ -179,13 +179,13 @@ libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 libssl1.11.1.1f-1ubuntu2.4 libstdc++610.3.0-1ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.6 +libsystemd0245.4-4ubuntu3.7 libtasn1-64.16.0-2 libthai00.1.28-3 libthai-data0.1.28-3 libtiff54.1.0+git191117-2ubuntu0.20.04.1 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.6 +libudev1245.4-4ubuntu3.7 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwebp60.6.1-2ubuntu0.20.04.1 @@ -222,7 +222,7 @@ passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 poppler-data0.4.9-2 -procps2:3.3.16-1ubuntu2.1 +procps2:3.3.16-1ubuntu2.2 publicsuffix20200303.0012-1 python33.8.2-0ubuntu2 python3.83.8.5-1~20.04.3 From b831fa9567bd31615a0b568e8378b0c296ff9bc9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 6 Jul 2021 05:44:38 -0400 Subject: [PATCH 041/248] Bot Updating Templated Files --- Jenkinsfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e241486f7..9d206d6d4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,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 ./.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.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' } script{ env.LS_RELEASE_NUMBER = sh( @@ -270,7 +270,6 @@ pipeline { git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} cd ${TEMPDIR}/repo/${LS_REPO} git checkout -f nightly - cd ${TEMPDIR}/docker-${CONTAINER_NAME} for i in ${TEMPLATES_TO_DELETE}; do git rm "${i}" done @@ -531,6 +530,15 @@ pipeline { apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \ sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ chmod 777 /tmp/package_versions.txt' + elif [ "${DIST_IMAGE}" == "fedora" ]; then + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ + rpm -qa > /tmp/package_versions.txt && \ + sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' + elif [ "${DIST_IMAGE}" == "arch" ]; then + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ + pacman -Q > /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' fi NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" From 286636fb6bcfba1e5a4bee9dbdf38cc5cf563e5b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 6 Jul 2021 09:46:19 +0000 Subject: [PATCH 042/248] Bot Updating Templated Files --- .editorconfig | 20 ++++++++++++++++++++ .github/CONTRIBUTING.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/stale.yml | 2 +- README.md | 7 ++----- 5 files changed, 25 insertions(+), 8 deletions(-) create mode 100755 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100755 index 000000000..a92f7dfd8 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,20 @@ +# This file is globally distributed to all container image projects from +# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true +# trim_trailing_whitespace may cause unintended issues and should not be globally set true +trim_trailing_whitespace = false + +[{Dockerfile*,**.yml}] +indent_style = space +indent_size = 2 + +[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}] +indent_style = space +indent_size = 4 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 601f202aa..2409791f8 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -4,7 +4,7 @@ * While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open. * Read, and fill the Pull Request template - * If this is a fix for a typo in code or documentation in the README please file an issue + * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR * If the PR is addressing an existing issue include, closes #\, in the body of the PR commit message * If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a85cabf8a..3127721ef 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,7 +6,7 @@ - + diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 1806420a2..3b3846ee8 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/stale@v1 + - uses: actions/stale@v3 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." diff --git a/README.md b/README.md index 3304540a8..4e1dda133 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ Find us at: [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-calibre-web.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-calibre-web/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-calibre-web/packages) [![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-calibre-web/container_registry) -[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/calibre-web.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/calibre-web "Get your own version badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/calibre-web.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/calibre-web) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/calibre-web.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/calibre-web) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-calibre-web%2Fjob%2Fnightly%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/nightly/) @@ -101,9 +100,7 @@ To reverse proxy with our Letsencrypt docker container we include a preconfigure Here are some example snippets to help you get started creating a container. -### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose)) - -Compatible with docker-compose v2 schemas. +### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose)) ```yaml --- @@ -125,7 +122,7 @@ services: restart: unless-stopped ``` -### docker cli +### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/)) ```bash docker run -d \ From 20e31f570ad7c4c57e4db758aa0ce6d7d0cab7ce Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 6 Jul 2021 09:54:58 +0000 Subject: [PATCH 043/248] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 64bf610e1..3c85fa5d5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ adduser3.118ubuntu2 -apt2.0.5 -apt-utils2.0.5 +apt2.0.6 +apt-utils2.0.6 base-files11ubuntu5.3 base-passwd3.5.47 bash5.0-6ubuntu1.1 @@ -50,7 +50,7 @@ init-system-helpers1.57 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 libapparmor12.13.3-7ubuntu5.1 -libapt-pkg6.02.0.5 +libapt-pkg6.02.0.6 libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 libassuan02.5.3-7ubuntu2 libattr11:2.4.48-5 @@ -159,8 +159,8 @@ libpixman-1-00.38.4-0ubuntu1 libpng16-161.6.37-2 libprocps82:3.3.16-1ubuntu2.2 libpsl50.21.0-1ubuntu1 -libpython3.8-minimal3.8.5-1~20.04.3 -libpython3.8-stdlib3.8.5-1~20.04.3 +libpython3.8-minimal3.8.10-0ubuntu1~20.04 +libpython3.8-stdlib3.8.10-0ubuntu1~20.04 libpython3-stdlib3.8.2-0ubuntu2 libreadline88.0-4 libroken18-heimdal7.7.0+dfsg-1ubuntu1 @@ -225,8 +225,8 @@ poppler-data0.4.9-2 procps2:3.3.16-1ubuntu2.2 publicsuffix20200303.0012-1 python33.8.2-0ubuntu2 -python3.83.8.5-1~20.04.3 -python3.8-minimal3.8.5-1~20.04.3 +python3.83.8.10-0ubuntu1~20.04 +python3.8-minimal3.8.10-0ubuntu1~20.04 python3-minimal3.8.2-0ubuntu2 python3-pkg-resources45.2.0-1 readline-common8.0-4 From c4618375506a4195d3d58dbd1a556271a23ff452 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 10 Jul 2021 07:16:15 +0000 Subject: [PATCH 044/248] 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 3c85fa5d5..681b86cbe 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -56,9 +56,9 @@ libassuan02.5.3-7ubuntu2 libattr11:2.4.48-5 libaudit11:2.8.5-2ubuntu6 libaudit-common1:2.8.5-2ubuntu6 -libavahi-client30.7-4ubuntu7 -libavahi-common30.7-4ubuntu7 -libavahi-common-data0.7-4ubuntu7 +libavahi-client30.7-4ubuntu7.1 +libavahi-common30.7-4ubuntu7.1 +libavahi-common-data0.7-4ubuntu7.1 libblkid12.34-0.1ubuntu9.1 libbrotli11.0.7-6ubuntu0.1 libbsd00.10.0-1 From fa86fbd9f7374acb279838b5d76dc70458e44c47 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 23 Jul 2021 21:20:54 +0200 Subject: [PATCH 045/248] 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 681b86cbe..ef1644424 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -87,8 +87,8 @@ libfreetype62.10.1-2ubuntu0.1 libfribidi01.0.8-2 libgcc-s110.3.0-1ubuntu1~20.04 libgcrypt201.8.5-5ubuntu1 -libglib2.0-02.64.6-1~ubuntu20.04.3 -libglib2.0-data2.64.6-1~ubuntu20.04.3 +libglib2.0-02.64.6-1~ubuntu20.04.4 +libglib2.0-data2.64.6-1~ubuntu20.04.4 libgmp102:6.2.0+dfsg-4 libgnutls303.6.13-2ubuntu1.3 libgomp110.3.0-1ubuntu1~20.04 From 1b53c9a6906e50cb9a7e72831143944cd5b5999d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 27 Jul 2021 09:21:08 +0200 Subject: [PATCH 046/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ef1644424..66f189e9e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bsdutils1:2.34-0.1ubuntu9.1 bzip21.0.8-2 ca-certificates20210119~20.04.1 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.5 +curl7.68.0-1ubuntu2.6 dash0.5.10.2-6 dbus1.12.16-2ubuntu2.1 debconf1.5.73 @@ -70,7 +70,7 @@ libc-bin2.31-0ubuntu9.2 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 libcups22.3.1-9ubuntu1.1 -libcurl47.68.0-1ubuntu2.5 +libcurl47.68.0-1ubuntu2.6 libdatrie10.2.12-3 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdbus-1-31.12.16-2ubuntu2.1 @@ -179,13 +179,13 @@ libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 libssl1.11.1.1f-1ubuntu2.4 libstdc++610.3.0-1ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.7 +libsystemd0245.4-4ubuntu3.10 libtasn1-64.16.0-2 libthai00.1.28-3 libthai-data0.1.28-3 libtiff54.1.0+git191117-2ubuntu0.20.04.1 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.7 +libudev1245.4-4ubuntu3.10 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwebp60.6.1-2ubuntu0.20.04.1 From 4eadaec2cce0a0d326f5ac04e89a6f3a8a79e029 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 3 Aug 2021 11:57:49 +0200 Subject: [PATCH 047/248] 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 66f189e9e..23e5f481a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -90,7 +90,7 @@ libgcrypt201.8.5-5ubuntu1 libglib2.0-02.64.6-1~ubuntu20.04.4 libglib2.0-data2.64.6-1~ubuntu20.04.4 libgmp102:6.2.0+dfsg-4 -libgnutls303.6.13-2ubuntu1.3 +libgnutls303.6.13-2ubuntu1.6 libgomp110.3.0-1ubuntu1~20.04 libgpg-error01.37-1 libgraphite2-31.3.13-11build1 @@ -179,13 +179,13 @@ libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 libssl1.11.1.1f-1ubuntu2.4 libstdc++610.3.0-1ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.10 +libsystemd0245.4-4ubuntu3.11 libtasn1-64.16.0-2 libthai00.1.28-3 libthai-data0.1.28-3 libtiff54.1.0+git191117-2ubuntu0.20.04.1 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.10 +libudev1245.4-4ubuntu3.11 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwebp60.6.1-2ubuntu0.20.04.1 @@ -208,7 +208,7 @@ libxrender11:0.9.10-1 libxslt1.11.1.34-4 libzstd11.4.4+dfsg-3ubuntu0.1 locales2.31-0ubuntu9.2 -login1:4.8.1-1ubuntu5.20.04 +login1:4.8.1-1ubuntu5.20.04.1 logsave1.45.5-2ubuntu1 lsb-base11.1.0ubuntu2 mawk1.3.4.20200120-2 @@ -218,7 +218,7 @@ ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 netpbm2:10.0-15.3build1 openssl1.1.1f-1ubuntu2.4 -passwd1:4.8.1-1ubuntu5.20.04 +passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 poppler-data0.4.9-2 From 1b30b19e6407bacbecd9b0e9eda93d7adad7756e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 17 Aug 2021 11:56:37 +0200 Subject: [PATCH 048/248] 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 23e5f481a..4bf984d10 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -177,7 +177,7 @@ libsmartcols12.34-0.1ubuntu9.1 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 -libssl1.11.1.1f-1ubuntu2.4 +libssl1.11.1.1f-1ubuntu2.5 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.11 libtasn1-64.16.0-2 @@ -217,7 +217,7 @@ mount2.34-0.1ubuntu9.1 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 netpbm2:10.0-15.3build1 -openssl1.1.1f-1ubuntu2.4 +openssl1.1.1f-1ubuntu2.5 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From dc9a4a6a8fa103bd2dabe6ea1f61626b610042f9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 26 Aug 2021 18:13:47 +0200 Subject: [PATCH 049/248] Bot Updating Templated Files --- Jenkinsfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9d206d6d4..600211513 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -385,7 +385,9 @@ pipeline { // Build Docker container for push to LS Repo stage('Build-Single') { when { - environment name: 'MULTIARCH', value: 'false' + expression { + env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' + } environment name: 'EXIT_STATUS', value: '' } steps { @@ -410,7 +412,10 @@ pipeline { // Build MultiArch Docker containers for push to LS Repo stage('Build-Multi') { when { - environment name: 'MULTIARCH', value: 'true' + allOf { + environment name: 'MULTIARCH', value: 'true' + expression { params.PACKAGE_CHECK == 'false' } + } environment name: 'EXIT_STATUS', value: '' } parallel { @@ -515,7 +520,7 @@ pipeline { sh '''#! /bin/bash set -e TEMPDIR=$(mktemp -d) - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} else LOCAL_CONTAINER=${IMAGE}:${META_TAG} @@ -576,7 +581,7 @@ pipeline { steps { sh '''#! /bin/bash echo "Packages were updated. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then docker rmi ${IMAGE}:amd64-${META_TAG} else docker rmi ${IMAGE}:${META_TAG} @@ -600,7 +605,7 @@ pipeline { steps { sh '''#! /bin/bash echo "There are no package updates. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then docker rmi ${IMAGE}:amd64-${META_TAG} else docker rmi ${IMAGE}:${META_TAG} From eb4773ae90f745c70889e14f925483a34060bca0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 26 Aug 2021 18:35:23 +0200 Subject: [PATCH 050/248] 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 4bf984d10..09169e7cc 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ adduser3.118ubuntu2 apt2.0.6 apt-utils2.0.6 -base-files11ubuntu5.3 +base-files11ubuntu5.4 base-passwd3.5.47 bash5.0-6ubuntu1.1 bsdutils1:2.34-0.1ubuntu9.1 From 4d8e5c84176678e6454d39e3c253bf8a00005a69 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 31 Aug 2021 11:44:53 +0200 Subject: [PATCH 051/248] 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 09169e7cc..2e28f6806 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -176,8 +176,8 @@ libsepol13.0-1 libsmartcols12.34-0.1ubuntu9.1 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 -libssh-40.9.3-2ubuntu2.1 -libssl1.11.1.1f-1ubuntu2.5 +libssh-40.9.3-2ubuntu2.2 +libssl1.11.1.1f-1ubuntu2.8 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.11 libtasn1-64.16.0-2 @@ -217,7 +217,7 @@ mount2.34-0.1ubuntu9.1 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 netpbm2:10.0-15.3build1 -openssl1.1.1f-1ubuntu2.5 +openssl1.1.1f-1ubuntu2.8 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From e3141ec50990d8337406a14765bab0db7fa0105b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 14 Sep 2021 11:44:25 +0200 Subject: [PATCH 052/248] 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 2e28f6806..7ff57464d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -27,7 +27,7 @@ fonts-droid-fallback1:6.0.1r16-1.1 fonts-noto-mono20200323-1build1~ubuntu20.04.1 fonts-urw-base3520170801.1-3 gcc-10-base10.3.0-1ubuntu1~20.04 -ghostscript9.50~dfsg-5ubuntu4.2 +ghostscript9.50~dfsg-5ubuntu4.3 gnupg2.2.19-3ubuntu2.1 gnupg-l10n2.2.19-3ubuntu2.1 gnupg-utils2.2.19-3ubuntu2.1 @@ -94,8 +94,8 @@ libgnutls303.6.13-2ubuntu1.6 libgomp110.3.0-1ubuntu1~20.04 libgpg-error01.37-1 libgraphite2-31.3.13-11build1 -libgs99.50~dfsg-5ubuntu4.2 -libgs9-common9.50~dfsg-5ubuntu4.2 +libgs99.50~dfsg-5ubuntu4.3 +libgs9-common9.50~dfsg-5ubuntu4.3 libgssapi3-heimdal7.7.0+dfsg-1ubuntu1 libgssapi-krb5-21.17-6ubuntu4.1 libharfbuzz0b2.6.4-1ubuntu4 From 7588523e6024c9effccf1fb9bdcb508592344702 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 21 Sep 2021 11:44:29 +0200 Subject: [PATCH 053/248] 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 7ff57464d..b5639eb67 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bsdutils1:2.34-0.1ubuntu9.1 bzip21.0.8-2 ca-certificates20210119~20.04.1 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.6 +curl7.68.0-1ubuntu2.7 dash0.5.10.2-6 dbus1.12.16-2ubuntu2.1 debconf1.5.73 @@ -70,7 +70,7 @@ libc-bin2.31-0ubuntu9.2 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 libcups22.3.1-9ubuntu1.1 -libcurl47.68.0-1ubuntu2.6 +libcurl47.68.0-1ubuntu2.7 libdatrie10.2.12-3 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdbus-1-31.12.16-2ubuntu2.1 @@ -86,7 +86,7 @@ libfontconfig12.13.1-2ubuntu3 libfreetype62.10.1-2ubuntu0.1 libfribidi01.0.8-2 libgcc-s110.3.0-1ubuntu1~20.04 -libgcrypt201.8.5-5ubuntu1 +libgcrypt201.8.5-5ubuntu1.1 libglib2.0-02.64.6-1~ubuntu20.04.4 libglib2.0-data2.64.6-1~ubuntu20.04.4 libgmp102:6.2.0+dfsg-4 @@ -179,13 +179,13 @@ libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 libssl1.11.1.1f-1ubuntu2.8 libstdc++610.3.0-1ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.11 +libsystemd0245.4-4ubuntu3.13 libtasn1-64.16.0-2 libthai00.1.28-3 libthai-data0.1.28-3 libtiff54.1.0+git191117-2ubuntu0.20.04.1 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.11 +libudev1245.4-4ubuntu3.13 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwebp60.6.1-2ubuntu0.20.04.1 From 1c9c7d4b0bc93901a5e34812c6c830111368f6a6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 22 Sep 2021 20:21:36 +0200 Subject: [PATCH 054/248] 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 b5639eb67..d9280b65f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -183,7 +183,7 @@ libsystemd0245.4-4ubuntu3.13 libtasn1-64.16.0-2 libthai00.1.28-3 libthai-data0.1.28-3 -libtiff54.1.0+git191117-2ubuntu0.20.04.1 +libtiff54.1.0+git191117-2ubuntu0.20.04.2 libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.13 libunistring20.9.10-2 From b2cd1d2689beaf03af75f00bf77c7cae1e62118c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 28 Sep 2021 11:43:52 +0200 Subject: [PATCH 055/248] 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 d9280b65f..e201b3641 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ base-passwd3.5.47 bash5.0-6ubuntu1.1 bsdutils1:2.34-0.1ubuntu9.1 bzip21.0.8-2 -ca-certificates20210119~20.04.1 +ca-certificates20210119~20.04.2 coreutils8.30-3ubuntu2 curl7.68.0-1ubuntu2.7 dash0.5.10.2-6 @@ -157,7 +157,7 @@ libpcre2-8-010.34-7 libpcre32:8.39-12build1 libpixman-1-00.38.4-0ubuntu1 libpng16-161.6.37-2 -libprocps82:3.3.16-1ubuntu2.2 +libprocps82:3.3.16-1ubuntu2.3 libpsl50.21.0-1ubuntu1 libpython3.8-minimal3.8.10-0ubuntu1~20.04 libpython3.8-stdlib3.8.10-0ubuntu1~20.04 @@ -222,7 +222,7 @@ passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 poppler-data0.4.9-2 -procps2:3.3.16-1ubuntu2.2 +procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 python33.8.2-0ubuntu2 python3.83.8.10-0ubuntu1~20.04 From 061ab663080f7fd64de060dcc0224e96cd48b443 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 5 Oct 2021 11:41:56 +0200 Subject: [PATCH 056/248] Bot Updating Templated Files --- Jenkinsfile | 108 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 101 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 600211513..eb5a4a490 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') + SCARF_TOKEN=credentials('scarf_api_key') EXT_GIT_BRANCH = 'master' EXT_USER = 'janeczku' EXT_REPO = 'calibre-web' @@ -126,6 +127,23 @@ pipeline { env.EXT_RELEASE_CLEAN = sh( script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', returnStdout: true).trim() + + env.SEMVER = (new Date()).format('YYYY.MM.dd') + def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/ + if (semver.find()) { + env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" + } else { + semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/ + if (semver.find()) { + if (semver[0][3]) { + env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" + } else if (!semver[0][3] && !semver[0][4]) { + env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${(new Date()).format('YYYYMMdd')}" + } + } + } + + println("SEMVER: ${env.SEMVER}") } } } @@ -140,6 +158,7 @@ pipeline { env.IMAGE = env.DOCKERHUB_IMAGE env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME + env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { @@ -162,6 +181,7 @@ pipeline { env.IMAGE = env.DEV_DOCKERHUB_IMAGE env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME + env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } else { @@ -184,6 +204,7 @@ pipeline { env.IMAGE = env.PR_DOCKERHUB_IMAGE env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME + env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } else { @@ -379,6 +400,48 @@ pipeline { "visibility":"public"}' ''' } } + /* ####################### + Scarf.sh package registry + ####################### */ + // Add package to Scarf.sh and set permissions + stage("Scarf.sh package registry"){ + when { + branch "nightly" + environment name: 'EXIT_STATUS', value: '' + } + steps{ + sh '''#! /bin/bash + set -e + PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/calibre-web") | .uuid') + if [ -z "${PACKAGE_UUID}" ]; then + echo "Adding package to Scarf.sh" + PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \ + -H "Authorization: Bearer ${SCARF_TOKEN}" \ + -H "Content-Type: application/json" \ + -d '{"name":"linuxserver/calibre-web",\ + "shortDescription":"example description",\ + "libraryType":"docker",\ + "website":"https://github.com/linuxserver/docker-calibre-web",\ + "backendUrl":"https://ghcr.io/linuxserver/calibre-web",\ + "publicUrl":"https://lscr.io/linuxserver/calibre-web"}' \ + | jq -r .uuid) + else + echo "Package already exists on Scarf.sh" + fi + echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}" + curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \ + -H "Authorization: Bearer ${SCARF_TOKEN}" \ + -H "Content-Type: application/json" \ + -d '[{"userQuery":"Spad","permissionLevel":"admin"},\ + {"userQuery":"roxedus","permissionLevel":"admin"},\ + {"userQuery":"nemchik","permissionLevel":"admin"},\ + {"userQuery":"driz","permissionLevel":"admin"},\ + {"userQuery":"aptalca","permissionLevel":"admin"},\ + {"userQuery":"saarg","permissionLevel":"admin"},\ + {"userQuery":"Stark","permissionLevel":"admin"}]' + ''' + } + } /* ############### Build Container ############### */ @@ -386,7 +449,7 @@ pipeline { stage('Build-Single') { when { expression { - env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' + env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' } environment name: 'EXIT_STATUS', value: '' } @@ -680,6 +743,12 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' + ], + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' ] ]) { retry(5) { @@ -688,22 +757,26 @@ pipeline { echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:nightly docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} docker push ${PUSHIMAGE}:nightly docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} + docker push ${PUSHIMAGE}:${SEMVER} done ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:nightly || : + ${DELETEIMAGE}:nightly \ + ${DELETEIMAGE}:${SEMVER} || : done ''' } @@ -722,6 +795,12 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' + ], + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' ] ]) { retry(5) { @@ -730,13 +809,14 @@ pipeline { echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --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 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 tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}"; do + 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} @@ -746,6 +826,9 @@ pipeline { docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} @@ -755,6 +838,9 @@ pipeline { docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:amd64-${SEMVER} + docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker manifest push --purge ${MANIFESTIMAGE}:nightly || : docker manifest create ${MANIFESTIMAGE}:nightly ${MANIFESTIMAGE}:amd64-nightly ${MANIFESTIMAGE}:arm32v7-nightly ${MANIFESTIMAGE}:arm64v8-nightly docker manifest annotate ${MANIFESTIMAGE}:nightly ${MANIFESTIMAGE}:arm32v7-nightly --os linux --arch arm @@ -767,24 +853,32 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : + docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:nightly docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} done ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-nightly \ ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:amd64-${SEMVER} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-nightly \ ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:arm32v7-${SEMVER} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ ${DELETEIMAGE}:arm64v8-nightly \ - ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:arm64v8-${SEMVER} || : done docker rmi \ ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ From 7879a6eef95e76046c54c115c6dcda8532bbe28b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 5 Oct 2021 11:42:54 +0200 Subject: [PATCH 057/248] Bot Updating Templated Files --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 4e1dda133..6446a7705 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ Find us at: [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-calibre-web.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-calibre-web/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-calibre-web/packages) [![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-calibre-web/container_registry) +[![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/calibre-web) [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/calibre-web.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/calibre-web) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/calibre-web.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/calibre-web) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-calibre-web%2Fjob%2Fnightly%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/nightly/) @@ -48,7 +49,7 @@ This software is a fork of library and licensed under the GPL v3 License. Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). -Simply pulling `ghcr.io/linuxserver/calibre-web` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. +Simply pulling `lscr.io/linuxserver/calibre-web` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. The architectures supported by this image are: @@ -107,7 +108,7 @@ Here are some example snippets to help you get started creating a container. version: "2.1" services: calibre-web: - image: ghcr.io/linuxserver/calibre-web + image: lscr.io/linuxserver/calibre-web container_name: calibre-web environment: - PUID=1000 @@ -135,7 +136,7 @@ docker run -d \ -v /path/to/data:/config \ -v /path/to/calibre/library:/books \ --restart unless-stopped \ - ghcr.io/linuxserver/calibre-web + lscr.io/linuxserver/calibre-web ``` ## Parameters @@ -195,7 +196,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to * container version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' calibre-web` * image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' ghcr.io/linuxserver/calibre-web` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/calibre-web` ## Updating Info @@ -213,7 +214,7 @@ Below are the instructions for updating containers: ### Via Docker Run -* Update the image: `docker pull ghcr.io/linuxserver/calibre-web` +* Update the image: `docker pull lscr.io/linuxserver/calibre-web` * Stop the running container: `docker stop calibre-web` * Delete the container: `docker rm calibre-web` * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) @@ -248,7 +249,7 @@ cd docker-calibre-web docker build \ --no-cache \ --pull \ - -t ghcr.io/linuxserver/calibre-web:latest . + -t lscr.io/linuxserver/calibre-web:latest . ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` From 76655c60385f8d95c6a78b265339452468a04697 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 5 Oct 2021 11:55:51 +0200 Subject: [PATCH 058/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e201b3641..66dacb004 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -159,8 +159,8 @@ libpixman-1-00.38.4-0ubuntu1 libpng16-161.6.37-2 libprocps82:3.3.16-1ubuntu2.3 libpsl50.21.0-1ubuntu1 -libpython3.8-minimal3.8.10-0ubuntu1~20.04 -libpython3.8-stdlib3.8.10-0ubuntu1~20.04 +libpython3.8-minimal3.8.10-0ubuntu1~20.04.1 +libpython3.8-stdlib3.8.10-0ubuntu1~20.04.1 libpython3-stdlib3.8.2-0ubuntu2 libreadline88.0-4 libroken18-heimdal7.7.0+dfsg-1ubuntu1 @@ -225,8 +225,8 @@ poppler-data0.4.9-2 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 python33.8.2-0ubuntu2 -python3.83.8.10-0ubuntu1~20.04 -python3.8-minimal3.8.10-0ubuntu1~20.04 +python3.83.8.10-0ubuntu1~20.04.1 +python3.8-minimal3.8.10-0ubuntu1~20.04.1 python3-minimal3.8.2-0ubuntu2 python3-pkg-resources45.2.0-1 readline-common8.0-4 From 39c7651b5073a0898b3a3cbb44e1b0d16ff642d2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 12 Oct 2021 11:44:35 +0200 Subject: [PATCH 059/248] 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 66dacb004..f9f359a0d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -235,7 +235,7 @@ sensible-utils0.0.12+nmu1 shared-mime-info1.15-1 sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.1 -tzdata2021a-0ubuntu0.20.04 +tzdata2021a-2ubuntu0.20.04 ubuntu-keyring2020.02.11.4 ucf3.0038+nmu1 unrar1:5.6.6-2build1 From 8caafc65a7be04ac544772633fe20535d84a8cba Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 2 Nov 2021 10:45:10 +0100 Subject: [PATCH 060/248] 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 f9f359a0d..3be5a31f9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -235,7 +235,7 @@ sensible-utils0.0.12+nmu1 shared-mime-info1.15-1 sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.1 -tzdata2021a-2ubuntu0.20.04 +tzdata2021e-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 ucf3.0038+nmu1 unrar1:5.6.6-2build1 From f38a347da306165c0555b2d5c9728d4870f77374 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 4 Nov 2021 10:03:04 -0400 Subject: [PATCH 061/248] Tell pip to ignore distro installed packages --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0c7642ce4..56c2db2fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,7 @@ RUN \ cd /app/calibre-web && \ pip3 install --no-cache-dir -U \ pip && \ - pip install --no-cache-dir -U --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ + pip install --no-cache-dir -U --ignore-installed --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ requirements.txt -r \ optional-requirements.txt && \ echo "***install kepubify" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index df26a2b83..5a2b9ef2c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -51,7 +51,7 @@ RUN \ cd /app/calibre-web && \ pip3 install --no-cache-dir -U \ pip && \ - pip install --no-cache-dir -U --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ + pip install --no-cache-dir -U --ignore-installed --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ requirements.txt -r \ optional-requirements.txt && \ echo "***install kepubify" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index f2e6b0adc..460f5eeea 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -53,7 +53,7 @@ RUN \ cd /app/calibre-web && \ pip3 install --no-cache-dir -U \ pip && \ - pip install --no-cache-dir -U --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ + pip install --no-cache-dir -U --ignore-installed --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ requirements.txt -r \ optional-requirements.txt && \ echo "***install kepubify" && \ diff --git a/README.md b/README.md index 6446a7705..24bd8e0af 100644 --- a/README.md +++ b/README.md @@ -262,6 +262,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **04.11.21:** - Fix pip arguments * **10.02.21:** - Add libxrandr2 * **25.01.21:** - Add nightly tag * **19.01.21:** - Add python3-pkg-resources diff --git a/readme-vars.yml b/readme-vars.yml index 937797417..d0a857546 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -77,6 +77,7 @@ app_setup_block: | # changelog changelogs: + - { date: "04.11.21:", desc: "Fix pip arguments"} - { date: "10.02.21:", desc: "Add libxrandr2"} - { date: "25.01.21:", desc: "Add nightly tag"} - { date: "19.01.21:", desc: "Add python3-pkg-resources"} From b53d96d3cd1cfbf10c42254d38251ebaad2f482d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 9 Nov 2021 10:46:20 +0100 Subject: [PATCH 062/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3be5a31f9..aedf57fd5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -144,10 +144,10 @@ libnss32:3.49.1-1ubuntu1.5 libopenexr242.3.0-6ubuntu0.5 libopenjp2-72.3.1-1ubuntu4.20.04.1 libp11-kit00.23.20-1ubuntu0.1 -libpam0g1.3.1-5ubuntu4.2 -libpam-modules1.3.1-5ubuntu4.2 -libpam-modules-bin1.3.1-5ubuntu4.2 -libpam-runtime1.3.1-5ubuntu4.2 +libpam0g1.3.1-5ubuntu4.3 +libpam-modules1.3.1-5ubuntu4.3 +libpam-modules-bin1.3.1-5ubuntu4.3 +libpam-runtime1.3.1-5ubuntu4.3 libpango-1.0-01.44.7-2ubuntu4 libpangocairo-1.0-01.44.7-2ubuntu4 libpangoft2-1.0-01.44.7-2ubuntu4 From c351a3cec1cf0286e5d47e4312352e7ceb1cdf10 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 16 Nov 2021 10:45:48 +0100 Subject: [PATCH 063/248] 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 aedf57fd5..cffbd42a6 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -177,7 +177,7 @@ libsmartcols12.34-0.1ubuntu9.1 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.8 +libssl1.11.1.1f-1ubuntu2.9 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.13 libtasn1-64.16.0-2 @@ -217,7 +217,7 @@ mount2.34-0.1ubuntu9.1 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 netpbm2:10.0-15.3build1 -openssl1.1.1f-1ubuntu2.8 +openssl1.1.1f-1ubuntu2.9 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From 48b7427a6136e0ef355bec8188807366800354eb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 27 Nov 2021 13:21:29 +0100 Subject: [PATCH 064/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cffbd42a6..1a1385f3d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -27,7 +27,7 @@ fonts-droid-fallback1:6.0.1r16-1.1 fonts-noto-mono20200323-1build1~ubuntu20.04.1 fonts-urw-base3520170801.1-3 gcc-10-base10.3.0-1ubuntu1~20.04 -ghostscript9.50~dfsg-5ubuntu4.3 +ghostscript9.50~dfsg-5ubuntu4.4 gnupg2.2.19-3ubuntu2.1 gnupg-l10n2.2.19-3ubuntu2.1 gnupg-utils2.2.19-3ubuntu2.1 @@ -94,8 +94,8 @@ libgnutls303.6.13-2ubuntu1.6 libgomp110.3.0-1ubuntu1~20.04 libgpg-error01.37-1 libgraphite2-31.3.13-11build1 -libgs99.50~dfsg-5ubuntu4.3 -libgs9-common9.50~dfsg-5ubuntu4.3 +libgs99.50~dfsg-5ubuntu4.4 +libgs9-common9.50~dfsg-5ubuntu4.4 libgssapi3-heimdal7.7.0+dfsg-1ubuntu1 libgssapi-krb5-21.17-6ubuntu4.1 libharfbuzz0b2.6.4-1ubuntu4 @@ -104,7 +104,7 @@ libheimbase1-heimdal7.7.0+dfsg-1ubuntu1 libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 libhogweed53.5.1+really3.5.1-2ubuntu0.2 libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 -libicu6666.1-2ubuntu2 +libicu6666.1-2ubuntu2.1 libidn111.33-2.2ubuntu2 libidn2-02.2.0-2 libijs-0.350.35-15 From faa37c9c1eb5cc40f5db301bddaf09c0390b2b53 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 1 Dec 2021 21:26:05 +0100 Subject: [PATCH 065/248] 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 1a1385f3d..5ce7ac0fb 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -140,7 +140,7 @@ libnettle73.5.1+really3.5.1-2ubuntu0.2 libnghttp2-141.40.0-1build1 libnpth01.6-1 libnspr42:4.25-1 -libnss32:3.49.1-1ubuntu1.5 +libnss32:3.49.1-1ubuntu1.6 libopenexr242.3.0-6ubuntu0.5 libopenjp2-72.3.1-1ubuntu4.20.04.1 libp11-kit00.23.20-1ubuntu0.1 From 4c4ca58c0dbf7c31e4a8da651860521b30d9dafe Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 14 Dec 2021 10:47:45 +0100 Subject: [PATCH 066/248] 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 5ce7ac0fb..a868ea32b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -177,7 +177,7 @@ libsmartcols12.34-0.1ubuntu9.1 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.9 +libssl1.11.1.1f-1ubuntu2.10 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.13 libtasn1-64.16.0-2 @@ -217,7 +217,7 @@ mount2.34-0.1ubuntu9.1 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 netpbm2:10.0-15.3build1 -openssl1.1.1f-1ubuntu2.9 +openssl1.1.1f-1ubuntu2.10 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From 54937117bc85936178c9f05f17fd63511219585e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 16 Dec 2021 07:25:14 +0100 Subject: [PATCH 067/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a868ea32b..d6df59186 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -159,8 +159,8 @@ libpixman-1-00.38.4-0ubuntu1 libpng16-161.6.37-2 libprocps82:3.3.16-1ubuntu2.3 libpsl50.21.0-1ubuntu1 -libpython3.8-minimal3.8.10-0ubuntu1~20.04.1 -libpython3.8-stdlib3.8.10-0ubuntu1~20.04.1 +libpython3.8-minimal3.8.10-0ubuntu1~20.04.2 +libpython3.8-stdlib3.8.10-0ubuntu1~20.04.2 libpython3-stdlib3.8.2-0ubuntu2 libreadline88.0-4 libroken18-heimdal7.7.0+dfsg-1ubuntu1 @@ -225,8 +225,8 @@ poppler-data0.4.9-2 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 python33.8.2-0ubuntu2 -python3.83.8.10-0ubuntu1~20.04.1 -python3.8-minimal3.8.10-0ubuntu1~20.04.1 +python3.83.8.10-0ubuntu1~20.04.2 +python3.8-minimal3.8.10-0ubuntu1~20.04.2 python3-minimal3.8.2-0ubuntu2 python3-pkg-resources45.2.0-1 readline-common8.0-4 From b32012c9538177268dd9422ba15dc25ca7225741 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 18 Dec 2021 19:11:13 +0100 Subject: [PATCH 068/248] Bot Updating Templated Files --- Jenkinsfile | 88 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 38 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index eb5a4a490..aa20ed493 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -128,12 +128,11 @@ pipeline { script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', returnStdout: true).trim() - env.SEMVER = (new Date()).format('YYYY.MM.dd') - def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/ + def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/ if (semver.find()) { env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" } else { - semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/ + semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/ if (semver.find()) { if (semver[0][3]) { env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" @@ -143,7 +142,15 @@ pipeline { } } - println("SEMVER: ${env.SEMVER}") + if (env.SEMVER != null) { + if (BRANCH_NAME != "master" && BRANCH_NAME != "main") { + env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}" + } + println("SEMVER: ${env.SEMVER}") + } else { + println("No SEMVER detected") + } + } } } @@ -412,10 +419,10 @@ pipeline { steps{ sh '''#! /bin/bash set -e - PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/calibre-web") | .uuid') + PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/calibre-web") | .uuid') if [ -z "${PACKAGE_UUID}" ]; then echo "Adding package to Scarf.sh" - PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \ + curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \ -H "Authorization: Bearer ${SCARF_TOKEN}" \ -H "Content-Type: application/json" \ -d '{"name":"linuxserver/calibre-web",\ @@ -423,22 +430,10 @@ pipeline { "libraryType":"docker",\ "website":"https://github.com/linuxserver/docker-calibre-web",\ "backendUrl":"https://ghcr.io/linuxserver/calibre-web",\ - "publicUrl":"https://lscr.io/linuxserver/calibre-web"}' \ - | jq -r .uuid) + "publicUrl":"https://lscr.io/linuxserver/calibre-web"}' || : else echo "Package already exists on Scarf.sh" fi - echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}" - curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \ - -H "Authorization: Bearer ${SCARF_TOKEN}" \ - -H "Content-Type: application/json" \ - -d '[{"userQuery":"Spad","permissionLevel":"admin"},\ - {"userQuery":"roxedus","permissionLevel":"admin"},\ - {"userQuery":"nemchik","permissionLevel":"admin"},\ - {"userQuery":"driz","permissionLevel":"admin"},\ - {"userQuery":"aptalca","permissionLevel":"admin"},\ - {"userQuery":"saarg","permissionLevel":"admin"},\ - {"userQuery":"Stark","permissionLevel":"admin"}]' ''' } } @@ -762,11 +757,15 @@ pipeline { docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:nightly docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} + if [ -n "${SEMVER}" ]; then + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} + fi docker push ${PUSHIMAGE}:nightly docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} - docker push ${PUSHIMAGE}:${SEMVER} + if [ -n "${SEMVER}" ]; then + docker push ${PUSHIMAGE}:${SEMVER} + fi done ''' } @@ -775,8 +774,10 @@ pipeline { docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:nightly \ - ${DELETEIMAGE}:${SEMVER} || : + ${DELETEIMAGE}:nightly || : + if [ -n "${SEMVER}" ]; then + docker rmi ${DELETEIMAGE}:${SEMVER} || : + fi done ''' } @@ -826,9 +827,11 @@ pipeline { docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + if [ -n "${SEMVER}" ]; then + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} + 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} @@ -838,9 +841,11 @@ pipeline { docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker push ${MANIFESTIMAGE}:amd64-${SEMVER} - docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} - docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} + if [ -n "${SEMVER}" ]; then + docker push ${MANIFESTIMAGE}:amd64-${SEMVER} + docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} + fi docker manifest push --purge ${MANIFESTIMAGE}:nightly || : docker manifest create ${MANIFESTIMAGE}:nightly ${MANIFESTIMAGE}:amd64-nightly ${MANIFESTIMAGE}:arm32v7-nightly ${MANIFESTIMAGE}:arm64v8-nightly docker manifest annotate ${MANIFESTIMAGE}:nightly ${MANIFESTIMAGE}:arm32v7-nightly --os linux --arch arm @@ -853,14 +858,18 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : - docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 + if [ -n "${SEMVER}" ]; then + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : + docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 + fi docker manifest push --purge ${MANIFESTIMAGE}:nightly docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} + if [ -n "${SEMVER}" ]; then + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} + fi done ''' } @@ -870,15 +879,18 @@ pipeline { ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-nightly \ ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:amd64-${SEMVER} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-nightly \ ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm32v7-${SEMVER} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ ${DELETEIMAGE}:arm64v8-nightly \ - ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm64v8-${SEMVER} || : + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : + if [ -n "${SEMVER}" ]; then + docker rmi \ + ${DELETEIMAGE}:amd64-${SEMVER} \ + ${DELETEIMAGE}:arm32v7-${SEMVER} \ + ${DELETEIMAGE}:arm64v8-${SEMVER} || : + fi done docker rmi \ ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ From 9295bd5e47f43f529cf82a89f9c68a81100e16ec Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 18 Dec 2021 19:12:18 +0100 Subject: [PATCH 069/248] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 24bd8e0af..c7a821b27 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ Find us at: # [linuxserver/calibre-web](https://github.com/linuxserver/docker-calibre-web) +[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fcalibre-web?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fcalibre-web) [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-calibre-web.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-calibre-web) [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-calibre-web.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-calibre-web/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-calibre-web/packages) From ba3d6d2ff462c32a6ed4a0c302ac1267aa60c3a2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 21 Dec 2021 10:47:31 +0100 Subject: [PATCH 070/248] 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 d6df59186..444083389 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -168,7 +168,7 @@ librtmp12.4+20151223.gitfa8646d.1-2build1 libsasl2-22.1.27+dfsg-2 libsasl2-modules2.1.27+dfsg-2 libsasl2-modules-db2.1.27+dfsg-2 -libseccomp22.5.1-1ubuntu1~20.04.1 +libseccomp22.5.1-1ubuntu1~20.04.2 libselinux13.0-1build2 libsemanage13.0-1build2 libsemanage-common3.0-1build2 From 50b718bcf2e9105300cc0a4a33cfb4b7bbc3b068 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 11 Jan 2022 10:47:47 +0100 Subject: [PATCH 071/248] 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 444083389..fc27fe783 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -179,13 +179,13 @@ libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 libssl1.11.1.1f-1ubuntu2.10 libstdc++610.3.0-1ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.13 +libsystemd0245.4-4ubuntu3.14 libtasn1-64.16.0-2 libthai00.1.28-3 libthai-data0.1.28-3 libtiff54.1.0+git191117-2ubuntu0.20.04.2 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.13 +libudev1245.4-4ubuntu3.14 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwebp60.6.1-2ubuntu0.20.04.1 From 062e14496fbf0afd627375001a872788565db51f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 15 Jan 2022 10:17:17 +0100 Subject: [PATCH 072/248] 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 fc27fe783..c8614e7e9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -27,7 +27,7 @@ fonts-droid-fallback1:6.0.1r16-1.1 fonts-noto-mono20200323-1build1~ubuntu20.04.1 fonts-urw-base3520170801.1-3 gcc-10-base10.3.0-1ubuntu1~20.04 -ghostscript9.50~dfsg-5ubuntu4.4 +ghostscript9.50~dfsg-5ubuntu4.5 gnupg2.2.19-3ubuntu2.1 gnupg-l10n2.2.19-3ubuntu2.1 gnupg-utils2.2.19-3ubuntu2.1 @@ -94,8 +94,8 @@ libgnutls303.6.13-2ubuntu1.6 libgomp110.3.0-1ubuntu1~20.04 libgpg-error01.37-1 libgraphite2-31.3.13-11build1 -libgs99.50~dfsg-5ubuntu4.4 -libgs9-common9.50~dfsg-5ubuntu4.4 +libgs99.50~dfsg-5ubuntu4.5 +libgs9-common9.50~dfsg-5ubuntu4.5 libgssapi3-heimdal7.7.0+dfsg-1ubuntu1 libgssapi-krb5-21.17-6ubuntu4.1 libharfbuzz0b2.6.4-1ubuntu4 From 6e091347a7378218fa70c0574d14fa6855643a9d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 18 Jan 2022 10:47:45 +0100 Subject: [PATCH 073/248] 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 c8614e7e9..f9c1edc13 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -179,13 +179,13 @@ libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 libssl1.11.1.1f-1ubuntu2.10 libstdc++610.3.0-1ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.14 +libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 libthai00.1.28-3 libthai-data0.1.28-3 libtiff54.1.0+git191117-2ubuntu0.20.04.2 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.14 +libudev1245.4-4ubuntu3.15 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwebp60.6.1-2ubuntu0.20.04.1 From e451b64f8ca25a0cb1fc141e866645972d81edf3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Feb 2022 10:43:45 +0100 Subject: [PATCH 074/248] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f9c1edc13..222b503e7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ apt-utils2.0.6 base-files11ubuntu5.4 base-passwd3.5.47 bash5.0-6ubuntu1.1 -bsdutils1:2.34-0.1ubuntu9.1 +bsdutils1:2.34-0.1ubuntu9.3 bzip21.0.8-2 ca-certificates20210119~20.04.2 coreutils8.30-3ubuntu2 @@ -17,7 +17,7 @@ diffutils1:3.7-3 dirmngr2.2.19-3ubuntu2.1 dpkg1.19.7ubuntu3 e2fsprogs1.45.5-2ubuntu1 -fdisk2.34-0.1ubuntu9.1 +fdisk2.34-0.1ubuntu9.3 file1:5.38-4 findutils4.7.0-1ubuntu1 fontconfig2.13.1-2ubuntu3 @@ -59,7 +59,7 @@ libaudit-common1:2.8.5-2ubuntu6 libavahi-client30.7-4ubuntu7.1 libavahi-common30.7-4ubuntu7.1 libavahi-common-data0.7-4ubuntu7.1 -libblkid12.34-0.1ubuntu9.1 +libblkid12.34-0.1ubuntu9.3 libbrotli11.0.7-6ubuntu0.1 libbsd00.10.0-1 libbz2-1.01.0.8-2 @@ -79,7 +79,7 @@ libdjvulibre213.5.27.1-14ubuntu0.1 libdjvulibre-text3.5.27.1-14ubuntu0.1 libexpat12.2.9-1build1 libext2fs21.45.5-2ubuntu1 -libfdisk12.34-0.1ubuntu9.1 +libfdisk12.34-0.1ubuntu9.3 libffi73.3-4 libfftw3-double33.3.8-2ubuntu1 libfontconfig12.13.1-2ubuntu3 @@ -131,7 +131,7 @@ libmagickcore-6.q16-68:6.9.10.23+dfsg-2.1ubuntu11.4 libmagickcore-6.q16-6-extra8:6.9.10.23+dfsg-2.1ubuntu11.4 libmagickwand-6.q16-68:6.9.10.23+dfsg-2.1ubuntu11.4 libmagic-mgc1:5.38-4 -libmount12.34-0.1ubuntu9.1 +libmount12.34-0.1ubuntu9.3 libmpdec22.4.2-3 libncurses66.2-0ubuntu2 libncursesw66.2-0ubuntu2 @@ -173,7 +173,7 @@ libselinux13.0-1build2 libsemanage13.0-1build2 libsemanage-common3.0-1build2 libsepol13.0-1 -libsmartcols12.34-0.1ubuntu9.1 +libsmartcols12.34-0.1ubuntu9.3 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 @@ -187,7 +187,7 @@ libtiff54.1.0+git191117-2ubuntu0.20.04.2 libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.15 libunistring20.9.10-2 -libuuid12.34-0.1ubuntu9.1 +libuuid12.34-0.1ubuntu9.3 libwebp60.6.1-2ubuntu0.20.04.1 libwebpmux30.6.1-2ubuntu0.20.04.1 libwind0-heimdal7.7.0+dfsg-1ubuntu1 @@ -213,7 +213,7 @@ logsave1.45.5-2ubuntu1 lsb-base11.1.0ubuntu2 mawk1.3.4.20200120-2 mime-support3.64ubuntu1 -mount2.34-0.1ubuntu9.1 +mount2.34-0.1ubuntu9.3 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 netpbm2:10.0-15.3build1 @@ -239,7 +239,7 @@ tzdata2021e-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 ucf3.0038+nmu1 unrar1:5.6.6-2build1 -util-linux2.34-0.1ubuntu9.1 +util-linux2.34-0.1ubuntu9.3 xdg-user-dirs0.17-2ubuntu1 xz-utils5.2.4-1ubuntu1 zlib1g1:1.2.11.dfsg-2ubuntu1.2 From ed1cd7e292bfd3c178f000881d8ed6f922604fb0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 22 Feb 2022 10:47:56 +0100 Subject: [PATCH 075/248] 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 222b503e7..0165e8bcd 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -77,7 +77,7 @@ libdbus-1-31.12.16-2ubuntu2.1 libdebconfclient00.251ubuntu1 libdjvulibre213.5.27.1-14ubuntu0.1 libdjvulibre-text3.5.27.1-14ubuntu0.1 -libexpat12.2.9-1build1 +libexpat12.2.9-1ubuntu0.2 libext2fs21.45.5-2ubuntu1 libfdisk12.34-0.1ubuntu9.3 libffi73.3-4 From 65eca55f9c4040e7d52fc5b0cafad984d5d25c72 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 27 Feb 2022 11:15:30 +0100 Subject: [PATCH 076/248] 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 0165e8bcd..fd19a7516 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -165,9 +165,9 @@ libpython3-stdlib3.8.2-0ubuntu2 libreadline88.0-4 libroken18-heimdal7.7.0+dfsg-1ubuntu1 librtmp12.4+20151223.gitfa8646d.1-2build1 -libsasl2-22.1.27+dfsg-2 -libsasl2-modules2.1.27+dfsg-2 -libsasl2-modules-db2.1.27+dfsg-2 +libsasl2-22.1.27+dfsg-2ubuntu0.1 +libsasl2-modules2.1.27+dfsg-2ubuntu0.1 +libsasl2-modules-db2.1.27+dfsg-2ubuntu0.1 libseccomp22.5.1-1ubuntu1~20.04.2 libselinux13.0-1build2 libsemanage13.0-1build2 From a0fa526c86c81039d77edb8000b081376f62339c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 1 Mar 2022 17:22:10 +0100 Subject: [PATCH 077/248] 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 fd19a7516..86d840bec 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -63,7 +63,7 @@ libblkid12.34-0.1ubuntu9.3 libbrotli11.0.7-6ubuntu0.1 libbsd00.10.0-1 libbz2-1.01.0.8-2 -libc62.31-0ubuntu9.2 +libc62.31-0ubuntu9.7 libcairo21.16.0-4ubuntu1 libcap-ng00.7.9-2.1build1 libc-bin2.31-0ubuntu9.2 From 09ae02d3f4fdb2f5d4e746c83193509f559484a3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 8 Mar 2022 10:44:03 +0100 Subject: [PATCH 078/248] 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 86d840bec..d77dc7e71 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ adduser3.118ubuntu2 apt2.0.6 apt-utils2.0.6 -base-files11ubuntu5.4 +base-files11ubuntu5.5 base-passwd3.5.47 bash5.0-6ubuntu1.1 bsdutils1:2.34-0.1ubuntu9.3 @@ -66,7 +66,7 @@ libbz2-1.01.0.8-2 libc62.31-0ubuntu9.7 libcairo21.16.0-4ubuntu1 libcap-ng00.7.9-2.1build1 -libc-bin2.31-0ubuntu9.2 +libc-bin2.31-0ubuntu9.7 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 libcups22.3.1-9ubuntu1.1 @@ -177,7 +177,7 @@ libsmartcols12.34-0.1ubuntu9.3 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.10 +libssl1.11.1.1f-1ubuntu2.11 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 @@ -207,7 +207,7 @@ libxrandr22:1.5.2-0ubuntu1 libxrender11:0.9.10-1 libxslt1.11.1.34-4 libzstd11.4.4+dfsg-3ubuntu0.1 -locales2.31-0ubuntu9.2 +locales2.31-0ubuntu9.7 login1:4.8.1-1ubuntu5.20.04.1 logsave1.45.5-2ubuntu1 lsb-base11.1.0ubuntu2 @@ -217,7 +217,7 @@ mount2.34-0.1ubuntu9.3 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 netpbm2:10.0-15.3build1 -openssl1.1.1f-1ubuntu2.10 +openssl1.1.1f-1ubuntu2.11 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From caa3b3d1623ef10e4decfb77009f657ef6c1b8c3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 12 Mar 2022 09:20:32 +0100 Subject: [PATCH 079/248] 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 d77dc7e71..9a9586146 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -77,7 +77,7 @@ libdbus-1-31.12.16-2ubuntu2.1 libdebconfclient00.251ubuntu1 libdjvulibre213.5.27.1-14ubuntu0.1 libdjvulibre-text3.5.27.1-14ubuntu0.1 -libexpat12.2.9-1ubuntu0.2 +libexpat12.2.9-1ubuntu0.4 libext2fs21.45.5-2ubuntu1 libfdisk12.34-0.1ubuntu9.3 libffi73.3-4 From 92a2cfce83ef4efb777905a973071cc01cea73e1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Mar 2022 04:45:35 -0500 Subject: [PATCH 080/248] 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 9a9586146..302f3cff0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -202,7 +202,7 @@ libxcomposite11:0.4.5-1 libxdmcp61:1.1.3-0ubuntu1 libxext62:1.3.4-0ubuntu1 libxi62:1.7.10-0ubuntu1 -libxml22.9.10+dfsg-5ubuntu0.20.04.1 +libxml22.9.10+dfsg-5ubuntu0.20.04.2 libxrandr22:1.5.2-0ubuntu1 libxrender11:0.9.10-1 libxslt1.11.1.34-4 From e9f19f37b9537539233aaa69619eedf78b0f354d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 22 Mar 2022 04:45:27 -0500 Subject: [PATCH 081/248] 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 302f3cff0..abf640ffe 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -177,7 +177,7 @@ libsmartcols12.34-0.1ubuntu9.3 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.11 +libssl1.11.1.1f-1ubuntu2.12 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 @@ -217,7 +217,7 @@ mount2.34-0.1ubuntu9.3 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 netpbm2:10.0-15.3build1 -openssl1.1.1f-1ubuntu2.11 +openssl1.1.1f-1ubuntu2.12 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 @@ -234,7 +234,7 @@ sed4.7-1 sensible-utils0.0.12+nmu1 shared-mime-info1.15-1 sysvinit-utils2.96-2.1ubuntu1 -tar1.30+dfsg-7ubuntu0.20.04.1 +tar1.30+dfsg-7ubuntu0.20.04.2 tzdata2021e-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 ucf3.0038+nmu1 From 6b29b6477a2b1ec19be0cece5a0136be33806ee1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 28 Mar 2022 07:24:55 -0500 Subject: [PATCH 082/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index abf640ffe..99ca0c4d5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -159,8 +159,8 @@ libpixman-1-00.38.4-0ubuntu1 libpng16-161.6.37-2 libprocps82:3.3.16-1ubuntu2.3 libpsl50.21.0-1ubuntu1 -libpython3.8-minimal3.8.10-0ubuntu1~20.04.2 -libpython3.8-stdlib3.8.10-0ubuntu1~20.04.2 +libpython3.8-minimal3.8.10-0ubuntu1~20.04.4 +libpython3.8-stdlib3.8.10-0ubuntu1~20.04.4 libpython3-stdlib3.8.2-0ubuntu2 libreadline88.0-4 libroken18-heimdal7.7.0+dfsg-1ubuntu1 @@ -225,8 +225,8 @@ poppler-data0.4.9-2 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 python33.8.2-0ubuntu2 -python3.83.8.10-0ubuntu1~20.04.2 -python3.8-minimal3.8.10-0ubuntu1~20.04.2 +python3.83.8.10-0ubuntu1~20.04.4 +python3.8-minimal3.8.10-0ubuntu1~20.04.4 python3-minimal3.8.2-0ubuntu2 python3-pkg-resources45.2.0-1 readline-common8.0-4 From 584b9a4892b0803a6467c309a80df3885c53f55f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 29 Mar 2022 04:45:26 -0500 Subject: [PATCH 083/248] 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 99ca0c4d5..314d539e8 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -235,7 +235,7 @@ sensible-utils0.0.12+nmu1 shared-mime-info1.15-1 sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.2 -tzdata2021e-0ubuntu0.20.04 +tzdata2022a-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 ucf3.0038+nmu1 unrar1:5.6.6-2build1 From c448ef17c594be65ce2ceeb0e39e5375b21766b9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 2 Apr 2022 05:15:27 -0500 Subject: [PATCH 084/248] 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 314d539e8..033513954 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -242,4 +242,4 @@ unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.3 xdg-user-dirs0.17-2ubuntu1 xz-utils5.2.4-1ubuntu1 -zlib1g1:1.2.11.dfsg-2ubuntu1.2 +zlib1g1:1.2.11.dfsg-2ubuntu1.3 From ae064daa9ec0e734a7e58f92433138ce8544265b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 11 Apr 2022 20:22:27 +0200 Subject: [PATCH 085/248] 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 033513954..019b2c57d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -84,7 +84,7 @@ libffi73.3-4 libfftw3-double33.3.8-2ubuntu1 libfontconfig12.13.1-2ubuntu3 libfreetype62.10.1-2ubuntu0.1 -libfribidi01.0.8-2 +libfribidi01.0.8-2ubuntu0.1 libgcc-s110.3.0-1ubuntu1~20.04 libgcrypt201.8.5-5ubuntu1.1 libglib2.0-02.64.6-1~ubuntu20.04.4 From 206195ccd8e0d6fc2a5f12d1cd3a8655fdfd4d45 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 13 Apr 2022 19:24:16 +0200 Subject: [PATCH 086/248] 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 019b2c57d..dbeddad4a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -241,5 +241,5 @@ ucf3.0038+nmu1 unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.3 xdg-user-dirs0.17-2ubuntu1 -xz-utils5.2.4-1ubuntu1 +xz-utils5.2.4-1ubuntu1.1 zlib1g1:1.2.11.dfsg-2ubuntu1.3 From fa7addc1299ae2a6cf48abd6b8df58cb8adc5bb2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 30 Apr 2022 04:11:09 -0500 Subject: [PATCH 087/248] Bot Updating Templated Files --- Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index aa20ed493..59aa30138 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -353,9 +353,11 @@ pipeline { 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, removing Unraid template" - git rm unraid/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Removing Deprecated Unraid Template' || : + 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 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 From acb0f44bd890f8b4430b94eb738700c35604d651 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 30 Apr 2022 11:12:22 +0200 Subject: [PATCH 088/248] Bot Updating Templated Files --- README.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index c7a821b27..3afad3068 100644 --- a/README.md +++ b/README.md @@ -48,26 +48,26 @@ This software is a fork of library and licensed under the GPL v3 License. ## Supported Architectures -Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). +We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). -Simply pulling `lscr.io/linuxserver/calibre-web` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. +Simply pulling `lscr.io/linuxserver/calibre-web:nightly` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. The architectures supported by this image are: -| Architecture | Tag | -| :----: | --- | -| x86-64 | amd64-latest | -| arm64 | arm64v8-latest | -| armhf | arm32v7-latest | +| Architecture | Available | Tag | +| :----: | :----: | ---- | +| x86-64 | ✅ | amd64-\ | +| arm64 | ✅ | arm64v8-\ | +| armhf| ✅ | arm32v7-\ | ## Version Tags -This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. +This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags. -| Tag | Description | -| :----: | --- | -| latest | Releases of Calibre-Web | -| nightly | Commits to the master branch of Calibre-Web | +| Tag | Available | Description | +| :----: | :----: |--- | +| latest | ✅ | Releases of Calibre-Web | +| nightly | ✅ | Commits to the master branch of Calibre-Web | ## Application Setup @@ -109,7 +109,7 @@ Here are some example snippets to help you get started creating a container. version: "2.1" services: calibre-web: - image: lscr.io/linuxserver/calibre-web + image: lscr.io/linuxserver/calibre-web:nightly container_name: calibre-web environment: - PUID=1000 @@ -137,7 +137,7 @@ docker run -d \ -v /path/to/data:/config \ -v /path/to/calibre/library:/books \ --restart unless-stopped \ - lscr.io/linuxserver/calibre-web + lscr.io/linuxserver/calibre-web:nightly ``` ## Parameters @@ -197,7 +197,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to * container version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' calibre-web` * image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/calibre-web` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/calibre-web:nightly` ## Updating Info @@ -215,7 +215,7 @@ Below are the instructions for updating containers: ### Via Docker Run -* Update the image: `docker pull lscr.io/linuxserver/calibre-web` +* Update the image: `docker pull lscr.io/linuxserver/calibre-web:nightly` * Stop the running container: `docker stop calibre-web` * Delete the container: `docker rm calibre-web` * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) @@ -250,7 +250,7 @@ cd docker-calibre-web docker build \ --no-cache \ --pull \ - -t lscr.io/linuxserver/calibre-web:latest . + -t lscr.io/linuxserver/calibre-web:nightly . ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` From 0df65dd7399a09994a46741a9cdbf53ccbc7e169 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 2 May 2022 11:16:48 -0500 Subject: [PATCH 089/248] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 59aa30138..f745b6957 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -355,7 +355,7 @@ pipeline { 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 unraid/${CONTAINER_NAME}.xml + 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 From eb178b729c8af8ee312a255f59e11b9a8216a157 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 3 May 2022 04:47:23 -0500 Subject: [PATCH 090/248] 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 dbeddad4a..54ef5d9b8 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bsdutils1:2.34-0.1ubuntu9.3 bzip21.0.8-2 ca-certificates20210119~20.04.2 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.7 +curl7.68.0-1ubuntu2.10 dash0.5.10.2-6 dbus1.12.16-2ubuntu2.1 debconf1.5.73 @@ -70,7 +70,7 @@ libc-bin2.31-0ubuntu9.7 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 libcups22.3.1-9ubuntu1.1 -libcurl47.68.0-1ubuntu2.7 +libcurl47.68.0-1ubuntu2.10 libdatrie10.2.12-3 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdbus-1-31.12.16-2ubuntu2.1 From 511386a1b8b0702b30715c05e40819310f7beb05 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 9 May 2022 13:23:03 -0500 Subject: [PATCH 091/248] 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 54ef5d9b8..1095f2f56 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ ca-certificates20210119~20.04.2 coreutils8.30-3ubuntu2 curl7.68.0-1ubuntu2.10 dash0.5.10.2-6 -dbus1.12.16-2ubuntu2.1 +dbus1.12.16-2ubuntu2.2 debconf1.5.73 debianutils4.9.1 diffutils1:3.7-3 @@ -73,7 +73,7 @@ libcups22.3.1-9ubuntu1.1 libcurl47.68.0-1ubuntu2.10 libdatrie10.2.12-3 libdb5.35.3.28+dfsg1-0.6ubuntu2 -libdbus-1-31.12.16-2ubuntu2.1 +libdbus-1-31.12.16-2ubuntu2.2 libdebconfclient00.251ubuntu1 libdjvulibre213.5.27.1-14ubuntu0.1 libdjvulibre-text3.5.27.1-14ubuntu0.1 From 6dafdef435e8168a39ba056fda9a193e12b37b40 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 10 May 2022 04:47:27 -0500 Subject: [PATCH 092/248] 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 1095f2f56..edf66b887 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -174,10 +174,10 @@ libsemanage13.0-1build2 libsemanage-common3.0-1build2 libsepol13.0-1 libsmartcols12.34-0.1ubuntu9.3 -libsqlite3-03.31.1-4ubuntu0.2 +libsqlite3-03.31.1-4ubuntu0.3 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.12 +libssl1.11.1.1f-1ubuntu2.13 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 @@ -217,7 +217,7 @@ mount2.34-0.1ubuntu9.3 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 netpbm2:10.0-15.3build1 -openssl1.1.1f-1ubuntu2.12 +openssl1.1.1f-1ubuntu2.13 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From 64d37553460a250cd804e21723886e0779423384 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 17 May 2022 04:48:25 -0500 Subject: [PATCH 093/248] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index edf66b887..f50f5c16f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bsdutils1:2.34-0.1ubuntu9.3 bzip21.0.8-2 ca-certificates20210119~20.04.2 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.10 +curl7.68.0-1ubuntu2.11 dash0.5.10.2-6 dbus1.12.16-2ubuntu2.2 debconf1.5.73 @@ -63,14 +63,14 @@ libblkid12.34-0.1ubuntu9.3 libbrotli11.0.7-6ubuntu0.1 libbsd00.10.0-1 libbz2-1.01.0.8-2 -libc62.31-0ubuntu9.7 +libc62.31-0ubuntu9.9 libcairo21.16.0-4ubuntu1 libcap-ng00.7.9-2.1build1 libc-bin2.31-0ubuntu9.7 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 libcups22.3.1-9ubuntu1.1 -libcurl47.68.0-1ubuntu2.10 +libcurl47.68.0-1ubuntu2.11 libdatrie10.2.12-3 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdbus-1-31.12.16-2ubuntu2.2 @@ -140,7 +140,7 @@ libnettle73.5.1+really3.5.1-2ubuntu0.2 libnghttp2-141.40.0-1build1 libnpth01.6-1 libnspr42:4.25-1 -libnss32:3.49.1-1ubuntu1.6 +libnss32:3.49.1-1ubuntu1.7 libopenexr242.3.0-6ubuntu0.5 libopenjp2-72.3.1-1ubuntu4.20.04.1 libp11-kit00.23.20-1ubuntu0.1 @@ -183,7 +183,7 @@ libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 libthai00.1.28-3 libthai-data0.1.28-3 -libtiff54.1.0+git191117-2ubuntu0.20.04.2 +libtiff54.1.0+git191117-2ubuntu0.20.04.3 libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.15 libunistring20.9.10-2 @@ -202,12 +202,12 @@ libxcomposite11:0.4.5-1 libxdmcp61:1.1.3-0ubuntu1 libxext62:1.3.4-0ubuntu1 libxi62:1.7.10-0ubuntu1 -libxml22.9.10+dfsg-5ubuntu0.20.04.2 +libxml22.9.10+dfsg-5ubuntu0.20.04.3 libxrandr22:1.5.2-0ubuntu1 libxrender11:0.9.10-1 libxslt1.11.1.34-4 libzstd11.4.4+dfsg-3ubuntu0.1 -locales2.31-0ubuntu9.7 +locales2.31-0ubuntu9.9 login1:4.8.1-1ubuntu5.20.04.1 logsave1.45.5-2ubuntu1 lsb-base11.1.0ubuntu2 From 9afe8ebf4d11abb48d182ef02d8c93a9e2eac375 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 21 May 2022 23:15:03 +0200 Subject: [PATCH 094/248] 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 f50f5c16f..e67047792 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -120,7 +120,7 @@ libkrb5-31.17-6ubuntu4.1 libkrb5support01.17-6ubuntu4.1 libksba81.3.5-2 liblcms2-22.9-4 -libldap-2.4-22.4.49+dfsg-2ubuntu1.8 +libldap-2.4-22.4.49+dfsg-2ubuntu1.9 libldap-common2.4.49+dfsg-2ubuntu1.8 liblqr-1-00.4.2-2.1 libltdl72.4.6-14 From 8ac06768c9fecfe9b68efe32d5be7327b49f20e1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 24 May 2022 04:48:15 -0500 Subject: [PATCH 095/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e67047792..21db1803b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ adduser3.118ubuntu2 -apt2.0.6 -apt-utils2.0.6 +apt2.0.8 +apt-utils2.0.8 base-files11ubuntu5.5 base-passwd3.5.47 bash5.0-6ubuntu1.1 @@ -50,7 +50,7 @@ init-system-helpers1.57 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 libapparmor12.13.3-7ubuntu5.1 -libapt-pkg6.02.0.6 +libapt-pkg6.02.0.8 libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 libassuan02.5.3-7ubuntu2 libattr11:2.4.48-5 @@ -121,7 +121,7 @@ libkrb5support01.17-6ubuntu4.1 libksba81.3.5-2 liblcms2-22.9-4 libldap-2.4-22.4.49+dfsg-2ubuntu1.9 -libldap-common2.4.49+dfsg-2ubuntu1.8 +libldap-common2.4.49+dfsg-2ubuntu1.9 liblqr-1-00.4.2-2.1 libltdl72.4.6-14 liblz4-11.9.2-2ubuntu0.20.04.1 From 4767567636ea392a4264a0b636433a7e2afff4da Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 31 May 2022 12:33:17 -0500 Subject: [PATCH 096/248] 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 21db1803b..ce15a1791 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -69,7 +69,7 @@ libcap-ng00.7.9-2.1build1 libc-bin2.31-0ubuntu9.7 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 -libcups22.3.1-9ubuntu1.1 +libcups22.3.1-9ubuntu1.2 libcurl47.68.0-1ubuntu2.11 libdatrie10.2.12-3 libdb5.35.3.28+dfsg1-0.6ubuntu2 From 9a65cb8fe74c2230d49a87301a8b81dcd4c9414f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 7 Jun 2022 04:45:19 -0500 Subject: [PATCH 097/248] 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 ce15a1791..2bb1809e6 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -114,7 +114,7 @@ libjbig2dec00.18-1ubuntu1 libjpeg88c-2ubuntu8 libjpeg-turbo82.0.3-0ubuntu1.20.04.1 libk5crypto31.17-6ubuntu4.1 -libkeyutils11.6-6ubuntu1 +libkeyutils11.6-6ubuntu1.1 libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1 libkrb5-31.17-6ubuntu4.1 libkrb5support01.17-6ubuntu4.1 From 70822443cf2f0c44e340912208bb17b9284276b7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 14 Jun 2022 11:49:08 +0200 Subject: [PATCH 098/248] 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 2bb1809e6..198a42670 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ base-passwd3.5.47 bash5.0-6ubuntu1.1 bsdutils1:2.34-0.1ubuntu9.3 bzip21.0.8-2 -ca-certificates20210119~20.04.2 +ca-certificates20211016~20.04.1 coreutils8.30-3ubuntu2 curl7.68.0-1ubuntu2.11 dash0.5.10.2-6 From 037dbb2378c59b4b6c1a215182bb5cdd58601d7e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 21 Jun 2022 14:17:16 +0200 Subject: [PATCH 099/248] 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 198a42670..6207a150c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ adduser3.118ubuntu2 -apt2.0.8 -apt-utils2.0.8 +apt2.0.9 +apt-utils2.0.9 base-files11ubuntu5.5 base-passwd3.5.47 bash5.0-6ubuntu1.1 @@ -50,7 +50,7 @@ init-system-helpers1.57 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 libapparmor12.13.3-7ubuntu5.1 -libapt-pkg6.02.0.8 +libapt-pkg6.02.0.9 libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 libassuan02.5.3-7ubuntu2 libattr11:2.4.48-5 From c8200d825a921057d5141c6ca40e0c460763e75c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 28 Jun 2022 11:46:53 +0200 Subject: [PATCH 100/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6207a150c..1a63c1af3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bsdutils1:2.34-0.1ubuntu9.3 bzip21.0.8-2 ca-certificates20211016~20.04.1 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.11 +curl7.68.0-1ubuntu2.12 dash0.5.10.2-6 dbus1.12.16-2ubuntu2.2 debconf1.5.73 @@ -70,7 +70,7 @@ libc-bin2.31-0ubuntu9.7 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 libcups22.3.1-9ubuntu1.2 -libcurl47.68.0-1ubuntu2.11 +libcurl47.68.0-1ubuntu2.12 libdatrie10.2.12-3 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdbus-1-31.12.16-2ubuntu2.2 @@ -177,7 +177,7 @@ libsmartcols12.34-0.1ubuntu9.3 libsqlite3-03.31.1-4ubuntu0.3 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.13 +libssl1.11.1.1f-1ubuntu2.15 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 @@ -217,7 +217,7 @@ mount2.34-0.1ubuntu9.3 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 netpbm2:10.0-15.3build1 -openssl1.1.1f-1ubuntu2.13 +openssl1.1.1f-1ubuntu2.15 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From 79ea3de2e59b24a2077375bbb7a8da5d8e07024e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 12 Jul 2022 11:50:01 +0200 Subject: [PATCH 101/248] Bot Updating Package Versions --- package_versions.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1a63c1af3..49898f36c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,7 +14,7 @@ dbus1.12.16-2ubuntu2.2 debconf1.5.73 debianutils4.9.1 diffutils1:3.7-3 -dirmngr2.2.19-3ubuntu2.1 +dirmngr2.2.19-3ubuntu2.2 dpkg1.19.7ubuntu3 e2fsprogs1.45.5-2ubuntu1 fdisk2.34-0.1ubuntu9.3 @@ -28,16 +28,16 @@ fonts-noto-mono20200323-1build1~ubuntu20.04.1 fonts-urw-base3520170801.1-3 gcc-10-base10.3.0-1ubuntu1~20.04 ghostscript9.50~dfsg-5ubuntu4.5 -gnupg2.2.19-3ubuntu2.1 -gnupg-l10n2.2.19-3ubuntu2.1 -gnupg-utils2.2.19-3ubuntu2.1 -gpg2.2.19-3ubuntu2.1 -gpg-agent2.2.19-3ubuntu2.1 -gpgconf2.2.19-3ubuntu2.1 -gpgsm2.2.19-3ubuntu2.1 -gpgv2.2.19-3ubuntu2.1 -gpg-wks-client2.2.19-3ubuntu2.1 -gpg-wks-server2.2.19-3ubuntu2.1 +gnupg2.2.19-3ubuntu2.2 +gnupg-l10n2.2.19-3ubuntu2.2 +gnupg-utils2.2.19-3ubuntu2.2 +gpg2.2.19-3ubuntu2.2 +gpg-agent2.2.19-3ubuntu2.2 +gpgconf2.2.19-3ubuntu2.2 +gpgsm2.2.19-3ubuntu2.2 +gpgv2.2.19-3ubuntu2.2 +gpg-wks-client2.2.19-3ubuntu2.2 +gpg-wks-server2.2.19-3ubuntu2.2 grep3.4-1 gsfonts1:8.11+urwcyr1.0.7~pre44-4.4 gzip1.10-0ubuntu4 @@ -140,7 +140,7 @@ libnettle73.5.1+really3.5.1-2ubuntu0.2 libnghttp2-141.40.0-1build1 libnpth01.6-1 libnspr42:4.25-1 -libnss32:3.49.1-1ubuntu1.7 +libnss32:3.49.1-1ubuntu1.8 libopenexr242.3.0-6ubuntu0.5 libopenjp2-72.3.1-1ubuntu4.20.04.1 libp11-kit00.23.20-1ubuntu0.1 @@ -177,7 +177,7 @@ libsmartcols12.34-0.1ubuntu9.3 libsqlite3-03.31.1-4ubuntu0.3 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.15 +libssl1.11.1.1f-1ubuntu2.16 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 @@ -217,7 +217,7 @@ mount2.34-0.1ubuntu9.3 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 netpbm2:10.0-15.3build1 -openssl1.1.1f-1ubuntu2.15 +openssl1.1.1f-1ubuntu2.16 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From 2dc08703aa61f911c31f4c1fc112788d95491bb2 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 15 Jul 2022 22:28:10 +0100 Subject: [PATCH 102/248] Update nightly readme with new mod location --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index d0a857546..1621a4f94 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -28,7 +28,7 @@ param_container_name: "{{ project_name }}" param_usage_include_env: true param_env_vars: - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } - - { env_var: "DOCKER_MODS", env_value: "linuxserver/calibre-web:calibre", desc: "#optional & **x86-64 only** Adds the ability to perform ebook conversion"} + - { env_var: "DOCKER_MODS", env_value: "linuxserver/mods:universal-calibre", desc: "#optional & **x86-64 only** Adds the ability to perform ebook conversion"} param_usage_include_vols: true param_volumes: - { vol_path: "/config", vol_host_path: "/path/to/data", desc: "Where calibre-web stores the internal database and config." } From 7a420d2db7cd7934acdeb82e832c7ede0a8b603b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 16 Jul 2022 01:52:02 +0200 Subject: [PATCH 103/248] Bot Updating Templated Files --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3afad3068..75239d514 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ services: - PUID=1000 - PGID=1000 - TZ=Europe/London - - DOCKER_MODS=linuxserver/calibre-web:calibre + - DOCKER_MODS=linuxserver/mods:universal-calibre volumes: - /path/to/data:/config - /path/to/calibre/library:/books @@ -132,7 +132,7 @@ docker run -d \ -e PUID=1000 \ -e PGID=1000 \ -e TZ=Europe/London \ - -e DOCKER_MODS=linuxserver/calibre-web:calibre \ + -e DOCKER_MODS=linuxserver/mods:universal-calibre \ -p 8083:8083 \ -v /path/to/data:/config \ -v /path/to/calibre/library:/books \ @@ -150,7 +150,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-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 DOCKER_MODS=linuxserver/calibre-web:calibre` | #optional & **x86-64 only** Adds the ability to perform ebook conversion | +| `-e DOCKER_MODS=linuxserver/mods:universal-calibre` | #optional & **x86-64 only** Adds the ability to perform ebook conversion | | `-v /config` | Where calibre-web stores the internal database and config. | | `-v /books` | Where your preexisting calibre database is locate. | From cb81e221381caf1d802d498511d0589338145134 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 16 Jul 2022 01:56:48 +0200 Subject: [PATCH 104/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 49898f36c..7309bf58d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -159,8 +159,8 @@ libpixman-1-00.38.4-0ubuntu1 libpng16-161.6.37-2 libprocps82:3.3.16-1ubuntu2.3 libpsl50.21.0-1ubuntu1 -libpython3.8-minimal3.8.10-0ubuntu1~20.04.4 -libpython3.8-stdlib3.8.10-0ubuntu1~20.04.4 +libpython3.8-minimal3.8.10-0ubuntu1~20.04.5 +libpython3.8-stdlib3.8.10-0ubuntu1~20.04.5 libpython3-stdlib3.8.2-0ubuntu2 libreadline88.0-4 libroken18-heimdal7.7.0+dfsg-1ubuntu1 @@ -225,8 +225,8 @@ poppler-data0.4.9-2 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 python33.8.2-0ubuntu2 -python3.83.8.10-0ubuntu1~20.04.4 -python3.8-minimal3.8.10-0ubuntu1~20.04.4 +python3.83.8.10-0ubuntu1~20.04.5 +python3.8-minimal3.8.10-0ubuntu1~20.04.5 python3-minimal3.8.2-0ubuntu2 python3-pkg-resources45.2.0-1 readline-common8.0-4 From 0ceb4300d1843cfecdb1b723a649bad54931c4f8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 23 Jul 2022 08:17:57 +0200 Subject: [PATCH 105/248] 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 7309bf58d..f3c58739e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -83,7 +83,7 @@ libfdisk12.34-0.1ubuntu9.3 libffi73.3-4 libfftw3-double33.3.8-2ubuntu1 libfontconfig12.13.1-2ubuntu3 -libfreetype62.10.1-2ubuntu0.1 +libfreetype62.10.1-2ubuntu0.2 libfribidi01.0.8-2ubuntu0.1 libgcc-s110.3.0-1ubuntu1~20.04 libgcrypt201.8.5-5ubuntu1.1 @@ -98,7 +98,7 @@ libgs99.50~dfsg-5ubuntu4.5 libgs9-common9.50~dfsg-5ubuntu4.5 libgssapi3-heimdal7.7.0+dfsg-1ubuntu1 libgssapi-krb5-21.17-6ubuntu4.1 -libharfbuzz0b2.6.4-1ubuntu4 +libharfbuzz0b2.6.4-1ubuntu4.2 libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1 libheimbase1-heimdal7.7.0+dfsg-1ubuntu1 libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 From fac959e5e98aa104a9325600ee3515bf055315c6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 9 Aug 2022 11:47:50 +0200 Subject: [PATCH 106/248] 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 f3c58739e..4fa938bcd 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -202,7 +202,7 @@ libxcomposite11:0.4.5-1 libxdmcp61:1.1.3-0ubuntu1 libxext62:1.3.4-0ubuntu1 libxi62:1.7.10-0ubuntu1 -libxml22.9.10+dfsg-5ubuntu0.20.04.3 +libxml22.9.10+dfsg-5ubuntu0.20.04.4 libxrandr22:1.5.2-0ubuntu1 libxrender11:0.9.10-1 libxslt1.11.1.34-4 From 50084c2e92a2f2a9b52c9c06701949cc7df839cf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 23 Aug 2022 04:46:47 -0500 Subject: [PATCH 107/248] 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 4fa938bcd..64bcc259b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -205,7 +205,7 @@ libxi62:1.7.10-0ubuntu1 libxml22.9.10+dfsg-5ubuntu0.20.04.4 libxrandr22:1.5.2-0ubuntu1 libxrender11:0.9.10-1 -libxslt1.11.1.34-4 +libxslt1.11.1.34-4ubuntu0.20.04.1 libzstd11.4.4+dfsg-3ubuntu0.1 locales2.31-0ubuntu9.9 login1:4.8.1-1ubuntu5.20.04.1 From aa45c18cc6bc3e8c3cbbbcc5335bfbfe2e6deaea Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 6 Sep 2022 04:48:27 -0500 Subject: [PATCH 108/248] 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 64bcc259b..70a515080 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bsdutils1:2.34-0.1ubuntu9.3 bzip21.0.8-2 ca-certificates20211016~20.04.1 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.12 +curl7.68.0-1ubuntu2.13 dash0.5.10.2-6 dbus1.12.16-2ubuntu2.2 debconf1.5.73 @@ -70,7 +70,7 @@ libc-bin2.31-0ubuntu9.7 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 libcups22.3.1-9ubuntu1.2 -libcurl47.68.0-1ubuntu2.12 +libcurl47.68.0-1ubuntu2.13 libdatrie10.2.12-3 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdbus-1-31.12.16-2ubuntu2.2 @@ -235,7 +235,7 @@ sensible-utils0.0.12+nmu1 shared-mime-info1.15-1 sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.2 -tzdata2022a-0ubuntu0.20.04 +tzdata2022c-0ubuntu0.20.04.0 ubuntu-keyring2020.02.11.4 ucf3.0038+nmu1 unrar1:5.6.6-2build1 From ad9dec82d66faf807ebb3d29c8e62717df6b31c4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 13 Sep 2022 11:52:04 +0200 Subject: [PATCH 109/248] 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 70a515080..1e4868863 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -183,7 +183,7 @@ libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 libthai00.1.28-3 libthai-data0.1.28-3 -libtiff54.1.0+git191117-2ubuntu0.20.04.3 +libtiff54.1.0+git191117-2ubuntu0.20.04.4 libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.15 libunistring20.9.10-2 From 94fb0e6bb9ac5e470cd3787a8f6d11d2a80e346e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 20 Sep 2022 04:50:57 -0500 Subject: [PATCH 110/248] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f745b6957..28b754cde 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -720,7 +720,7 @@ pipeline { -e DO_REGION="ams3" \ -e DO_BUCKET="lsio-ci" \ -t ghcr.io/linuxserver/ci:latest \ - python /ci/ci.py''' + python3 test_build.py''' } } } From 513b0f24a849cd2e0873feaf9fb7b7b877839712 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 20 Sep 2022 04:56:20 -0500 Subject: [PATCH 111/248] 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 1e4868863..ada0ad9aa 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -174,7 +174,7 @@ libsemanage13.0-1build2 libsemanage-common3.0-1build2 libsepol13.0-1 libsmartcols12.34-0.1ubuntu9.3 -libsqlite3-03.31.1-4ubuntu0.3 +libsqlite3-03.31.1-4ubuntu0.4 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 libssl1.11.1.1f-1ubuntu2.16 @@ -183,7 +183,7 @@ libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 libthai00.1.28-3 libthai-data0.1.28-3 -libtiff54.1.0+git191117-2ubuntu0.20.04.4 +libtiff54.1.0+git191117-2ubuntu0.20.04.5 libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.15 libunistring20.9.10-2 From a757bf3fee6c3433f0002226a6e64e2b2964b179 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 25 Sep 2022 13:19:32 -0500 Subject: [PATCH 112/248] 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 ada0ad9aa..96011ac4f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -112,7 +112,7 @@ libilmbase242.3.0-6build1 libjbig02.1-3.1build1 libjbig2dec00.18-1ubuntu1 libjpeg88c-2ubuntu8 -libjpeg-turbo82.0.3-0ubuntu1.20.04.1 +libjpeg-turbo82.0.3-0ubuntu1.20.04.3 libk5crypto31.17-6ubuntu4.1 libkeyutils11.6-6ubuntu1.1 libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1 From a31a190136d5d7ec492e662904ad11e750f82608 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 2 Oct 2022 04:26:55 -0500 Subject: [PATCH 113/248] 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 96011ac4f..232463010 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -27,7 +27,7 @@ fonts-droid-fallback1:6.0.1r16-1.1 fonts-noto-mono20200323-1build1~ubuntu20.04.1 fonts-urw-base3520170801.1-3 gcc-10-base10.3.0-1ubuntu1~20.04 -ghostscript9.50~dfsg-5ubuntu4.5 +ghostscript9.50~dfsg-5ubuntu4.6 gnupg2.2.19-3ubuntu2.2 gnupg-l10n2.2.19-3ubuntu2.2 gnupg-utils2.2.19-3ubuntu2.2 @@ -94,8 +94,8 @@ libgnutls303.6.13-2ubuntu1.6 libgomp110.3.0-1ubuntu1~20.04 libgpg-error01.37-1 libgraphite2-31.3.13-11build1 -libgs99.50~dfsg-5ubuntu4.5 -libgs9-common9.50~dfsg-5ubuntu4.5 +libgs99.50~dfsg-5ubuntu4.6 +libgs9-common9.50~dfsg-5ubuntu4.6 libgssapi3-heimdal7.7.0+dfsg-1ubuntu1 libgssapi-krb5-21.17-6ubuntu4.1 libharfbuzz0b2.6.4-1ubuntu4.2 From c57b3666a884f7c3fd02462b89d0aeff7ec9d651 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 11 Oct 2022 11:57:55 +0200 Subject: [PATCH 114/248] 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 232463010..c8e708dee 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -242,4 +242,4 @@ unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.3 xdg-user-dirs0.17-2ubuntu1 xz-utils5.2.4-1ubuntu1.1 -zlib1g1:1.2.11.dfsg-2ubuntu1.3 +zlib1g1:1.2.11.dfsg-2ubuntu1.4 From 607188d6a19df97bd480a6fdca5e0429268d58fa Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 18 Oct 2022 05:01:20 -0500 Subject: [PATCH 115/248] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c8e708dee..38a8c3bf0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -51,7 +51,7 @@ krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 libapparmor12.13.3-7ubuntu5.1 libapt-pkg6.02.0.9 -libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 +libasn1-8-heimdal7.7.0+dfsg-1ubuntu1.1 libassuan02.5.3-7ubuntu2 libattr11:2.4.48-5 libaudit11:2.8.5-2ubuntu6 @@ -96,14 +96,14 @@ libgpg-error01.37-1 libgraphite2-31.3.13-11build1 libgs99.50~dfsg-5ubuntu4.6 libgs9-common9.50~dfsg-5ubuntu4.6 -libgssapi3-heimdal7.7.0+dfsg-1ubuntu1 +libgssapi3-heimdal7.7.0+dfsg-1ubuntu1.1 libgssapi-krb5-21.17-6ubuntu4.1 libharfbuzz0b2.6.4-1ubuntu4.2 -libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1 -libheimbase1-heimdal7.7.0+dfsg-1ubuntu1 -libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 +libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1.1 +libheimbase1-heimdal7.7.0+dfsg-1ubuntu1.1 +libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1.1 libhogweed53.5.1+really3.5.1-2ubuntu0.2 -libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 +libhx509-5-heimdal7.7.0+dfsg-1ubuntu1.1 libicu6666.1-2ubuntu2.1 libidn111.33-2.2ubuntu2 libidn2-02.2.0-2 @@ -115,7 +115,7 @@ libjpeg88c-2ubuntu8 libjpeg-turbo82.0.3-0ubuntu1.20.04.3 libk5crypto31.17-6ubuntu4.1 libkeyutils11.6-6ubuntu1.1 -libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1 +libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1.1 libkrb5-31.17-6ubuntu4.1 libkrb5support01.17-6ubuntu4.1 libksba81.3.5-2 @@ -163,7 +163,7 @@ libpython3.8-minimal3.8.10-0ubuntu1~20.04.5 libpython3.8-stdlib3.8.10-0ubuntu1~20.04.5 libpython3-stdlib3.8.2-0ubuntu2 libreadline88.0-4 -libroken18-heimdal7.7.0+dfsg-1ubuntu1 +libroken18-heimdal7.7.0+dfsg-1ubuntu1.1 librtmp12.4+20151223.gitfa8646d.1-2build1 libsasl2-22.1.27+dfsg-2ubuntu0.1 libsasl2-modules2.1.27+dfsg-2ubuntu0.1 @@ -190,7 +190,7 @@ libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.3 libwebp60.6.1-2ubuntu0.20.04.1 libwebpmux30.6.1-2ubuntu0.20.04.1 -libwind0-heimdal7.7.0+dfsg-1ubuntu1 +libwind0-heimdal7.7.0+dfsg-1ubuntu1.1 libwmf0.2-70.2.8.4-17ubuntu1 libx11-62:1.6.9-2ubuntu1.2 libx11-data2:1.6.9-2ubuntu1.2 @@ -242,4 +242,4 @@ unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.3 xdg-user-dirs0.17-2ubuntu1 xz-utils5.2.4-1ubuntu1.1 -zlib1g1:1.2.11.dfsg-2ubuntu1.4 +zlib1g1:1.2.11.dfsg-2ubuntu1.5 From 270a7ec7a108f86ee5e48cd98d73ac600e580167 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sat, 22 Oct 2022 11:56:19 -0400 Subject: [PATCH 116/248] rebase to jammy and s6v3, fix build deps --- Dockerfile | 23 +++++++++++-------- Dockerfile.aarch64 | 21 ++++++++--------- Dockerfile.armhf | 21 ++++++++--------- README.md | 1 + readme-vars.yml | 1 + .../dependencies.d/init-config | 0 .../s6-rc.d/init-calibre-web-config/run} | 0 .../s6-rc.d/init-calibre-web-config/type | 1 + .../s6-rc.d/init-calibre-web-config/up | 1 + .../dependencies.d/init-calibre-web-config | 0 .../dependencies.d/init-services | 0 .../s6-rc.d/svc-calibre-web/notification-fd | 1 + .../s6-overlay/s6-rc.d/svc-calibre-web/run | 5 ++++ .../s6-overlay/s6-rc.d/svc-calibre-web/type | 1 + .../user/contents.d/init-calibre-web-config | 0 .../s6-rc.d/user/contents.d/svc-calibre-web | 0 root/etc/services.d/calibre-web/run | 6 ----- 17 files changed, 44 insertions(+), 38 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/dependencies.d/init-config rename root/etc/{cont-init.d/30-config => s6-overlay/s6-rc.d/init-calibre-web-config/run} (100%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-calibre-web-config create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-calibre-web/dependencies.d/init-services create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-calibre-web/notification-fd create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-calibre-web/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-calibre-web/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-calibre-web-config create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-calibre-web delete mode 100644 root/etc/services.d/calibre-web/run diff --git a/Dockerfile b/Dockerfile index 56c2db2fd..dd255b42c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:focal +FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy + # set version label ARG BUILD_DATE @@ -10,22 +11,24 @@ LABEL maintainer="chbmb" RUN \ echo "**** install build packages ****" && \ apt-get update && \ - apt-get install -y \ + apt-get install -y --no-install-recommends \ + build-essential \ git \ libldap2-dev \ libsasl2-dev \ - python3-pip && \ + python3-dev && \ echo "**** install runtime packages ****" && \ - apt-get install -y \ + apt-get install -y --no-install-recommends \ imagemagick \ + libldap-2.5-0 \ libnss3 \ + libsasl2-2 \ libxcomposite1 \ libxi6 \ - libxslt1.1 \ - libldap-2.4-2 \ - libsasl2-2 \ libxrandr2 \ + libxslt1.1 \ python3-minimal \ + python3-pip \ python3-pkg-resources \ unrar && \ echo "**** install calibre-web ****" && \ @@ -43,7 +46,7 @@ RUN \ /app/calibre-web --strip-components=1 && \ cd /app/calibre-web && \ pip3 install --no-cache-dir -U \ - pip && \ + pip wheel && \ pip install --no-cache-dir -U --ignore-installed --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ requirements.txt -r \ optional-requirements.txt && \ @@ -56,11 +59,11 @@ RUN \ /usr/bin/kepubify -L \ https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-64bit && \ echo "**** cleanup ****" && \ - apt-get -y purge \ + build-essential \ git \ libldap2-dev \ libsasl2-dev \ - python3-pip && \ + python3-dev && \ apt-get -y autoremove && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5a2b9ef2c..cd3613f35 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy # set version label ARG BUILD_DATE @@ -10,9 +10,8 @@ LABEL maintainer="chbmb" RUN \ echo "**** install build packages ****" && \ apt-get update && \ - apt-get install -y \ - g++ \ - gcc \ + apt-get install -y --no-install-recommends \ + build-essential \ git \ libffi-dev \ libjpeg-dev \ @@ -20,12 +19,12 @@ RUN \ libsasl2-dev \ libxml2-dev \ libxslt1-dev \ - python3-pip \ + python3-dev \ zlib1g-dev && \ echo "**** install runtime packages ****" && \ - apt-get install -y \ + apt-get install -y --no-install-recommends \ imagemagick \ - libldap-2.4-2 \ + libldap-2.5-0 \ libnss3 \ libsasl2-2 \ libxcomposite1 \ @@ -33,6 +32,7 @@ RUN \ libxrandr2 \ libxslt1.1 \ python3-minimal \ + python3-pip \ python3-pkg-resources \ unrar && \ echo "**** install calibre-web ****" && \ @@ -50,7 +50,7 @@ RUN \ /app/calibre-web --strip-components=1 && \ cd /app/calibre-web && \ pip3 install --no-cache-dir -U \ - pip && \ + pip wheel && \ pip install --no-cache-dir -U --ignore-installed --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ requirements.txt -r \ optional-requirements.txt && \ @@ -64,8 +64,7 @@ RUN \ https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-arm64 && \ echo "**** cleanup ****" && \ apt-get -y purge \ - g++ \ - gcc \ + build-essential \ git \ libffi-dev \ libjpeg-dev \ @@ -73,7 +72,7 @@ RUN \ libsasl2-dev \ libxml2-dev \ libxslt1-dev \ - python3-pip \ + python3-dev \ zlib1g-dev && \ apt-get -y autoremove && \ rm -rf \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 460f5eeea..dd00acd4f 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy # set version label ARG BUILD_DATE @@ -10,9 +10,8 @@ LABEL maintainer="chbmb" RUN \ echo "**** install build packages ****" && \ apt-get update && \ - apt-get install -y \ - g++ \ - gcc \ + apt-get install -y --no-install-recommends \ + build-essential \ git \ libffi-dev \ libjpeg-dev \ @@ -21,13 +20,13 @@ RUN \ libssl-dev \ libxml2-dev \ libxslt1-dev \ - python3-pip \ + python3-dev \ rustc \ zlib1g-dev && \ echo "**** install runtime packages ****" && \ - apt-get install -y \ + apt-get install -y --no-install-recommends \ imagemagick \ - libldap-2.4-2 \ + libldap-2.5-0 \ libnss3 \ libsasl2-2 \ libxcomposite1 \ @@ -35,6 +34,7 @@ RUN \ libxrandr2 \ libxslt1.1 \ python3-minimal \ + python3-pip \ python3-pkg-resources \ unrar && \ echo "**** install calibre-web ****" && \ @@ -52,7 +52,7 @@ RUN \ /app/calibre-web --strip-components=1 && \ cd /app/calibre-web && \ pip3 install --no-cache-dir -U \ - pip && \ + pip wheel && \ pip install --no-cache-dir -U --ignore-installed --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ requirements.txt -r \ optional-requirements.txt && \ @@ -66,8 +66,7 @@ RUN \ https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-arm && \ echo "**** cleanup ****" && \ apt-get -y purge \ - g++ \ - gcc \ + build-essential \ git \ libffi-dev \ libjpeg-dev \ @@ -76,7 +75,7 @@ RUN \ libssl-dev \ libxml2-dev \ libxslt1-dev \ - python3-pip \ + python3-dev \ rustc \ zlib1g-dev && \ apt-get -y autoremove && \ diff --git a/README.md b/README.md index 75239d514..5df82b7fa 100644 --- a/README.md +++ b/README.md @@ -263,6 +263,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **22.10.22:** - Rebase to jammy. Upgrade to s6v3. Clean up build dependencies. * **04.11.21:** - Fix pip arguments * **10.02.21:** - Add libxrandr2 * **25.01.21:** - Add nightly tag diff --git a/readme-vars.yml b/readme-vars.yml index 1621a4f94..c093f3e0f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -77,6 +77,7 @@ app_setup_block: | # changelog changelogs: + - { date: "22.10.22:", desc: "Rebase to jammy. Upgrade to s6v3. Clean up build dependencies."} - { date: "04.11.21:", desc: "Fix pip arguments"} - { date: "10.02.21:", desc: "Add libxrandr2"} - { date: "25.01.21:", desc: "Add nightly tag"} diff --git a/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/dependencies.d/init-config new file mode 100644 index 000000000..e69de29bb diff --git a/root/etc/cont-init.d/30-config b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/cont-init.d/30-config rename to root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/type b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/type new file mode 100644 index 000000000..3d92b15f2 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/up b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/up new file mode 100644 index 000000000..7a022ec8e --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-calibre-web-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-calibre-web-config new file mode 100644 index 000000000..e69de29bb diff --git a/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/dependencies.d/init-services new file mode 100644 index 000000000..e69de29bb diff --git a/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/notification-fd new file mode 100644 index 000000000..e440e5c84 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/notification-fd @@ -0,0 +1 @@ +3 \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/run b/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/run new file mode 100755 index 000000000..3a2419164 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/run @@ -0,0 +1,5 @@ +#!/usr/bin/with-contenv bash + +exec \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8083" \ + cd /app/calibre-web s6-setuidgid abc python3 /app/calibre-web/cps.py diff --git a/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/type b/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/type new file mode 100644 index 000000000..1780f9f44 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-calibre-web-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-calibre-web-config new file mode 100644 index 000000000..e69de29bb diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-calibre-web b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-calibre-web new file mode 100644 index 000000000..e69de29bb diff --git a/root/etc/services.d/calibre-web/run b/root/etc/services.d/calibre-web/run deleted file mode 100644 index 98523a391..000000000 --- a/root/etc/services.d/calibre-web/run +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/with-contenv bash - -cd /app/calibre-web || exit - -exec \ - s6-setuidgid abc python3 /app/calibre-web/cps.py From 2f670f176e97ce423deb5df19fa2d1660d10efb8 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sat, 22 Oct 2022 12:03:07 -0400 Subject: [PATCH 117/248] fix typo --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dd255b42c..0ba2edf7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,7 +59,8 @@ RUN \ /usr/bin/kepubify -L \ https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-64bit && \ echo "**** cleanup ****" && \ - build-essential \ + apt-get -y purge \ + build-essential \ git \ libldap2-dev \ libsasl2-dev \ From f998e374146ad5999a6583f7bf994cdbe210648f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 22 Oct 2022 14:30:40 -0500 Subject: [PATCH 118/248] Bot Updating Package Versions --- package_versions.txt | 449 ++++++++++++++++++++----------------------- 1 file changed, 206 insertions(+), 243 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 38a8c3bf0..5bd639b46 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,245 +1,208 @@ -adduser3.118ubuntu2 -apt2.0.9 -apt-utils2.0.9 -base-files11ubuntu5.5 -base-passwd3.5.47 -bash5.0-6ubuntu1.1 -bsdutils1:2.34-0.1ubuntu9.3 -bzip21.0.8-2 -ca-certificates20211016~20.04.1 -coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.13 -dash0.5.10.2-6 -dbus1.12.16-2ubuntu2.2 -debconf1.5.73 -debianutils4.9.1 -diffutils1:3.7-3 -dirmngr2.2.19-3ubuntu2.2 -dpkg1.19.7ubuntu3 -e2fsprogs1.45.5-2ubuntu1 -fdisk2.34-0.1ubuntu9.3 -file1:5.38-4 -findutils4.7.0-1ubuntu1 -fontconfig2.13.1-2ubuntu3 -fontconfig-config2.13.1-2ubuntu3 -fonts-dejavu-core2.37-1 -fonts-droid-fallback1:6.0.1r16-1.1 -fonts-noto-mono20200323-1build1~ubuntu20.04.1 -fonts-urw-base3520170801.1-3 -gcc-10-base10.3.0-1ubuntu1~20.04 -ghostscript9.50~dfsg-5ubuntu4.6 -gnupg2.2.19-3ubuntu2.2 -gnupg-l10n2.2.19-3ubuntu2.2 -gnupg-utils2.2.19-3ubuntu2.2 -gpg2.2.19-3ubuntu2.2 -gpg-agent2.2.19-3ubuntu2.2 -gpgconf2.2.19-3ubuntu2.2 -gpgsm2.2.19-3ubuntu2.2 -gpgv2.2.19-3ubuntu2.2 -gpg-wks-client2.2.19-3ubuntu2.2 -gpg-wks-server2.2.19-3ubuntu2.2 -grep3.4-1 -gsfonts1:8.11+urwcyr1.0.7~pre44-4.4 -gzip1.10-0ubuntu4 +adduser3.118ubuntu5 +apt2.4.8 +apt-utils2.4.8 +base-files12ubuntu4.2 +base-passwd3.5.52build1 +bash5.1-6ubuntu1 +bsdutils1:2.37.2-4ubuntu3 +ca-certificates20211016 +coreutils8.32-4.1ubuntu1 +curl7.81.0-1ubuntu1.4 +dash0.5.11+git20210903+057cd650a4ed-3build1 +debconf1.5.79ubuntu1 +debianutils5.5-1ubuntu2 +diffutils1:3.8-0ubuntu2 +dirmngr2.2.27-3ubuntu2.1 +dpkg1.21.1ubuntu2.1 +e2fsprogs1.46.5-2ubuntu1.1 +findutils4.8.0-1ubuntu3 +fontconfig-config2.13.1-4.2ubuntu5 +fonts-dejavu-core2.37-2build1 +gcc-12-base12.1.0-2ubuntu1~22.04 +gnupg2.2.27-3ubuntu2.1 +gnupg-l10n2.2.27-3ubuntu2.1 +gnupg-utils2.2.27-3ubuntu2.1 +gpg2.2.27-3ubuntu2.1 +gpg-agent2.2.27-3ubuntu2.1 +gpgconf2.2.27-3ubuntu2.1 +gpgsm2.2.27-3ubuntu2.1 +gpgv2.2.27-3ubuntu2.1 +gpg-wks-client2.2.27-3ubuntu2.1 +gpg-wks-server2.2.27-3ubuntu2.1 +grep3.7-1build1 +gzip1.10-4ubuntu4.1 hicolor-icon-theme0.17-2 -hostname3.23 -imagemagick-6-common8:6.9.10.23+dfsg-2.1ubuntu11.4 -imagemagick-6.q168:6.9.10.23+dfsg-2.1ubuntu11.4 -imagemagick8:6.9.10.23+dfsg-2.1ubuntu11.4 -init-system-helpers1.57 -krb5-locales1.17-6ubuntu4.1 -libacl12.2.53-6 -libapparmor12.13.3-7ubuntu5.1 -libapt-pkg6.02.0.9 -libasn1-8-heimdal7.7.0+dfsg-1ubuntu1.1 -libassuan02.5.3-7ubuntu2 -libattr11:2.4.48-5 -libaudit11:2.8.5-2ubuntu6 -libaudit-common1:2.8.5-2ubuntu6 -libavahi-client30.7-4ubuntu7.1 -libavahi-common30.7-4ubuntu7.1 -libavahi-common-data0.7-4ubuntu7.1 -libblkid12.34-0.1ubuntu9.3 -libbrotli11.0.7-6ubuntu0.1 -libbsd00.10.0-1 -libbz2-1.01.0.8-2 -libc62.31-0ubuntu9.9 -libcairo21.16.0-4ubuntu1 -libcap-ng00.7.9-2.1build1 -libc-bin2.31-0ubuntu9.7 -libcom-err21.45.5-2ubuntu1 -libcrypt11:4.4.10-10ubuntu4 -libcups22.3.1-9ubuntu1.2 -libcurl47.68.0-1ubuntu2.13 -libdatrie10.2.12-3 -libdb5.35.3.28+dfsg1-0.6ubuntu2 -libdbus-1-31.12.16-2ubuntu2.2 -libdebconfclient00.251ubuntu1 -libdjvulibre213.5.27.1-14ubuntu0.1 -libdjvulibre-text3.5.27.1-14ubuntu0.1 -libexpat12.2.9-1ubuntu0.4 -libext2fs21.45.5-2ubuntu1 -libfdisk12.34-0.1ubuntu9.3 -libffi73.3-4 -libfftw3-double33.3.8-2ubuntu1 -libfontconfig12.13.1-2ubuntu3 -libfreetype62.10.1-2ubuntu0.2 -libfribidi01.0.8-2ubuntu0.1 -libgcc-s110.3.0-1ubuntu1~20.04 -libgcrypt201.8.5-5ubuntu1.1 -libglib2.0-02.64.6-1~ubuntu20.04.4 -libglib2.0-data2.64.6-1~ubuntu20.04.4 -libgmp102:6.2.0+dfsg-4 -libgnutls303.6.13-2ubuntu1.6 -libgomp110.3.0-1ubuntu1~20.04 -libgpg-error01.37-1 -libgraphite2-31.3.13-11build1 -libgs99.50~dfsg-5ubuntu4.6 -libgs9-common9.50~dfsg-5ubuntu4.6 -libgssapi3-heimdal7.7.0+dfsg-1ubuntu1.1 -libgssapi-krb5-21.17-6ubuntu4.1 -libharfbuzz0b2.6.4-1ubuntu4.2 -libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1.1 -libheimbase1-heimdal7.7.0+dfsg-1ubuntu1.1 -libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1.1 -libhogweed53.5.1+really3.5.1-2ubuntu0.2 -libhx509-5-heimdal7.7.0+dfsg-1ubuntu1.1 -libicu6666.1-2ubuntu2.1 -libidn111.33-2.2ubuntu2 -libidn2-02.2.0-2 -libijs-0.350.35-15 -libilmbase242.3.0-6build1 -libjbig02.1-3.1build1 -libjbig2dec00.18-1ubuntu1 -libjpeg88c-2ubuntu8 -libjpeg-turbo82.0.3-0ubuntu1.20.04.3 -libk5crypto31.17-6ubuntu4.1 -libkeyutils11.6-6ubuntu1.1 -libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1.1 -libkrb5-31.17-6ubuntu4.1 -libkrb5support01.17-6ubuntu4.1 -libksba81.3.5-2 -liblcms2-22.9-4 -libldap-2.4-22.4.49+dfsg-2ubuntu1.9 -libldap-common2.4.49+dfsg-2ubuntu1.9 +hostname3.23ubuntu2 +imagemagick-6-common8:6.9.11.60+dfsg-1.3build2 +imagemagick-6.q168:6.9.11.60+dfsg-1.3build2 +imagemagick8:6.9.11.60+dfsg-1.3build2 +init-system-helpers1.62 +jq1.6-2.1ubuntu3 +libacl12.3.1-1 +libaom33.3.0-1 +libapt-pkg6.02.4.8 +libassuan02.5.5-1build1 +libattr11:2.5.1-1build1 +libaudit11:3.0.7-1build1 +libaudit-common1:3.0.7-1build1 +libblkid12.37.2-4ubuntu3 +libbrotli11.0.9-2build6 +libbsd00.11.5-1 +libbz2-1.01.0.8-5build1 +libc62.35-0ubuntu3.1 +libcap21:2.44-1build3 +libcap-ng00.7.9-2.2build3 +libc-bin2.35-0ubuntu3.1 +libcom-err21.46.5-2ubuntu1.1 +libcrypt11:4.4.27-1 +libcurl47.81.0-1ubuntu1.4 +libdav1d50.9.2-1 +libdb5.35.3.28+dfsg1-0.8ubuntu3 +libde265-01.0.8-1 +libdebconfclient00.261ubuntu1 +libdeflate01.10-2 +libexpat12.4.7-1 +libext2fs21.46.5-2ubuntu1.1 +libffi83.4.2-4 +libfftw3-double33.3.8-2ubuntu8 +libfontconfig12.13.1-4.2ubuntu5 +libfreetype62.11.1+dfsg-1ubuntu0.1 +libgcc-s112.1.0-2ubuntu1~22.04 +libgcrypt201.9.4-3ubuntu3 +libglib2.0-02.72.1-1 +libgmp102:6.2.1+dfsg-3ubuntu1 +libgnutls303.7.3-4ubuntu1.1 +libgomp112.1.0-2ubuntu1~22.04 +libgpg-error01.43-3 +libgssapi-krb5-21.19.2-2 +libheif11.12.0-2build1 +libhogweed63.7.3-1build2 +libicu7070.1-2 +libidn2-02.3.2-2build1 +libjbig02.1-3.1build3 +libjpeg88c-2ubuntu10 +libjpeg-turbo82.1.2-0ubuntu1 +libjq11.6-2.1ubuntu3 +libk5crypto31.19.2-2 +libkeyutils11.6.1-2ubuntu3 +libkrb5-31.19.2-2 +libkrb5support01.19.2-2 +libksba81.6.0-2build1 +liblcms2-22.12~rc1-2build2 +libldap-2.5-02.5.13+dfsg-0ubuntu0.22.04.1 +libldap-common2.5.13+dfsg-0ubuntu0.22.04.1 liblqr-1-00.4.2-2.1 -libltdl72.4.6-14 -liblz4-11.9.2-2ubuntu0.20.04.1 -liblzma55.2.4-1ubuntu1 -libmagic11:5.38-4 -libmagickcore-6.q16-68:6.9.10.23+dfsg-2.1ubuntu11.4 -libmagickcore-6.q16-6-extra8:6.9.10.23+dfsg-2.1ubuntu11.4 -libmagickwand-6.q16-68:6.9.10.23+dfsg-2.1ubuntu11.4 -libmagic-mgc1:5.38-4 -libmount12.34-0.1ubuntu9.3 -libmpdec22.4.2-3 -libncurses66.2-0ubuntu2 -libncursesw66.2-0ubuntu2 -libnetpbm102:10.0-15.3build1 -libnettle73.5.1+really3.5.1-2ubuntu0.2 -libnghttp2-141.40.0-1build1 -libnpth01.6-1 -libnspr42:4.25-1 -libnss32:3.49.1-1ubuntu1.8 -libopenexr242.3.0-6ubuntu0.5 -libopenjp2-72.3.1-1ubuntu4.20.04.1 -libp11-kit00.23.20-1ubuntu0.1 -libpam0g1.3.1-5ubuntu4.3 -libpam-modules1.3.1-5ubuntu4.3 -libpam-modules-bin1.3.1-5ubuntu4.3 -libpam-runtime1.3.1-5ubuntu4.3 -libpango-1.0-01.44.7-2ubuntu4 -libpangocairo-1.0-01.44.7-2ubuntu4 -libpangoft2-1.0-01.44.7-2ubuntu4 -libpaper11.1.28 -libpaper-utils1.1.28 -libpcre2-8-010.34-7 -libpcre32:8.39-12build1 -libpixman-1-00.38.4-0ubuntu1 -libpng16-161.6.37-2 -libprocps82:3.3.16-1ubuntu2.3 -libpsl50.21.0-1ubuntu1 -libpython3.8-minimal3.8.10-0ubuntu1~20.04.5 -libpython3.8-stdlib3.8.10-0ubuntu1~20.04.5 -libpython3-stdlib3.8.2-0ubuntu2 -libreadline88.0-4 -libroken18-heimdal7.7.0+dfsg-1ubuntu1.1 -librtmp12.4+20151223.gitfa8646d.1-2build1 -libsasl2-22.1.27+dfsg-2ubuntu0.1 -libsasl2-modules2.1.27+dfsg-2ubuntu0.1 -libsasl2-modules-db2.1.27+dfsg-2ubuntu0.1 -libseccomp22.5.1-1ubuntu1~20.04.2 -libselinux13.0-1build2 -libsemanage13.0-1build2 -libsemanage-common3.0-1build2 -libsepol13.0-1 -libsmartcols12.34-0.1ubuntu9.3 -libsqlite3-03.31.1-4ubuntu0.4 -libss21.45.5-2ubuntu1 -libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.16 -libstdc++610.3.0-1ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.15 -libtasn1-64.16.0-2 -libthai00.1.28-3 -libthai-data0.1.28-3 -libtiff54.1.0+git191117-2ubuntu0.20.04.5 -libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.15 -libunistring20.9.10-2 -libuuid12.34-0.1ubuntu9.3 -libwebp60.6.1-2ubuntu0.20.04.1 -libwebpmux30.6.1-2ubuntu0.20.04.1 -libwind0-heimdal7.7.0+dfsg-1ubuntu1.1 -libwmf0.2-70.2.8.4-17ubuntu1 -libx11-62:1.6.9-2ubuntu1.2 -libx11-data2:1.6.9-2ubuntu1.2 -libxau61:1.0.9-0ubuntu1 -libxcb11.14-2 -libxcb-render01.14-2 -libxcb-shm01.14-2 -libxcomposite11:0.4.5-1 -libxdmcp61:1.1.3-0ubuntu1 -libxext62:1.3.4-0ubuntu1 -libxi62:1.7.10-0ubuntu1 -libxml22.9.10+dfsg-5ubuntu0.20.04.4 -libxrandr22:1.5.2-0ubuntu1 -libxrender11:0.9.10-1 -libxslt1.11.1.34-4ubuntu0.20.04.1 -libzstd11.4.4+dfsg-3ubuntu0.1 -locales2.31-0ubuntu9.9 -login1:4.8.1-1ubuntu5.20.04.1 -logsave1.45.5-2ubuntu1 -lsb-base11.1.0ubuntu2 -mawk1.3.4.20200120-2 -mime-support3.64ubuntu1 -mount2.34-0.1ubuntu9.3 -ncurses-base6.2-0ubuntu2 -ncurses-bin6.2-0ubuntu2 -netpbm2:10.0-15.3build1 -openssl1.1.1f-1ubuntu2.16 -passwd1:4.8.1-1ubuntu5.20.04.1 -perl-base5.30.0-9ubuntu0.2 -pinentry-curses1.1.0-3build1 -poppler-data0.4.9-2 -procps2:3.3.16-1ubuntu2.3 -publicsuffix20200303.0012-1 -python33.8.2-0ubuntu2 -python3.83.8.10-0ubuntu1~20.04.5 -python3.8-minimal3.8.10-0ubuntu1~20.04.5 -python3-minimal3.8.2-0ubuntu2 -python3-pkg-resources45.2.0-1 -readline-common8.0-4 -sed4.7-1 -sensible-utils0.0.12+nmu1 -shared-mime-info1.15-1 -sysvinit-utils2.96-2.1ubuntu1 -tar1.30+dfsg-7ubuntu0.20.04.2 -tzdata2022c-0ubuntu0.20.04.0 -ubuntu-keyring2020.02.11.4 -ucf3.0038+nmu1 -unrar1:5.6.6-2build1 -util-linux2.34-0.1ubuntu9.3 -xdg-user-dirs0.17-2ubuntu1 -xz-utils5.2.4-1ubuntu1.1 -zlib1g1:1.2.11.dfsg-2ubuntu1.5 +libltdl72.4.6-15build2 +liblz4-11.9.3-2build2 +liblzma55.2.5-2ubuntu1 +libmagickcore-6.q16-68:6.9.11.60+dfsg-1.3build2 +libmagickwand-6.q16-68:6.9.11.60+dfsg-1.3build2 +libmd01.0.4-1build1 +libmount12.37.2-4ubuntu3 +libmpdec32.5.1-2build2 +libncurses66.3-2 +libncursesw66.3-2 +libnettle83.7.3-1build2 +libnghttp2-141.43.0-1build3 +libnpth01.6-3build2 +libnsl21.3.0-2build2 +libnspr42:4.32-3build1 +libnss32:3.68.2-0ubuntu1.1 +libnuma12.0.14-3ubuntu2 +libonig56.9.7.1-2build1 +libopenjp2-72.4.0-6 +libp11-kit00.24.0-6build1 +libpam0g1.4.0-11ubuntu2 +libpam-modules1.4.0-11ubuntu2 +libpam-modules-bin1.4.0-11ubuntu2 +libpam-runtime1.4.0-11ubuntu2 +libpcre2-8-010.39-3ubuntu0.1 +libpcre32:8.39-13ubuntu0.22.04.1 +libpng16-161.6.37-3build5 +libprocps82:3.3.17-6ubuntu2 +libpsl50.21.0-1.2build2 +libpython3.10-minimal3.10.6-1~22.04 +libpython3.10-stdlib3.10.6-1~22.04 +libpython3-stdlib3.10.6-1~22.04 +libreadline88.1.2-1 +librtmp12.4+20151223.gitfa8646d.1-2build4 +libsasl2-22.1.27+dfsg2-3ubuntu1 +libsasl2-modules2.1.27+dfsg2-3ubuntu1 +libsasl2-modules-db2.1.27+dfsg2-3ubuntu1 +libseccomp22.5.3-2ubuntu2 +libselinux13.3-1build2 +libsemanage23.3-1build2 +libsemanage-common3.3-1build2 +libsepol23.3-1build1 +libsmartcols12.37.2-4ubuntu3 +libsqlite3-03.37.2-2 +libss21.46.5-2ubuntu1.1 +libssh-40.9.6-2build1 +libssl33.0.2-0ubuntu1.6 +libstdc++612.1.0-2ubuntu1~22.04 +libsystemd0249.11-0ubuntu3.6 +libtasn1-64.18.0-4build1 +libtiff54.3.0-6ubuntu0.1 +libtinfo66.3-2 +libtirpc31.3.2-2ubuntu0.1 +libtirpc-common1.3.2-2ubuntu0.1 +libudev1249.11-0ubuntu3.6 +libunistring21.0-1 +libuuid12.37.2-4ubuntu3 +libwebp71.2.2-2 +libwebpdemux21.2.2-2 +libwebpmux31.2.2-2 +libx11-62:1.7.5-1 +libx11-data2:1.7.5-1 +libx265-1993.5-2 +libxau61:1.0.9-1build5 +libxcb11.14-3ubuntu3 +libxcomposite11:0.4.5-1build2 +libxdmcp61:1.1.3-0ubuntu5 +libxext62:1.3.4-1build1 +libxi62:1.8-1build1 +libxml22.9.13+dfsg-1ubuntu0.1 +libxrandr22:1.5.2-1build1 +libxrender11:0.9.10-1build4 +libxslt1.11.1.34-4ubuntu0.22.04.1 +libxxhash00.8.1-1 +libzstd11.4.8+dfsg-3build1 +locales2.35-0ubuntu3.1 +login1:4.8.1-2ubuntu2 +logsave1.46.5-2ubuntu1.1 +lsb-base11.1.0ubuntu4 +mawk1.3.4.20200120-3 +media-types7.0.0 +mount2.37.2-4ubuntu3 +ncurses-base6.3-2 +ncurses-bin6.3-2 +netcat1.218-4ubuntu1 +netcat-openbsd1.218-4ubuntu1 +openssl3.0.2-0ubuntu1.6 +passwd1:4.8.1-2ubuntu2 +perl-base5.34.0-3ubuntu1.1 +pinentry-curses1.1.1-1build2 +procps2:3.3.17-6ubuntu2 +publicsuffix20211207.1025-1 +python3.103.10.6-1~22.04 +python3.10-minimal3.10.6-1~22.04 +python33.10.6-1~22.04 +python3-distutils3.10.6-1~22.04 +python3-lib2to33.10.6-1~22.04 +python3-minimal3.10.6-1~22.04 +python3-pip22.0.2+dfsg-1 +python3-pkg-resources59.6.0-1.2 +python3-setuptools59.6.0-1.2 +python3-wheel0.37.1-2 +readline-common8.1.2-1 +sed4.8-1ubuntu2 +sensible-utils0.0.17 +sysvinit-utils3.01-1ubuntu1 +tar1.34+dfsg-1build3 +tzdata2022c-0ubuntu0.22.04.0 +ubuntu-keyring2021.03.26 +ucf3.0043 +unrar1:6.1.5-1 +usrmerge25ubuntu2 +util-linux2.37.2-4ubuntu3 +zlib1g1:1.2.11.dfsg-2ubuntu9.2 From 2c41ccea7d55e967d94b22f3b5ab547b679b5e9b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 25 Oct 2022 05:00:52 -0500 Subject: [PATCH 119/248] 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 5bd639b46..b7fcb41be 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -87,7 +87,7 @@ libk5crypto31.19.2-2 libkeyutils11.6.1-2ubuntu3 libkrb5-31.19.2-2 libkrb5support01.19.2-2 -libksba81.6.0-2build1 +libksba81.6.0-2ubuntu0.1 liblcms2-22.12~rc1-2build2 libldap-2.5-02.5.13+dfsg-0ubuntu0.22.04.1 libldap-common2.5.13+dfsg-0ubuntu0.22.04.1 From 684d31ca6747e110dc2f17684f2ac4b93db26e7a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 1 Nov 2022 04:52:37 -0500 Subject: [PATCH 120/248] 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 b7fcb41be..c329f2f01 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,7 +7,7 @@ bash5.1-6ubuntu1 bsdutils1:2.37.2-4ubuntu3 ca-certificates20211016 coreutils8.32-4.1ubuntu1 -curl7.81.0-1ubuntu1.4 +curl7.81.0-1ubuntu1.6 dash0.5.11+git20210903+057cd650a4ed-3build1 debconf1.5.79ubuntu1 debianutils5.5-1ubuntu2 @@ -55,7 +55,7 @@ libcap-ng00.7.9-2.2build3 libc-bin2.35-0ubuntu3.1 libcom-err21.46.5-2ubuntu1.1 libcrypt11:4.4.27-1 -libcurl47.81.0-1ubuntu1.4 +libcurl47.81.0-1ubuntu1.6 libdav1d50.9.2-1 libdb5.35.3.28+dfsg1-0.8ubuntu3 libde265-01.0.8-1 @@ -199,7 +199,7 @@ sed4.8-1ubuntu2 sensible-utils0.0.17 sysvinit-utils3.01-1ubuntu1 tar1.34+dfsg-1build3 -tzdata2022c-0ubuntu0.22.04.0 +tzdata2022e-0ubuntu0.22.04.0 ubuntu-keyring2021.03.26 ucf3.0043 unrar1:6.1.5-1 From 782cea7d13235e7f626f6320eba2c276aeddb8c6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 8 Nov 2022 10:47:39 +0100 Subject: [PATCH 121/248] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c329f2f01..978334c82 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -121,8 +121,8 @@ libpcre32:8.39-13ubuntu0.22.04.1 libpng16-161.6.37-3build5 libprocps82:3.3.17-6ubuntu2 libpsl50.21.0-1.2build2 -libpython3.10-minimal3.10.6-1~22.04 -libpython3.10-stdlib3.10.6-1~22.04 +libpython3.10-minimal3.10.6-1~22.04.1 +libpython3.10-stdlib3.10.6-1~22.04.1 libpython3-stdlib3.10.6-1~22.04 libreadline88.1.2-1 librtmp12.4+20151223.gitfa8646d.1-2build4 @@ -135,14 +135,14 @@ libsemanage23.3-1build2 libsemanage-common3.3-1build2 libsepol23.3-1build1 libsmartcols12.37.2-4ubuntu3 -libsqlite3-03.37.2-2 +libsqlite3-03.37.2-2ubuntu0.1 libss21.46.5-2ubuntu1.1 libssh-40.9.6-2build1 -libssl33.0.2-0ubuntu1.6 +libssl33.0.2-0ubuntu1.7 libstdc++612.1.0-2ubuntu1~22.04 libsystemd0249.11-0ubuntu3.6 libtasn1-64.18.0-4build1 -libtiff54.3.0-6ubuntu0.1 +libtiff54.3.0-6ubuntu0.2 libtinfo66.3-2 libtirpc31.3.2-2ubuntu0.1 libtirpc-common1.3.2-2ubuntu0.1 @@ -178,14 +178,14 @@ ncurses-base6.3-2 ncurses-bin6.3-2 netcat1.218-4ubuntu1 netcat-openbsd1.218-4ubuntu1 -openssl3.0.2-0ubuntu1.6 +openssl3.0.2-0ubuntu1.7 passwd1:4.8.1-2ubuntu2 perl-base5.34.0-3ubuntu1.1 pinentry-curses1.1.1-1build2 procps2:3.3.17-6ubuntu2 publicsuffix20211207.1025-1 -python3.103.10.6-1~22.04 -python3.10-minimal3.10.6-1~22.04 +python3.103.10.6-1~22.04.1 +python3.10-minimal3.10.6-1~22.04.1 python33.10.6-1~22.04 python3-distutils3.10.6-1~22.04 python3-lib2to33.10.6-1~22.04 @@ -199,7 +199,7 @@ sed4.8-1ubuntu2 sensible-utils0.0.17 sysvinit-utils3.01-1ubuntu1 tar1.34+dfsg-1build3 -tzdata2022e-0ubuntu0.22.04.0 +tzdata2022f-0ubuntu0.22.04.0 ubuntu-keyring2021.03.26 ucf3.0043 unrar1:6.1.5-1 From bef384c22118e1bb768fc3828b873f3a1284f87b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Nov 2022 10:42:44 +0100 Subject: [PATCH 122/248] 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 9ab5a22fe..bb3deeabf 100644 --- 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 bf7bf8aff949aecd0a68e088078d2c5b90cad281 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 22 Nov 2022 10:45:58 +0100 Subject: [PATCH 123/248] 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 978334c82..73a920da1 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -61,7 +61,7 @@ libdb5.35.3.28+dfsg1-0.8ubuntu3 libde265-01.0.8-1 libdebconfclient00.261ubuntu1 libdeflate01.10-2 -libexpat12.4.7-1 +libexpat12.4.7-1ubuntu0.1 libext2fs21.46.5-2ubuntu1.1 libffi83.4.2-4 libfftw3-double33.3.8-2ubuntu8 @@ -199,7 +199,7 @@ sed4.8-1ubuntu2 sensible-utils0.0.17 sysvinit-utils3.01-1ubuntu1 tar1.34+dfsg-1build3 -tzdata2022f-0ubuntu0.22.04.0 +tzdata2022f-0ubuntu0.22.04.1 ubuntu-keyring2021.03.26 ucf3.0043 unrar1:6.1.5-1 From e5efa7c8620dec25e7975f7d985b9f7e4aa6b6c8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 29 Nov 2022 10:40:51 +0100 Subject: [PATCH 124/248] Bot Updating Templated Files --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 28b754cde..036fe41ad 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 6af473498868cbd7cae48408759afb3133838b7e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 29 Nov 2022 03:42:12 -0600 Subject: [PATCH 125/248] 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 100644 .github/ISSUE_TEMPLATE/issue.bug.md delete mode 100644 .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 100644 index 41f6150bc..000000000 --- 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 100644 index 20a91fdb1..000000000 --- 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 889344c7b2bffd8bacad754c732c8d8bc92afa2a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 29 Nov 2022 03:43:32 -0600 Subject: [PATCH 126/248] 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 000000000..59a10f569 --- /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 000000000..099dcdb5e --- /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 bb3deeabf..14708f299 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -7,7 +7,7 @@ jobs: external-trigger-nightly: 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/nightly' diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index 646d1da86..60dd6bd8f 100644 --- 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 862e3943e..3fcbc2faa 100644 --- 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-calibre-web/blob/nightly/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-calibre-web/blob/nightly/.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-calibre-web/blob/nightly/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-calibre-web/blob/nightly/.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-calibre-web/blob/nightly/.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 f865451f7..5c0a83d94 100644 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -7,7 +7,7 @@ jobs: package-trigger-nightly: 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/nightly' diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 8f9f9b2a9..4423edcdd 100644 --- 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 3b3846ee8..73dfe45ae 100644 --- 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." From 767c76e45722a001221457954f5198082e8d2a0f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 29 Nov 2022 10:47:26 +0100 Subject: [PATCH 127/248] 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 73a920da1..87c1d3a4f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -61,7 +61,7 @@ libdb5.35.3.28+dfsg1-0.8ubuntu3 libde265-01.0.8-1 libdebconfclient00.261ubuntu1 libdeflate01.10-2 -libexpat12.4.7-1ubuntu0.1 +libexpat12.4.7-1ubuntu0.2 libext2fs21.46.5-2ubuntu1.1 libffi83.4.2-4 libfftw3-double33.3.8-2ubuntu8 @@ -79,7 +79,7 @@ libheif11.12.0-2build1 libhogweed63.7.3-1build2 libicu7070.1-2 libidn2-02.3.2-2build1 -libjbig02.1-3.1build3 +libjbig02.1-3.1ubuntu0.22.04.1 libjpeg88c-2ubuntu10 libjpeg-turbo82.1.2-0ubuntu1 libjq11.6-2.1ubuntu3 From f7d06a97b6059d653d8fb966cf5849f7c0f064e7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 6 Dec 2022 10:41:43 +0100 Subject: [PATCH 128/248] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 87c1d3a4f..15358c055 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ base-files12ubuntu4.2 base-passwd3.5.52build1 bash5.1-6ubuntu1 bsdutils1:2.37.2-4ubuntu3 -ca-certificates20211016 +ca-certificates20211016ubuntu0.22.04.1 coreutils8.32-4.1ubuntu1 curl7.81.0-1ubuntu1.6 dash0.5.11+git20210903+057cd650a4ed-3build1 @@ -69,7 +69,7 @@ libfontconfig12.13.1-4.2ubuntu5 libfreetype62.11.1+dfsg-1ubuntu0.1 libgcc-s112.1.0-2ubuntu1~22.04 libgcrypt201.9.4-3ubuntu3 -libglib2.0-02.72.1-1 +libglib2.0-02.72.4-0ubuntu1 libgmp102:6.2.1+dfsg-3ubuntu1 libgnutls303.7.3-4ubuntu1.1 libgomp112.1.0-2ubuntu1~22.04 @@ -142,7 +142,7 @@ libssl33.0.2-0ubuntu1.7 libstdc++612.1.0-2ubuntu1~22.04 libsystemd0249.11-0ubuntu3.6 libtasn1-64.18.0-4build1 -libtiff54.3.0-6ubuntu0.2 +libtiff54.3.0-6ubuntu0.3 libtinfo66.3-2 libtirpc31.3.2-2ubuntu0.1 libtirpc-common1.3.2-2ubuntu0.1 @@ -161,14 +161,14 @@ libxcomposite11:0.4.5-1build2 libxdmcp61:1.1.3-0ubuntu5 libxext62:1.3.4-1build1 libxi62:1.8-1build1 -libxml22.9.13+dfsg-1ubuntu0.1 +libxml22.9.13+dfsg-1ubuntu0.2 libxrandr22:1.5.2-1build1 libxrender11:0.9.10-1build4 libxslt1.11.1.34-4ubuntu0.22.04.1 libxxhash00.8.1-1 libzstd11.4.8+dfsg-3build1 locales2.35-0ubuntu3.1 -login1:4.8.1-2ubuntu2 +login1:4.8.1-2ubuntu2.1 logsave1.46.5-2ubuntu1.1 lsb-base11.1.0ubuntu4 mawk1.3.4.20200120-3 @@ -179,7 +179,7 @@ ncurses-bin6.3-2 netcat1.218-4ubuntu1 netcat-openbsd1.218-4ubuntu1 openssl3.0.2-0ubuntu1.7 -passwd1:4.8.1-2ubuntu2 +passwd1:4.8.1-2ubuntu2.1 perl-base5.34.0-3ubuntu1.1 pinentry-curses1.1.1-1build2 procps2:3.3.17-6ubuntu2 From 4bda9c644874fdb9fecff49e3ad42f32e04f8b34 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 13 Dec 2022 03:42:12 -0600 Subject: [PATCH 129/248] 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 15358c055..5115f88cb 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -121,8 +121,8 @@ libpcre32:8.39-13ubuntu0.22.04.1 libpng16-161.6.37-3build5 libprocps82:3.3.17-6ubuntu2 libpsl50.21.0-1.2build2 -libpython3.10-minimal3.10.6-1~22.04.1 -libpython3.10-stdlib3.10.6-1~22.04.1 +libpython3.10-minimal3.10.6-1~22.04.2 +libpython3.10-stdlib3.10.6-1~22.04.2 libpython3-stdlib3.10.6-1~22.04 libreadline88.1.2-1 librtmp12.4+20151223.gitfa8646d.1-2build4 @@ -184,8 +184,8 @@ perl-base5.34.0-3ubuntu1.1 pinentry-curses1.1.1-1build2 procps2:3.3.17-6ubuntu2 publicsuffix20211207.1025-1 -python3.103.10.6-1~22.04.1 -python3.10-minimal3.10.6-1~22.04.1 +python3.103.10.6-1~22.04.2 +python3.10-minimal3.10.6-1~22.04.2 python33.10.6-1~22.04 python3-distutils3.10.6-1~22.04 python3-lib2to33.10.6-1~22.04 @@ -199,7 +199,7 @@ sed4.8-1ubuntu2 sensible-utils0.0.17 sysvinit-utils3.01-1ubuntu1 tar1.34+dfsg-1build3 -tzdata2022f-0ubuntu0.22.04.1 +tzdata2022g-0ubuntu0.22.04.1 ubuntu-keyring2021.03.26 ucf3.0043 unrar1:6.1.5-1 From 798da862c741179e9ea7a1f434902195046db7fb Mon Sep 17 00:00:00 2001 From: aptalca <aptalca@users.noreply.github.com> Date: Tue, 20 Dec 2022 10:52:39 -0500 Subject: [PATCH 130/248] improve init script and prevent harmless error --- .github/workflows/call_invalid_helper.yml | 12 ++++++ README.md | 12 +----- readme-vars.yml | 11 +---- .../s6-rc.d/init-calibre-web-config/run | 42 ++++++++----------- 4 files changed, 32 insertions(+), 45 deletions(-) create mode 100644 .github/workflows/call_invalid_helper.yml diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml new file mode 100644 index 000000000..773767c27 --- /dev/null +++ b/.github/workflows/call_invalid_helper.yml @@ -0,0 +1,12 @@ +name: Comment on invalid interaction +on: + issues: + types: + - labeled +jobs: + add-comment-on-invalid: + if: github.event.label.name == 'invalid' + permissions: + issues: write + uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1 + secrets: inherit diff --git a/README.md b/README.md index 5df82b7fa..4666a23e2 100644 --- a/README.md +++ b/README.md @@ -87,17 +87,6 @@ To use this option add the optional environmental variable as detailed above to This image contains the [kepubify](https://pgaskin.net/kepubify/) ebook conversion tool (MIT License) to convert epub to kepub. In the Calibre-Web admin page (Basic Configuration:External Binaries) set the **Path to Kepubify E-Book Converter** to `/usr/bin/kepubify` -To reverse proxy with our Letsencrypt docker container we include a preconfigured reverse proxy config, for other instances of Nginx use the following location block: -``` - location /calibre-web { - proxy_pass http://<your-ip>:8083; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Scheme $scheme; - proxy_set_header X-Script-Name /calibre-web; - } -``` - ## Usage Here are some example snippets to help you get started creating a container. @@ -263,6 +252,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **20.12.22:** - Improve init script and prevent harmless error. * **22.10.22:** - Rebase to jammy. Upgrade to s6v3. Clean up build dependencies. * **04.11.21:** - Fix pip arguments * **10.02.21:** - Add libxrandr2 diff --git a/readme-vars.yml b/readme-vars.yml index c093f3e0f..669fd075b 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -64,19 +64,10 @@ app_setup_block: | This image contains the [kepubify](https://pgaskin.net/kepubify/) ebook conversion tool (MIT License) to convert epub to kepub. In the Calibre-Web admin page (Basic Configuration:External Binaries) set the **Path to Kepubify E-Book Converter** to `/usr/bin/kepubify` - To reverse proxy with our Letsencrypt docker container we include a preconfigured reverse proxy config, for other instances of Nginx use the following location block: - ``` - location /calibre-web { - proxy_pass http://<your-ip>:8083; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Scheme $scheme; - proxy_set_header X-Script-Name /calibre-web; - } - ``` # changelog changelogs: + - { date: "20.12.22:", desc: "Improve init script and prevent harmless error."} - { date: "22.10.22:", desc: "Rebase to jammy. Upgrade to s6v3. Clean up build dependencies."} - { date: "04.11.21:", desc: "Fix pip arguments"} - { date: "10.02.21:", desc: "Add libxrandr2"} diff --git a/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run index 4ca17b9ea..20669b0a8 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run @@ -1,42 +1,36 @@ #!/usr/bin/with-contenv bash # create symlinks for imagemagick policy.xml -[[ -f /etc/ImageMagick-6/policy.xml ]] && \ - rm /etc/ImageMagick-6/policy.xml -[[ ! -L /etc/ImageMagick-6/policy.xml ]] && \ - ln -s /defaults/policy.xml /etc/ImageMagick-6/policy.xml +rm -rf /etc/ImageMagick-6/policy.xml +ln -s /defaults/policy.xml /etc/ImageMagick-6/policy.xml # create symlinks for database and log -[[ ! -f /config/app.db ]] && \ +if [[ ! -f /config/app.db ]] && [[ -f /app/calibre-web/app.db ]]; then cp /defaults/app.db /config/app.db -[[ -f /app/calibre-web/app.db ]] && \ - rm /app/calibre-web/app.db -[[ ! -L /app/calibre-web/app.db ]] && \ - ln -s /config/app.db /app/calibre-web/app.db +fi +rm -rf /app/calibre-web/app.db +ln -s /config/app.db /app/calibre-web/app.db # create symlinks for log -[[ ! -f /config/calibre-web.log ]] && \ +if [[ ! -f /config/calibre-web.log ]]; then touch /config/calibre-web.log -[[ -f /app/calibre-web/calibre-web.log ]] && \ - rm /app/calibre-web/calibre-web.log -[[ ! -L /app/calibre-web/calibre-web.log ]] && \ - ln -s /config/calibre-web.log /app/calibre-web/calibre-web.log +fi +rm -rf /app/calibre-web/calibre-web.log +ln -s /config/calibre-web.log /app/calibre-web/calibre-web.log # create Google drive client_secrets.json file -[[ ! -f /config/client_secrets.json ]] && \ +if [[ ! -f /config/client_secrets.json ]]; then echo "{}" > /config/client_secrets.json -[[ -f /app/calibre-web/client_secrets.json ]] && - rm /app/calibre-web/client_secrets.json -[[ ! -L /app/calibre-web/client_secrets.json ]] && - ln -s /config/client_secrets.json /app/calibre-web/client_secrets.json +fi +rm -rf /app/calibre-web/client_secrets.json +ln -s /config/client_secrets.json /app/calibre-web/client_secrets.json # create Google drive symlinks for database -[[ ! -f /config/gdrive.db ]] && \ +if [[ ! -f /config/gdrive.db ]] && [[ -f /app/calibre-web/gdrive.db ]]; then cp /app/calibre-web/gdrive.db /config/gdrive.db -[[ -f /app/calibre-web/gdrive.db ]] && \ - rm /app/calibre-web/gdrive.db -[[ ! -L /app/calibre-web/gdrive.db ]] && \ - ln -s /config/gdrive.db /app/calibre-web/gdrive.db +fi +rm -rf /app/calibre-web/gdrive.db +ln -s /config/gdrive.db /app/calibre-web/gdrive.db # check if kepubify is present and if so make executable [[ -f /usr/bin/kepubify ]] && \ From 57daac5101a1719458036b55d443c8e3344e5d50 Mon Sep 17 00:00:00 2001 From: aptalca <aptalca@users.noreply.github.com> Date: Tue, 20 Dec 2022 10:55:19 -0500 Subject: [PATCH 131/248] use proper if block --- root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run index 20669b0a8..7a45670b7 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run @@ -33,9 +33,9 @@ rm -rf /app/calibre-web/gdrive.db ln -s /config/gdrive.db /app/calibre-web/gdrive.db # check if kepubify is present and if so make executable -[[ -f /usr/bin/kepubify ]] && \ -[[ ! -x /usr/bin/kepubify ]] && \ +if [[ -f /usr/bin/kepubify ]] && [[ ! -x /usr/bin/kepubify ]]; then chmod +x /usr/bin/kepubify +fi # permissions chown -R abc:abc \ From 3a98960b992d93b6905ff2136c65eb82c3357728 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Wed, 28 Dec 2022 08:52:46 -0500 Subject: [PATCH 132/248] Update Dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 0ba2edf7a..65a579c78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,9 @@ RUN \ libxcomposite1 \ libxi6 \ libxrandr2 \ + libxkbfile-dev \ libxslt1.1 \ + libxtst6 \ python3-minimal \ python3-pip \ python3-pkg-resources \ From 3df591fbc231698029f296af27196ad855923901 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Wed, 28 Dec 2022 08:53:10 -0500 Subject: [PATCH 133/248] Update Dockerfile.aarch64 --- Dockerfile.aarch64 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index cd3613f35..75db14f15 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -30,7 +30,9 @@ RUN \ libxcomposite1 \ libxi6 \ libxrandr2 \ + libxkbfile-dev \ libxslt1.1 \ + libxtst6 \ python3-minimal \ python3-pip \ python3-pkg-resources \ From ed8c9fd6eaa51e2a4d3ad32257abca7f1a89f6c9 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Wed, 28 Dec 2022 08:53:23 -0500 Subject: [PATCH 134/248] Update Dockerfile.armhf --- Dockerfile.armhf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index dd00acd4f..98a7d9668 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -32,7 +32,9 @@ RUN \ libxcomposite1 \ libxi6 \ libxrandr2 \ + libxkbfile-dev \ libxslt1.1 \ + libxtst6 \ python3-minimal \ python3-pip \ python3-pkg-resources \ From 58a3ebf414574580cce1c3688ea02558b310c2ad Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Wed, 28 Dec 2022 08:53:44 -0500 Subject: [PATCH 135/248] Update readme-vars.yml --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index 669fd075b..6e3c508ca 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -67,6 +67,7 @@ app_setup_block: | # changelog changelogs: + - { date: "27.12.22:", desc: "Add ghostscript, libxtst6, libxkbfile-dev."} - { date: "20.12.22:", desc: "Improve init script and prevent harmless error."} - { date: "22.10.22:", desc: "Rebase to jammy. Upgrade to s6v3. Clean up build dependencies."} - { date: "04.11.21:", desc: "Fix pip arguments"} From 6c5b09f4668b5d62a168834e4c2a5aab146fa54b Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Wed, 28 Dec 2022 08:54:07 -0500 Subject: [PATCH 136/248] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4666a23e2..ca480c20c 100644 --- a/README.md +++ b/README.md @@ -252,6 +252,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **27.12.22:** - Add ghostscript, libxtst6, libxkbfile-dev. * **20.12.22:** - Improve init script and prevent harmless error. * **22.10.22:** - Rebase to jammy. Upgrade to s6v3. Clean up build dependencies. * **04.11.21:** - Fix pip arguments From 4d4fbfcb0ae37452b85411b18b1505ab8a74700a Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Wed, 28 Dec 2022 09:04:11 -0500 Subject: [PATCH 137/248] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 65a579c78..2da4918bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,7 @@ RUN \ echo "**** install runtime packages ****" && \ apt-get install -y --no-install-recommends \ imagemagick \ + ghostscript \ libldap-2.5-0 \ libnss3 \ libsasl2-2 \ From b494c322b5c0f7551d1e9b27052d224f337214c9 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Wed, 28 Dec 2022 09:04:23 -0500 Subject: [PATCH 138/248] Update Dockerfile.aarch64 --- Dockerfile.aarch64 | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 75db14f15..ded94c781 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -24,6 +24,7 @@ RUN \ echo "**** install runtime packages ****" && \ apt-get install -y --no-install-recommends \ imagemagick \ + ghostscript \ libldap-2.5-0 \ libnss3 \ libsasl2-2 \ From 991516b660352ca00e34b59e89437fb1c545e115 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Wed, 28 Dec 2022 09:04:34 -0500 Subject: [PATCH 139/248] Update Dockerfile.armhf --- Dockerfile.armhf | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 98a7d9668..061832acc 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -26,6 +26,7 @@ RUN \ echo "**** install runtime packages ****" && \ apt-get install -y --no-install-recommends \ imagemagick \ + ghostscript \ libldap-2.5-0 \ libnss3 \ libsasl2-2 \ From 54d1a406823e5484aa3cfca4dfd4a64e19c4a85d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 30 Dec 2022 20:26:07 +0100 Subject: [PATCH 140/248] Bot Updating Package Versions --- package_versions.txt | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 5115f88cb..3a918c817 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,8 +17,9 @@ dpkg1.21.1ubuntu2.1 e2fsprogs1.46.5-2ubuntu1.1 findutils4.8.0-1ubuntu3 fontconfig-config2.13.1-4.2ubuntu5 -fonts-dejavu-core2.37-2build1 +fonts-urw-base3520200910-1 gcc-12-base12.1.0-2ubuntu1~22.04 +ghostscript9.55.0~dfsg1-0ubuntu5.1 gnupg2.2.27-3ubuntu2.1 gnupg-l10n2.2.27-3ubuntu2.1 gnupg-utils2.2.27-3ubuntu2.1 @@ -45,6 +46,9 @@ libassuan02.5.5-1build1 libattr11:2.5.1-1build1 libaudit11:3.0.7-1build1 libaudit-common1:3.0.7-1build1 +libavahi-client30.8-5ubuntu5 +libavahi-common30.8-5ubuntu5 +libavahi-common-data0.8-5ubuntu5 libblkid12.37.2-4ubuntu3 libbrotli11.0.9-2build6 libbsd00.11.5-1 @@ -55,9 +59,11 @@ libcap-ng00.7.9-2.2build3 libc-bin2.35-0ubuntu3.1 libcom-err21.46.5-2ubuntu1.1 libcrypt11:4.4.27-1 +libcups22.4.1op1-1ubuntu4.1 libcurl47.81.0-1ubuntu1.6 libdav1d50.9.2-1 libdb5.35.3.28+dfsg1-0.8ubuntu3 +libdbus-1-31.12.20-2ubuntu4.1 libde265-01.0.8-1 libdebconfclient00.261ubuntu1 libdeflate01.10-2 @@ -74,12 +80,17 @@ libgmp102:6.2.1+dfsg-3ubuntu1 libgnutls303.7.3-4ubuntu1.1 libgomp112.1.0-2ubuntu1~22.04 libgpg-error01.43-3 +libgs99.55.0~dfsg1-0ubuntu5.1 +libgs9-common9.55.0~dfsg1-0ubuntu5.1 libgssapi-krb5-21.19.2-2 libheif11.12.0-2build1 libhogweed63.7.3-1build2 libicu7070.1-2 +libidn121.38-4build1 libidn2-02.3.2-2build1 +libijs-0.350.35-15build2 libjbig02.1-3.1ubuntu0.22.04.1 +libjbig2dec00.19-3build2 libjpeg88c-2ubuntu10 libjpeg-turbo82.1.2-0ubuntu1 libjq11.6-2.1ubuntu3 @@ -116,11 +127,13 @@ libpam0g1.4.0-11ubuntu2 libpam-modules1.4.0-11ubuntu2 libpam-modules-bin1.4.0-11ubuntu2 libpam-runtime1.4.0-11ubuntu2 +libpaper11.1.28build2 libpcre2-8-010.39-3ubuntu0.1 libpcre32:8.39-13ubuntu0.22.04.1 libpng16-161.6.37-3build5 libprocps82:3.3.17-6ubuntu2 libpsl50.21.0-1.2build2 +libpthread-stubs0-dev0.4-1build2 libpython3.10-minimal3.10.6-1~22.04.2 libpython3.10-stdlib3.10.6-1~22.04.2 libpython3-stdlib3.10.6-1~22.04 @@ -154,17 +167,24 @@ libwebpdemux21.2.2-2 libwebpmux31.2.2-2 libx11-62:1.7.5-1 libx11-data2:1.7.5-1 +libx11-dev2:1.7.5-1 libx265-1993.5-2 libxau61:1.0.9-1build5 +libxau-dev1:1.0.9-1build5 libxcb11.14-3ubuntu3 +libxcb1-dev1.14-3ubuntu3 libxcomposite11:0.4.5-1build2 libxdmcp61:1.1.3-0ubuntu5 +libxdmcp-dev1:1.1.3-0ubuntu5 libxext62:1.3.4-1build1 libxi62:1.8-1build1 +libxkbfile11:1.1.0-1build3 +libxkbfile-dev1:1.1.0-1build3 libxml22.9.13+dfsg-1ubuntu0.2 libxrandr22:1.5.2-1build1 libxrender11:0.9.10-1build4 libxslt1.11.1.34-4ubuntu0.22.04.1 +libxtst62:1.2.3-1build4 libxxhash00.8.1-1 libzstd11.4.8+dfsg-3build1 locales2.35-0ubuntu3.1 @@ -182,6 +202,7 @@ openssl3.0.2-0ubuntu1.7 passwd1:4.8.1-2ubuntu2.1 perl-base5.34.0-3ubuntu1.1 pinentry-curses1.1.1-1build2 +poppler-data0.4.11-1 procps2:3.3.17-6ubuntu2 publicsuffix20211207.1025-1 python3.103.10.6-1~22.04.2 @@ -205,4 +226,8 @@ ucf3.0043 unrar1:6.1.5-1 usrmerge25ubuntu2 util-linux2.37.2-4ubuntu3 +x11-common1:7.7+23ubuntu2 +x11proto-dev2021.5-1 +xorg-sgml-doctools1:1.11-1.1 +xtrans-dev1.4.0-1 zlib1g1:1.2.11.dfsg-2ubuntu9.2 From 30936aa257f6cf95bd04c0043b3b6315ed9ae47b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 10 Jan 2023 10:41:53 +0100 Subject: [PATCH 141/248] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3a918c817..89dc9b612 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,7 +7,7 @@ bash5.1-6ubuntu1 bsdutils1:2.37.2-4ubuntu3 ca-certificates20211016ubuntu0.22.04.1 coreutils8.32-4.1ubuntu1 -curl7.81.0-1ubuntu1.6 +curl7.81.0-1ubuntu1.7 dash0.5.11+git20210903+057cd650a4ed-3build1 debconf1.5.79ubuntu1 debianutils5.5-1ubuntu2 @@ -60,7 +60,7 @@ libc-bin2.35-0ubuntu3.1 libcom-err21.46.5-2ubuntu1.1 libcrypt11:4.4.27-1 libcups22.4.1op1-1ubuntu4.1 -libcurl47.81.0-1ubuntu1.6 +libcurl47.81.0-1ubuntu1.7 libdav1d50.9.2-1 libdb5.35.3.28+dfsg1-0.8ubuntu3 libdbus-1-31.12.20-2ubuntu4.1 @@ -98,7 +98,7 @@ libk5crypto31.19.2-2 libkeyutils11.6.1-2ubuntu3 libkrb5-31.19.2-2 libkrb5support01.19.2-2 -libksba81.6.0-2ubuntu0.1 +libksba81.6.0-2ubuntu0.2 liblcms2-22.12~rc1-2build2 libldap-2.5-02.5.13+dfsg-0ubuntu0.22.04.1 libldap-common2.5.13+dfsg-0ubuntu0.22.04.1 @@ -139,9 +139,9 @@ libpython3.10-stdlib3.10.6-1~22.04.2 libpython3-stdlib3.10.6-1~22.04 libreadline88.1.2-1 librtmp12.4+20151223.gitfa8646d.1-2build4 -libsasl2-22.1.27+dfsg2-3ubuntu1 -libsasl2-modules2.1.27+dfsg2-3ubuntu1 -libsasl2-modules-db2.1.27+dfsg2-3ubuntu1 +libsasl2-22.1.27+dfsg2-3ubuntu1.1 +libsasl2-modules2.1.27+dfsg2-3ubuntu1.1 +libsasl2-modules-db2.1.27+dfsg2-3ubuntu1.1 libseccomp22.5.3-2ubuntu2 libselinux13.3-1build2 libsemanage23.3-1build2 From 54c430b8f70e21aa4357bcf1ba780de2a3e9ba9e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 23 Jan 2023 16:18:41 +0100 Subject: [PATCH 142/248] 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 89dc9b612..1f1a903db 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -212,8 +212,8 @@ python3-distutils3.10.6-1~22.04 python3-lib2to33.10.6-1~22.04 python3-minimal3.10.6-1~22.04 python3-pip22.0.2+dfsg-1 -python3-pkg-resources59.6.0-1.2 -python3-setuptools59.6.0-1.2 +python3-pkg-resources59.6.0-1.2ubuntu0.22.04.1 +python3-setuptools59.6.0-1.2ubuntu0.22.04.1 python3-wheel0.37.1-2 readline-common8.1.2-1 sed4.8-1ubuntu2 From 85d31b1ed3f64e70bf79fb4398feffb14d166166 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 24 Jan 2023 10:41:45 +0100 Subject: [PATCH 143/248] 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 1f1a903db..422f86870 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -214,7 +214,7 @@ python3-minimal3.10.6-1~22.04 python3-pip22.0.2+dfsg-1 python3-pkg-resources59.6.0-1.2ubuntu0.22.04.1 python3-setuptools59.6.0-1.2ubuntu0.22.04.1 -python3-wheel0.37.1-2 +python3-wheel0.37.1-2ubuntu0.22.04.1 readline-common8.1.2-1 sed4.8-1ubuntu2 sensible-utils0.0.17 From 5cd8b349d06a95891d58faae99f934e1dd8a5afe Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 24 Jan 2023 18:12:29 +0100 Subject: [PATCH 144/248] 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 422f86870..307c5b8f0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -211,7 +211,7 @@ python33.10.6-1~22.04 python3-distutils3.10.6-1~22.04 python3-lib2to33.10.6-1~22.04 python3-minimal3.10.6-1~22.04 -python3-pip22.0.2+dfsg-1 +python3-pip22.0.2+dfsg-1ubuntu0.1 python3-pkg-resources59.6.0-1.2ubuntu0.22.04.1 python3-setuptools59.6.0-1.2ubuntu0.22.04.1 python3-wheel0.37.1-2ubuntu0.22.04.1 From 3e8450855409d66a195053b4d474ab794b6f4792 Mon Sep 17 00:00:00 2001 From: aptalca <aptalca@users.noreply.github.com> Date: Sun, 29 Jan 2023 14:20:50 -0500 Subject: [PATCH 145/248] add cmake as build dep to arm --- Dockerfile | 2 ++ Dockerfile.aarch64 | 4 ++++ Dockerfile.armhf | 4 ++++ README.md | 1 + readme-vars.yml | 1 + 5 files changed, 12 insertions(+) diff --git a/Dockerfile b/Dockerfile index 2da4918bb..70f267c3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ded94c781..e85aedf7b 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy # set version label @@ -12,6 +14,7 @@ RUN \ apt-get update && \ apt-get install -y --no-install-recommends \ build-essential \ + cmake \ git \ libffi-dev \ libjpeg-dev \ @@ -68,6 +71,7 @@ RUN \ echo "**** cleanup ****" && \ apt-get -y purge \ build-essential \ + cmake \ git \ libffi-dev \ libjpeg-dev \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 061832acc..6e8619207 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy # set version label @@ -12,6 +14,7 @@ RUN \ apt-get update && \ apt-get install -y --no-install-recommends \ build-essential \ + cmake \ git \ libffi-dev \ libjpeg-dev \ @@ -70,6 +73,7 @@ RUN \ echo "**** cleanup ****" && \ apt-get -y purge \ build-essential \ + cmake \ git \ libffi-dev \ libjpeg-dev \ diff --git a/README.md b/README.md index ca480c20c..2169f35d5 100644 --- a/README.md +++ b/README.md @@ -252,6 +252,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **29.01.23:** - Add cmake as build dep for Levenshtein. * **27.12.22:** - Add ghostscript, libxtst6, libxkbfile-dev. * **20.12.22:** - Improve init script and prevent harmless error. * **22.10.22:** - Rebase to jammy. Upgrade to s6v3. Clean up build dependencies. diff --git a/readme-vars.yml b/readme-vars.yml index 6e3c508ca..de18c1d99 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -67,6 +67,7 @@ app_setup_block: | # changelog changelogs: + - { date: "29.01.23:", desc: "Add cmake as build dep for Levenshtein."} - { date: "27.12.22:", desc: "Add ghostscript, libxtst6, libxkbfile-dev."} - { date: "20.12.22:", desc: "Improve init script and prevent harmless error."} - { date: "22.10.22:", desc: "Rebase to jammy. Upgrade to s6v3. Clean up build dependencies."} From 8abca229a6a5f32ce71623f281180fa49f508d64 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 11 Feb 2023 01:09:17 -0600 Subject: [PATCH 146/248] Bot Updating Templated Files --- Jenkinsfile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 036fe41ad..e29ed3348 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.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' + 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' } script{ env.LS_RELEASE_NUMBER = sh( @@ -69,7 +69,7 @@ pipeline { script{ env.LS_TAG_NUMBER = sh( script: '''#! /bin/bash - tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null) + tagsha=$(git rev-list -n 1 nightly-${LS_RELEASE} 2>/dev/null) if [ "${tagsha}" == "${COMMIT_SHA}" ]; then echo ${LS_RELEASE_NUMBER} elif [ -z "${GIT_COMMIT}" ]; then @@ -815,19 +815,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-nightly - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-nightly - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-nightly 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-nightly 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-nightly docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} @@ -835,13 +835,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-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:amd64-nightly + docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-nightly - docker push ${MANIFESTIMAGE}:arm64v8-nightly - docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-nightly docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker push ${MANIFESTIMAGE}:amd64-${SEMVER} @@ -987,12 +987,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} ''' } From 51766fd9643901dfdb10417b96bac00a072ec82d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 11 Feb 2023 01:10:44 -0600 Subject: [PATCH 147/248] Bot Updating Templated Files --- .editorconfig | 2 +- .github/workflows/greetings.yml | 2 +- .github/workflows/permissions.yml | 9 +++++++++ README.md | 10 +++++----- 4 files changed, 16 insertions(+), 7 deletions(-) create mode 100755 .github/workflows/permissions.yml diff --git a/.editorconfig b/.editorconfig index a92f7dfd8..5f150f350 100755 --- a/.editorconfig +++ b/.editorconfig @@ -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 diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 3fcbc2faa..af9c354ba 100644 --- 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-calibre-web/blob/nightly/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-calibre-web/blob/nightly/.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-calibre-web/blob/nightly/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml new file mode 100755 index 000000000..2df6b61b8 --- /dev/null +++ b/.github/workflows/permissions.yml @@ -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 diff --git a/README.md b/README.md index 2169f35d5..db1f34aae 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,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\> | ## Version Tags @@ -68,7 +68,6 @@ This image provides various versions that are available via tags. Please read th | :----: | :----: |--- | | latest | ✅ | Releases of Calibre-Web | | nightly | ✅ | Commits to the master branch of Calibre-Web | - ## Application Setup Webui can be found at `http://your-ip:8083` @@ -103,7 +102,7 @@ services: environment: - PUID=1000 - PGID=1000 - - TZ=Europe/London + - TZ=Etc/UTC - DOCKER_MODS=linuxserver/mods:universal-calibre volumes: - /path/to/data:/config @@ -120,13 +119,14 @@ docker run -d \ --name=calibre-web \ -e PUID=1000 \ -e PGID=1000 \ - -e TZ=Europe/London \ + -e TZ=Etc/UTC \ -e DOCKER_MODS=linuxserver/mods:universal-calibre \ -p 8083:8083 \ -v /path/to/data:/config \ -v /path/to/calibre/library:/books \ --restart unless-stopped \ lscr.io/linuxserver/calibre-web:nightly + ``` ## Parameters @@ -138,7 +138,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-p 8083` | WebUI | | `-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 DOCKER_MODS=linuxserver/mods:universal-calibre` | #optional & **x86-64 only** Adds the ability to perform ebook conversion | | `-v /config` | Where calibre-web stores the internal database and config. | | `-v /books` | Where your preexisting calibre database is locate. | From ce9e5681c2e7816d4c8a28476b6a47ef9e18906f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 14 Feb 2023 10:42:44 +0100 Subject: [PATCH 148/248] 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 307c5b8f0..9ce60472a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -198,7 +198,7 @@ ncurses-base6.3-2 ncurses-bin6.3-2 netcat1.218-4ubuntu1 netcat-openbsd1.218-4ubuntu1 -openssl3.0.2-0ubuntu1.7 +openssl3.0.2-0ubuntu1.8 passwd1:4.8.1-2ubuntu2.1 perl-base5.34.0-3ubuntu1.1 pinentry-curses1.1.1-1build2 From 0ab9a0e8698da5987b1d29d020612fc3435ab200 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 Feb 2023 03:41:55 -0600 Subject: [PATCH 149/248] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9ce60472a..153ee9648 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ adduser3.118ubuntu5 apt2.4.8 apt-utils2.4.8 -base-files12ubuntu4.2 +base-files12ubuntu4.3 base-passwd3.5.52build1 bash5.1-6ubuntu1 bsdutils1:2.37.2-4ubuntu3 @@ -82,7 +82,7 @@ libgomp112.1.0-2ubuntu1~22.04 libgpg-error01.43-3 libgs99.55.0~dfsg1-0ubuntu5.1 libgs9-common9.55.0~dfsg1-0ubuntu5.1 -libgssapi-krb5-21.19.2-2 +libgssapi-krb5-21.19.2-2ubuntu0.1 libheif11.12.0-2build1 libhogweed63.7.3-1build2 libicu7070.1-2 @@ -94,10 +94,10 @@ libjbig2dec00.19-3build2 libjpeg88c-2ubuntu10 libjpeg-turbo82.1.2-0ubuntu1 libjq11.6-2.1ubuntu3 -libk5crypto31.19.2-2 +libk5crypto31.19.2-2ubuntu0.1 libkeyutils11.6.1-2ubuntu3 -libkrb5-31.19.2-2 -libkrb5support01.19.2-2 +libkrb5-31.19.2-2ubuntu0.1 +libkrb5support01.19.2-2ubuntu0.1 libksba81.6.0-2ubuntu0.2 liblcms2-22.12~rc1-2build2 libldap-2.5-02.5.13+dfsg-0ubuntu0.22.04.1 @@ -123,10 +123,10 @@ libnuma12.0.14-3ubuntu2 libonig56.9.7.1-2build1 libopenjp2-72.4.0-6 libp11-kit00.24.0-6build1 -libpam0g1.4.0-11ubuntu2 -libpam-modules1.4.0-11ubuntu2 -libpam-modules-bin1.4.0-11ubuntu2 -libpam-runtime1.4.0-11ubuntu2 +libpam0g1.4.0-11ubuntu2.3 +libpam-modules1.4.0-11ubuntu2.3 +libpam-modules-bin1.4.0-11ubuntu2.3 +libpam-runtime1.4.0-11ubuntu2.3 libpaper11.1.28build2 libpcre2-8-010.39-3ubuntu0.1 libpcre32:8.39-13ubuntu0.22.04.1 @@ -151,7 +151,7 @@ libsmartcols12.37.2-4ubuntu3 libsqlite3-03.37.2-2ubuntu0.1 libss21.46.5-2ubuntu1.1 libssh-40.9.6-2build1 -libssl33.0.2-0ubuntu1.7 +libssl33.0.2-0ubuntu1.8 libstdc++612.1.0-2ubuntu1~22.04 libsystemd0249.11-0ubuntu3.6 libtasn1-64.18.0-4build1 From d377915583cbfbc1fcc2ecc093222ee7fb20296d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 28 Feb 2023 10:43:29 +0100 Subject: [PATCH 150/248] 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 153ee9648..6fb29197e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,7 +7,7 @@ bash5.1-6ubuntu1 bsdutils1:2.37.2-4ubuntu3 ca-certificates20211016ubuntu0.22.04.1 coreutils8.32-4.1ubuntu1 -curl7.81.0-1ubuntu1.7 +curl7.81.0-1ubuntu1.8 dash0.5.11+git20210903+057cd650a4ed-3build1 debconf1.5.79ubuntu1 debianutils5.5-1ubuntu2 @@ -60,7 +60,7 @@ libc-bin2.35-0ubuntu3.1 libcom-err21.46.5-2ubuntu1.1 libcrypt11:4.4.27-1 libcups22.4.1op1-1ubuntu4.1 -libcurl47.81.0-1ubuntu1.7 +libcurl47.81.0-1ubuntu1.8 libdav1d50.9.2-1 libdb5.35.3.28+dfsg1-0.8ubuntu3 libdbus-1-31.12.20-2ubuntu4.1 @@ -118,7 +118,7 @@ libnghttp2-141.43.0-1build3 libnpth01.6-3build2 libnsl21.3.0-2build2 libnspr42:4.32-3build1 -libnss32:3.68.2-0ubuntu1.1 +libnss32:3.68.2-0ubuntu1.2 libnuma12.0.14-3ubuntu2 libonig56.9.7.1-2build1 libopenjp2-72.4.0-6 From 6cc2a9bcc2c989c9c05aebeec69f970b9cd66ec0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 4 Mar 2023 11:10:36 +0100 Subject: [PATCH 151/248] Bot Updating Templated Files --- Jenkinsfile | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e29ed3348..222065d31 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -452,7 +452,8 @@ pipeline { } steps { echo "Running on node: ${NODE_NAME}" - sh "docker build \ + sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile" + sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-calibre-web/packages\" \ @@ -465,7 +466,7 @@ pipeline { --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Calibre-web\" \ --label \"org.opencontainers.image.description=[Calibre-web](https://github.com/janeczku/calibre-web) is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself. This software is a fork of library and licensed under the GPL v3 License. \" \ - --no-cache --pull -t ${IMAGE}:${META_TAG} \ + --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -482,7 +483,8 @@ pipeline { stage('Build X86') { steps { echo "Running on node: ${NODE_NAME}" - sh "docker build \ + sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile" + sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-calibre-web/packages\" \ @@ -495,7 +497,7 @@ pipeline { --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Calibre-web\" \ --label \"org.opencontainers.image.description=[Calibre-web](https://github.com/janeczku/calibre-web) is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself. This software is a fork of library and licensed under the GPL v3 License. \" \ - --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ + --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -509,7 +511,8 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build \ + sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf" + sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-calibre-web/packages\" \ @@ -522,7 +525,7 @@ pipeline { --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Calibre-web\" \ --label \"org.opencontainers.image.description=[Calibre-web](https://github.com/janeczku/calibre-web) is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself. This software is a fork of library and licensed under the GPL v3 License. \" \ - --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ + --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { @@ -543,7 +546,8 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build \ + sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64" + sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-calibre-web/packages\" \ @@ -556,7 +560,7 @@ pipeline { --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Calibre-web\" \ --label \"org.opencontainers.image.description=[Calibre-web](https://github.com/janeczku/calibre-web) is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself. This software is a fork of library and licensed under the GPL v3 License. \" \ - --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { @@ -585,26 +589,12 @@ pipeline { else LOCAL_CONTAINER=${IMAGE}:${META_TAG} fi - if [ "${DIST_IMAGE}" == "alpine" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apk info -v > /tmp/package_versions.txt && \ - sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - elif [ "${DIST_IMAGE}" == "ubuntu" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \ - sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - elif [ "${DIST_IMAGE}" == "fedora" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - rpm -qa > /tmp/package_versions.txt && \ - sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - elif [ "${DIST_IMAGE}" == "arch" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - pacman -Q > /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - fi + touch ${TEMPDIR}/package_versions.txt + docker run --rm \ + -v /var/run/docker.sock:/var/run/docker.sock:ro \ + -v ${TEMPDIR}:/tmp \ + ghcr.io/anchore/syft:latest \ + ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then From 8e91841c8891ef83af4659f518e2e68011704202 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 4 Mar 2023 11:16:13 +0100 Subject: [PATCH 152/248] Bot Updating Package Versions --- package_versions.txt | 616 +++++++++++++++++++++++++++---------------- 1 file changed, 383 insertions(+), 233 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6fb29197e..1be9e0874 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,233 +1,383 @@ -adduser3.118ubuntu5 -apt2.4.8 -apt-utils2.4.8 -base-files12ubuntu4.3 -base-passwd3.5.52build1 -bash5.1-6ubuntu1 -bsdutils1:2.37.2-4ubuntu3 -ca-certificates20211016ubuntu0.22.04.1 -coreutils8.32-4.1ubuntu1 -curl7.81.0-1ubuntu1.8 -dash0.5.11+git20210903+057cd650a4ed-3build1 -debconf1.5.79ubuntu1 -debianutils5.5-1ubuntu2 -diffutils1:3.8-0ubuntu2 -dirmngr2.2.27-3ubuntu2.1 -dpkg1.21.1ubuntu2.1 -e2fsprogs1.46.5-2ubuntu1.1 -findutils4.8.0-1ubuntu3 -fontconfig-config2.13.1-4.2ubuntu5 -fonts-urw-base3520200910-1 -gcc-12-base12.1.0-2ubuntu1~22.04 -ghostscript9.55.0~dfsg1-0ubuntu5.1 -gnupg2.2.27-3ubuntu2.1 -gnupg-l10n2.2.27-3ubuntu2.1 -gnupg-utils2.2.27-3ubuntu2.1 -gpg2.2.27-3ubuntu2.1 -gpg-agent2.2.27-3ubuntu2.1 -gpgconf2.2.27-3ubuntu2.1 -gpgsm2.2.27-3ubuntu2.1 -gpgv2.2.27-3ubuntu2.1 -gpg-wks-client2.2.27-3ubuntu2.1 -gpg-wks-server2.2.27-3ubuntu2.1 -grep3.7-1build1 -gzip1.10-4ubuntu4.1 -hicolor-icon-theme0.17-2 -hostname3.23ubuntu2 -imagemagick-6-common8:6.9.11.60+dfsg-1.3build2 -imagemagick-6.q168:6.9.11.60+dfsg-1.3build2 -imagemagick8:6.9.11.60+dfsg-1.3build2 -init-system-helpers1.62 -jq1.6-2.1ubuntu3 -libacl12.3.1-1 -libaom33.3.0-1 -libapt-pkg6.02.4.8 -libassuan02.5.5-1build1 -libattr11:2.5.1-1build1 -libaudit11:3.0.7-1build1 -libaudit-common1:3.0.7-1build1 -libavahi-client30.8-5ubuntu5 -libavahi-common30.8-5ubuntu5 -libavahi-common-data0.8-5ubuntu5 -libblkid12.37.2-4ubuntu3 -libbrotli11.0.9-2build6 -libbsd00.11.5-1 -libbz2-1.01.0.8-5build1 -libc62.35-0ubuntu3.1 -libcap21:2.44-1build3 -libcap-ng00.7.9-2.2build3 -libc-bin2.35-0ubuntu3.1 -libcom-err21.46.5-2ubuntu1.1 -libcrypt11:4.4.27-1 -libcups22.4.1op1-1ubuntu4.1 -libcurl47.81.0-1ubuntu1.8 -libdav1d50.9.2-1 -libdb5.35.3.28+dfsg1-0.8ubuntu3 -libdbus-1-31.12.20-2ubuntu4.1 -libde265-01.0.8-1 -libdebconfclient00.261ubuntu1 -libdeflate01.10-2 -libexpat12.4.7-1ubuntu0.2 -libext2fs21.46.5-2ubuntu1.1 -libffi83.4.2-4 -libfftw3-double33.3.8-2ubuntu8 -libfontconfig12.13.1-4.2ubuntu5 -libfreetype62.11.1+dfsg-1ubuntu0.1 -libgcc-s112.1.0-2ubuntu1~22.04 -libgcrypt201.9.4-3ubuntu3 -libglib2.0-02.72.4-0ubuntu1 -libgmp102:6.2.1+dfsg-3ubuntu1 -libgnutls303.7.3-4ubuntu1.1 -libgomp112.1.0-2ubuntu1~22.04 -libgpg-error01.43-3 -libgs99.55.0~dfsg1-0ubuntu5.1 -libgs9-common9.55.0~dfsg1-0ubuntu5.1 -libgssapi-krb5-21.19.2-2ubuntu0.1 -libheif11.12.0-2build1 -libhogweed63.7.3-1build2 -libicu7070.1-2 -libidn121.38-4build1 -libidn2-02.3.2-2build1 -libijs-0.350.35-15build2 -libjbig02.1-3.1ubuntu0.22.04.1 -libjbig2dec00.19-3build2 -libjpeg88c-2ubuntu10 -libjpeg-turbo82.1.2-0ubuntu1 -libjq11.6-2.1ubuntu3 -libk5crypto31.19.2-2ubuntu0.1 -libkeyutils11.6.1-2ubuntu3 -libkrb5-31.19.2-2ubuntu0.1 -libkrb5support01.19.2-2ubuntu0.1 -libksba81.6.0-2ubuntu0.2 -liblcms2-22.12~rc1-2build2 -libldap-2.5-02.5.13+dfsg-0ubuntu0.22.04.1 -libldap-common2.5.13+dfsg-0ubuntu0.22.04.1 -liblqr-1-00.4.2-2.1 -libltdl72.4.6-15build2 -liblz4-11.9.3-2build2 -liblzma55.2.5-2ubuntu1 -libmagickcore-6.q16-68:6.9.11.60+dfsg-1.3build2 -libmagickwand-6.q16-68:6.9.11.60+dfsg-1.3build2 -libmd01.0.4-1build1 -libmount12.37.2-4ubuntu3 -libmpdec32.5.1-2build2 -libncurses66.3-2 -libncursesw66.3-2 -libnettle83.7.3-1build2 -libnghttp2-141.43.0-1build3 -libnpth01.6-3build2 -libnsl21.3.0-2build2 -libnspr42:4.32-3build1 -libnss32:3.68.2-0ubuntu1.2 -libnuma12.0.14-3ubuntu2 -libonig56.9.7.1-2build1 -libopenjp2-72.4.0-6 -libp11-kit00.24.0-6build1 -libpam0g1.4.0-11ubuntu2.3 -libpam-modules1.4.0-11ubuntu2.3 -libpam-modules-bin1.4.0-11ubuntu2.3 -libpam-runtime1.4.0-11ubuntu2.3 -libpaper11.1.28build2 -libpcre2-8-010.39-3ubuntu0.1 -libpcre32:8.39-13ubuntu0.22.04.1 -libpng16-161.6.37-3build5 -libprocps82:3.3.17-6ubuntu2 -libpsl50.21.0-1.2build2 -libpthread-stubs0-dev0.4-1build2 -libpython3.10-minimal3.10.6-1~22.04.2 -libpython3.10-stdlib3.10.6-1~22.04.2 -libpython3-stdlib3.10.6-1~22.04 -libreadline88.1.2-1 -librtmp12.4+20151223.gitfa8646d.1-2build4 -libsasl2-22.1.27+dfsg2-3ubuntu1.1 -libsasl2-modules2.1.27+dfsg2-3ubuntu1.1 -libsasl2-modules-db2.1.27+dfsg2-3ubuntu1.1 -libseccomp22.5.3-2ubuntu2 -libselinux13.3-1build2 -libsemanage23.3-1build2 -libsemanage-common3.3-1build2 -libsepol23.3-1build1 -libsmartcols12.37.2-4ubuntu3 -libsqlite3-03.37.2-2ubuntu0.1 -libss21.46.5-2ubuntu1.1 -libssh-40.9.6-2build1 -libssl33.0.2-0ubuntu1.8 -libstdc++612.1.0-2ubuntu1~22.04 -libsystemd0249.11-0ubuntu3.6 -libtasn1-64.18.0-4build1 -libtiff54.3.0-6ubuntu0.3 -libtinfo66.3-2 -libtirpc31.3.2-2ubuntu0.1 -libtirpc-common1.3.2-2ubuntu0.1 -libudev1249.11-0ubuntu3.6 -libunistring21.0-1 -libuuid12.37.2-4ubuntu3 -libwebp71.2.2-2 -libwebpdemux21.2.2-2 -libwebpmux31.2.2-2 -libx11-62:1.7.5-1 -libx11-data2:1.7.5-1 -libx11-dev2:1.7.5-1 -libx265-1993.5-2 -libxau61:1.0.9-1build5 -libxau-dev1:1.0.9-1build5 -libxcb11.14-3ubuntu3 -libxcb1-dev1.14-3ubuntu3 -libxcomposite11:0.4.5-1build2 -libxdmcp61:1.1.3-0ubuntu5 -libxdmcp-dev1:1.1.3-0ubuntu5 -libxext62:1.3.4-1build1 -libxi62:1.8-1build1 -libxkbfile11:1.1.0-1build3 -libxkbfile-dev1:1.1.0-1build3 -libxml22.9.13+dfsg-1ubuntu0.2 -libxrandr22:1.5.2-1build1 -libxrender11:0.9.10-1build4 -libxslt1.11.1.34-4ubuntu0.22.04.1 -libxtst62:1.2.3-1build4 -libxxhash00.8.1-1 -libzstd11.4.8+dfsg-3build1 -locales2.35-0ubuntu3.1 -login1:4.8.1-2ubuntu2.1 -logsave1.46.5-2ubuntu1.1 -lsb-base11.1.0ubuntu4 -mawk1.3.4.20200120-3 -media-types7.0.0 -mount2.37.2-4ubuntu3 -ncurses-base6.3-2 -ncurses-bin6.3-2 -netcat1.218-4ubuntu1 -netcat-openbsd1.218-4ubuntu1 -openssl3.0.2-0ubuntu1.8 -passwd1:4.8.1-2ubuntu2.1 -perl-base5.34.0-3ubuntu1.1 -pinentry-curses1.1.1-1build2 -poppler-data0.4.11-1 -procps2:3.3.17-6ubuntu2 -publicsuffix20211207.1025-1 -python3.103.10.6-1~22.04.2 -python3.10-minimal3.10.6-1~22.04.2 -python33.10.6-1~22.04 -python3-distutils3.10.6-1~22.04 -python3-lib2to33.10.6-1~22.04 -python3-minimal3.10.6-1~22.04 -python3-pip22.0.2+dfsg-1ubuntu0.1 -python3-pkg-resources59.6.0-1.2ubuntu0.22.04.1 -python3-setuptools59.6.0-1.2ubuntu0.22.04.1 -python3-wheel0.37.1-2ubuntu0.22.04.1 -readline-common8.1.2-1 -sed4.8-1ubuntu2 -sensible-utils0.0.17 -sysvinit-utils3.01-1ubuntu1 -tar1.34+dfsg-1build3 -tzdata2022g-0ubuntu0.22.04.1 -ubuntu-keyring2021.03.26 -ucf3.0043 -unrar1:6.1.5-1 -usrmerge25ubuntu2 -util-linux2.37.2-4ubuntu3 -x11-common1:7.7+23ubuntu2 -x11proto-dev2021.5-1 -xorg-sgml-doctools1:1.11-1.1 -xtrans-dev1.4.0-1 -zlib1g1:1.2.11.dfsg-2ubuntu9.2 +NAME VERSION TYPE +APScheduler 3.10.1 python +Babel 2.12.1 python +Deprecated 1.2.13 python +Flask 2.1.3 python +Flask-Dance 6.2.0 python +Flask-Limiter 3.2.0 python +Flask-Login 0.6.2 python +Flask-Principal 0.4.0 python +Flask-SimpleLDAP 1.4.0 python +Flask-WTF 1.1.1 python +Jinja2 3.1.2 python +Levenshtein 0.20.9 python +MarkupSafe 2.1.2 python +PyDrive2 1.15.1 python +PySocks 1.7.1 python +PyYAML 6.0 python +Pygments 2.14.0 python +SQLAlchemy 1.4.46 python +SQLAlchemy-Utils 0.39.0 python +Sphinx 6.1.3 python +URLObject 2.4.3 python +Unidecode 1.3.6 python +WTForms 3.0.1 python +Wand 0.6.11 python +Werkzeug 2.0.3 python +adduser 3.118ubuntu5 deb +advocate 1.0.0 python +alabaster 0.7.13 python +anyio 3.6.2 python +apt 2.4.8 deb +apt-utils 2.4.8 deb +arrow 1.2.3 python +async-generator 1.10 python +attrs 22.2.0 python +backports-abc 0.5 python +base-files 12ubuntu4.3 deb +base-passwd 3.5.52build1 deb +bash 5.1-6ubuntu1 deb +beautifulsoup4 4.11.2 python +bibtexparser 1.4.0 python +blinker 1.5 python +bsdutils 1:2.37.2-4ubuntu3 deb +ca-certificates 20211016ubuntu0.22.04.1 deb +cachetools 5.3.0 python +cchardet 2.1.7 python +certifi 2022.12.7 python +cffi 1.15.1 python +chardet 4.0.0 python +charset-normalizer 2.0.12 python +click 8.1.3 python +comicapi 2.2.1 python +coreutils 8.32-4.1ubuntu1 deb +cryptography 39.0.2 python +curl 7.81.0-1ubuntu1.8 deb +dash 0.5.11+git20210903+057cd650a4ed-3build1 deb +debconf 1.5.79ubuntu1 deb +debianutils 5.5-1ubuntu2 deb +diffutils 1:3.8-0ubuntu2 deb +dirmngr 2.2.27-3ubuntu2.1 deb +docutils 0.18.1 python +dpkg 1.21.1ubuntu2.1 deb +dpkg-dev 1.21.1ubuntu2.1 deb +e2fsprogs 1.46.5-2ubuntu1.1 deb +exceptiongroup 1.1.0 python +fake-useragent 1.1.1 python +findutils 4.8.0-1ubuntu3 deb +flask-babel 3.0.1 python +fontconfig-config 2.13.1-4.2ubuntu5 deb +fonts-urw-base35 20200910-1 deb +free-proxy 1.1.1 python +gcc-12-base 12.1.0-2ubuntu1~22.04 deb +gevent 22.10.2 python +ghostscript 9.55.0~dfsg1-0ubuntu5.1 deb +github.com/beevik/etree v1.1.0 go-module +github.com/kr/smartypants v0.1.0 go-module +github.com/pgaskin/kepubify/_/html v0.0.0-20211223234002-6ee2cc632cdc go-module +github.com/pgaskin/kepubify/v4 (devel) go-module +github.com/spf13/pflag v1.0.5 go-module +gnupg 2.2.27-3ubuntu2.1 deb +gnupg-l10n 2.2.27-3ubuntu2.1 deb +gnupg-utils 2.2.27-3ubuntu2.1 deb +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c go-module +golang.org/x/text v0.3.6 go-module +goodreads 0.3.2 python +google-api-core 2.11.0 python +google-api-python-client 2.77.0 python +google-auth 2.16.2 python +google-auth-httplib2 0.1.0 python +google-auth-oauthlib 0.8.0 python +googleapis-common-protos 1.58.0 python +gpg 2.2.27-3ubuntu2.1 deb +gpg-agent 2.2.27-3ubuntu2.1 deb +gpg-wks-client 2.2.27-3ubuntu2.1 deb +gpg-wks-server 2.2.27-3ubuntu2.1 deb +gpgconf 2.2.27-3ubuntu2.1 deb +gpgsm 2.2.27-3ubuntu2.1 deb +gpgv 2.2.27-3ubuntu2.1 deb +greenlet 2.0.2 python +grep 3.7-1build1 deb +gzip 1.10-4ubuntu4.1 deb +h11 0.14.0 python +hicolor-icon-theme 0.17-2 deb +hostname 3.23ubuntu2 deb +html2text 2020.1.16 python +httpcore 0.16.3 python +httplib2 0.21.0 python +httpx 0.23.3 python +idna 3.4 python +imagemagick 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.1 deb +imagemagick-6-common 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.1 deb +imagemagick-6.q16 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.1 deb +imagesize 1.4.1 python +init-system-helpers 1.62 deb +iso-639 0.4.5 python +itsdangerous 2.1.2 python +jq 1.6-2.1ubuntu3 deb +jsonschema 4.17.3 python +libacl1 2.3.1-1 deb +libaom3 3.3.0-1 deb +libapt-pkg6.0 2.4.8 deb +libassuan0 2.5.5-1build1 deb +libattr1 1:2.5.1-1build1 deb +libaudit-common 1:3.0.7-1build1 deb +libaudit1 1:3.0.7-1build1 deb +libavahi-client3 0.8-5ubuntu5 deb +libavahi-common-data 0.8-5ubuntu5 deb +libavahi-common3 0.8-5ubuntu5 deb +libblkid1 2.37.2-4ubuntu3 deb +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.1 deb +libc6 2.35-0ubuntu3.1 deb +libcap-ng0 0.7.9-2.2build3 deb +libcap2 1:2.44-1build3 deb +libcom-err2 1.46.5-2ubuntu1.1 deb +libcrypt1 1:4.4.27-1 deb +libcups2 2.4.1op1-1ubuntu4.1 deb +libcurl4 7.81.0-1ubuntu1.8 deb +libdav1d5 0.9.2-1 deb +libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb +libdbus-1-3 1.12.20-2ubuntu4.1 deb +libde265-0 1.0.8-1 deb +libdebconfclient0 0.261ubuntu1 deb +libdeflate0 1.10-2 deb +libexpat1 2.4.7-1ubuntu0.2 deb +libext2fs2 1.46.5-2ubuntu1.1 deb +libffi8 3.4.2-4 deb +libfftw3-double3 3.3.8-2ubuntu8 deb +libfontconfig1 2.13.1-4.2ubuntu5 deb +libfreetype6 2.11.1+dfsg-1ubuntu0.1 deb +libgcc-s1 12.1.0-2ubuntu1~22.04 deb +libgcrypt20 1.9.4-3ubuntu3 deb +libglib2.0-0 2.72.4-0ubuntu1 deb +libgmp10 2:6.2.1+dfsg-3ubuntu1 deb +libgnutls30 3.7.3-4ubuntu1.1 deb +libgomp1 12.1.0-2ubuntu1~22.04 deb +libgpg-error0 1.43-3 deb +libgs9 9.55.0~dfsg1-0ubuntu5.1 deb +libgs9-common 9.55.0~dfsg1-0ubuntu5.1 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.1 deb +libheif1 1.12.0-2build1 deb +libhogweed6 3.7.3-1build2 deb +libicu70 70.1-2 deb +libidn12 1.38-4build1 deb +libidn2-0 2.3.2-2build1 deb +libijs-0.35 0.35-15build2 deb +libjbig0 2.1-3.1ubuntu0.22.04.1 deb +libjbig2dec0 0.19-3build2 deb +libjpeg-turbo8 2.1.2-0ubuntu1 deb +libjpeg8 8c-2ubuntu10 deb +libjq1 1.6-2.1ubuntu3 deb +libjs-jquery 3.6.0+dfsg+~3.5.13-1 deb +libk5crypto3 1.19.2-2ubuntu0.1 deb +libkeyutils1 1.6.1-2ubuntu3 deb +libkrb5-3 1.19.2-2ubuntu0.1 deb +libkrb5support0 1.19.2-2ubuntu0.1 deb +libksba8 1.6.0-2ubuntu0.2 deb +liblcms2-2 2.12~rc1-2build2 deb +libldap-2.5-0 2.5.13+dfsg-0ubuntu0.22.04.1 deb +libldap-common 2.5.13+dfsg-0ubuntu0.22.04.1 deb +liblqr-1-0 0.4.2-2.1 deb +libltdl7 2.4.6-15build2 deb +liblz4-1 1.9.3-2build2 deb +liblzma5 5.2.5-2ubuntu1 deb +libmagickcore-6.q16-6 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.1 deb +libmagickwand-6.q16-6 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.1 deb +libmd0 1.0.4-1build1 deb +libmount1 2.37.2-4ubuntu3 deb +libmpdec3 2.5.1-2build2 deb +libncurses6 6.3-2 deb +libncursesw6 6.3-2 deb +libnettle8 3.7.3-1build2 deb +libnghttp2-14 1.43.0-1build3 deb +libnpth0 1.6-3build2 deb +libnsl2 1.3.0-2build2 deb +libnspr4 2:4.32-3build1 deb +libnss3 2:3.68.2-0ubuntu1.2 deb +libnuma1 2.0.14-3ubuntu2 deb +libonig5 6.9.7.1-2build1 deb +libopenjp2-7 2.4.0-6 deb +libp11-kit0 0.24.0-6build1 deb +libpam-modules 1.4.0-11ubuntu2.3 deb +libpam-modules-bin 1.4.0-11ubuntu2.3 deb +libpam-runtime 1.4.0-11ubuntu2.3 deb +libpam0g 1.4.0-11ubuntu2.3 deb +libpaper1 1.1.28build2 deb +libpcre2-8-0 10.39-3ubuntu0.1 deb +libpcre3 2:8.39-13ubuntu0.22.04.1 deb +libpng16-16 1.6.37-3build5 deb +libprocps8 2:3.3.17-6ubuntu2 deb +libpsl5 0.21.0-1.2build2 deb +libpthread-stubs0-dev 0.4-1build2 deb +libpython3-stdlib 3.10.6-1~22.04 deb +libpython3.10-minimal 3.10.6-1~22.04.2 deb +libpython3.10-stdlib 3.10.6-1~22.04.2 deb +libreadline8 8.1.2-1 deb +librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb +libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb +libseccomp2 2.5.3-2ubuntu2 deb +libselinux1 3.3-1build2 deb +libsemanage-common 3.3-1build2 deb +libsemanage2 3.3-1build2 deb +libsepol2 3.3-1build1 deb +libsmartcols1 2.37.2-4ubuntu3 deb +libsqlite3-0 3.37.2-2ubuntu0.1 deb +libss2 1.46.5-2ubuntu1.1 deb +libssh-4 0.9.6-2build1 deb +libssl3 3.0.2-0ubuntu1.8 deb +libstdc++6 12.1.0-2ubuntu1~22.04 deb +libsystemd0 249.11-0ubuntu3.6 deb +libtasn1-6 4.18.0-4build1 deb +libtiff5 4.3.0-6ubuntu0.3 deb +libtinfo6 6.3-2 deb +libtirpc-common 1.3.2-2ubuntu0.1 deb +libtirpc3 1.3.2-2ubuntu0.1 deb +libudev1 249.11-0ubuntu3.6 deb +libunistring2 1.0-1 deb +libuuid1 2.37.2-4ubuntu3 deb +libwebp7 1.2.2-2 deb +libwebpdemux2 1.2.2-2 deb +libwebpmux3 1.2.2-2 deb +libx11-6 2:1.7.5-1 deb +libx11-data 2:1.7.5-1 deb +libx11-dev 2:1.7.5-1 deb +libx265-199 3.5-2 deb +libxau-dev 1:1.0.9-1build5 deb +libxau6 1:1.0.9-1build5 deb +libxcb1 1.14-3ubuntu3 deb +libxcb1-dev 1.14-3ubuntu3 deb +libxcomposite1 1:0.4.5-1build2 deb +libxdmcp-dev 1:1.1.3-0ubuntu5 deb +libxdmcp6 1:1.1.3-0ubuntu5 deb +libxext6 2:1.3.4-1build1 deb +libxi6 2:1.8-1build1 deb +libxkbfile-dev 1:1.1.0-1build3 deb +libxkbfile1 1:1.1.0-1build3 deb +libxml2 2.9.13+dfsg-1ubuntu0.2 deb +libxrandr2 2:1.5.2-1build1 deb +libxrender1 1:0.9.10-1build4 deb +libxslt1.1 1.1.34-4ubuntu0.22.04.1 deb +libxtst6 2:1.2.3-1build4 deb +libxxhash0 0.8.1-1 deb +libzstd1 1.4.8+dfsg-3build1 deb +limits 3.2.0 python +locales 2.35-0ubuntu3.1 deb +login 1:4.8.1-2ubuntu2.1 deb +logsave 1.46.5-2ubuntu1.1 deb +lsb-base 11.1.0ubuntu4 deb +lxml 4.9.2 python +markdown-it-py 2.2.0 python +markdown2 2.4.8 python +mawk 1.3.4.20200120-3 deb +mdurl 0.1.2 python +media-types 7.0.0 deb +mount 2.37.2-4ubuntu3 deb +natsort 8.2.0 python +ncurses-base 6.3-2 deb +ncurses-bin 6.3-2 deb +ndg-httpsclient 0.5.1 python +netcat 1.218-4ubuntu1 deb +netcat-openbsd 1.218-4ubuntu1 deb +netifaces 0.11.0 python +nose 1.3.7 python +oauth2client 4.1.3 python +oauthlib 3.2.2 python +openssl 3.0.2-0ubuntu1.8 deb +ordered-set 4.1.0 python +outcome 1.2.0 python +packaging 23.0 python +passwd 1:4.8.1-2ubuntu2.1 deb +perl 5.34.0-3ubuntu1.1 deb +perl-base 5.34.0-3ubuntu1.1 deb +pinentry-curses 1.1.1-1build2 deb +pip 22.0.2 python +pip 23.0.1 python +poppler-data 0.4.11-1 deb +procps 2:3.3.17-6ubuntu2 deb +protobuf 4.22.0 python +publicsuffix 20211207.1025-1 deb +pyOpenSSL 23.0.0 python +pyasn1 0.4.8 python +pyasn1-modules 0.2.8 python +pycparser 2.21 python +pyparsing 3.0.9 python +pypdf 3.4.0 python +pyrsistent 0.19.3 python +python 3.10.6 binary +python-Levenshtein 0.20.9 python +python-dateutil 2.8.2 python +python-dotenv 1.0.0 python +python-ldap 3.4.3 python +python3 3.10.6-1~22.04 deb +python3-distutils 3.10.6-1~22.04 deb +python3-lib2to3 3.10.6-1~22.04 deb +python3-minimal 3.10.6-1~22.04 deb +python3-pip 22.0.2+dfsg-1ubuntu0.2 deb +python3-pkg-resources 59.6.0-1.2ubuntu0.22.04.1 deb +python3-setuptools 59.6.0-1.2ubuntu0.22.04.1 deb +python3-wheel 0.37.1-2ubuntu0.22.04.1 deb +python3.10 3.10.6-1~22.04.2 deb +python3.10-minimal 3.10.6-1~22.04.2 deb +pytz 2022.7.1 python +pytz-deprecation-shim 0.1.0.post0 python +rapidfuzz 2.13.7 python +rarfile 4.0 python +rauth 0.7.3 python +readline-common 8.1.2-1 deb +requests 2.27.1 python +requests-oauthlib 1.3.1 python +rfc3986 1.5.0 python +rich 13.3.1 python +rsa 4.9 python +scholarly 1.7.11 python +sed 4.8-1ubuntu2 deb +selenium 4.8.2 python +sensible-utils 0.0.17 deb +setuptools 59.6.0 python +setuptools 67.4.0 python +six 1.16.0 python +sniffio 1.3.0 python +snowballstemmer 2.2.0 python +sortedcontainers 2.4.0 python +soupsieve 2.4 python +sphinx-rtd-theme 1.2.0 python +sphinxcontrib-applehelp 1.0.4 python +sphinxcontrib-devhelp 1.0.2 python +sphinxcontrib-htmlhelp 2.0.1 python +sphinxcontrib-jquery 2.0.0 python +sphinxcontrib-jsmath 1.0.1 python +sphinxcontrib-qthelp 1.0.3 python +sphinxcontrib-serializinghtml 1.1.5 python +sysvinit-utils 3.01-1ubuntu1 deb +tar 1.34+dfsg-1build3 deb +tornado 6.2 python +trio 0.22.0 python +trio-websocket 0.9.2 python +typing_extensions 4.5.0 python +tzdata 2022.7 python +tzdata 2022g-0ubuntu0.22.04.1 deb +tzlocal 4.2 python +ubuntu-keyring 2021.03.26 deb +ucf 3.0043 deb +unrar 1:6.1.5-1 deb +uritemplate 4.1.1 python +urllib3 1.26.14 python +usrmerge 25ubuntu2 deb +util-linux 2.37.2-4ubuntu3 deb +wheel 0.37.1 python +wheel 0.38.4 python +wrapt 1.15.0 python +wsproto 1.2.0 python +x11-common 1:7.7+23ubuntu2 deb +x11proto-dev 2021.5-1 deb +xmltodict 0.13.0 python +xorg-sgml-doctools 1:1.11-1.1 deb +xtrans-dev 1.4.0-1 deb +zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb +zope.event 4.6 python +zope.interface 5.5.2 python From 57901ac27824381f8adfbe057a63b8e67dd628c5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 5 Mar 2023 09:14:16 -0600 Subject: [PATCH 153/248] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1be9e0874..5f182c585 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ Babel 2.12.1 pyt Deprecated 1.2.13 python Flask 2.1.3 python Flask-Dance 6.2.0 python -Flask-Limiter 3.2.0 python +Flask-Limiter 3.3.0 python Flask-Login 0.6.2 python Flask-Principal 0.4.0 python Flask-SimpleLDAP 1.4.0 python @@ -47,7 +47,7 @@ cchardet 2.1.7 pyt certifi 2022.12.7 python cffi 1.15.1 python chardet 4.0.0 python -charset-normalizer 2.0.12 python +charset-normalizer 3.0.1 python click 8.1.3 python comicapi 2.2.1 python coreutils 8.32-4.1ubuntu1 deb @@ -277,7 +277,7 @@ mawk 1.3.4.20200120-3 deb mdurl 0.1.2 python media-types 7.0.0 deb mount 2.37.2-4ubuntu3 deb -natsort 8.2.0 python +natsort 8.3.1 python ncurses-base 6.3-2 deb ncurses-bin 6.3-2 deb ndg-httpsclient 0.5.1 python @@ -306,7 +306,7 @@ pyasn1 0.4.8 pyt pyasn1-modules 0.2.8 python pycparser 2.21 python pyparsing 3.0.9 python -pypdf 3.4.0 python +pypdf 3.5.1 python pyrsistent 0.19.3 python python 3.10.6 binary python-Levenshtein 0.20.9 python @@ -329,10 +329,10 @@ rapidfuzz 2.13.7 pyt rarfile 4.0 python rauth 0.7.3 python readline-common 8.1.2-1 deb -requests 2.27.1 python +requests 2.28.2 python requests-oauthlib 1.3.1 python rfc3986 1.5.0 python -rich 13.3.1 python +rich 13.3.2 python rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb From 05e2d9e9bb8763ab5e02b619f047732bdd6087c1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 7 Mar 2023 03:43:17 -0600 Subject: [PATCH 154/248] 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 5f182c585..cd33440b8 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -47,7 +47,7 @@ cchardet 2.1.7 pyt certifi 2022.12.7 python cffi 1.15.1 python chardet 4.0.0 python -charset-normalizer 3.0.1 python +charset-normalizer 3.1.0 python click 8.1.3 python comicapi 2.2.1 python coreutils 8.32-4.1ubuntu1 deb @@ -154,7 +154,7 @@ libgcc-s1 12.1.0-2ubuntu1~22.04 deb libgcrypt20 1.9.4-3ubuntu3 deb libglib2.0-0 2.72.4-0ubuntu1 deb libgmp10 2:6.2.1+dfsg-3ubuntu1 deb -libgnutls30 3.7.3-4ubuntu1.1 deb +libgnutls30 3.7.3-4ubuntu1.2 deb libgomp1 12.1.0-2ubuntu1~22.04 deb libgpg-error0 1.43-3 deb libgs9 9.55.0~dfsg1-0ubuntu5.1 deb @@ -233,7 +233,7 @@ libssl3 3.0.2-0ubuntu1.8 deb libstdc++6 12.1.0-2ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.6 deb libtasn1-6 4.18.0-4build1 deb -libtiff5 4.3.0-6ubuntu0.3 deb +libtiff5 4.3.0-6ubuntu0.4 deb libtinfo6 6.3-2 deb libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb @@ -339,7 +339,7 @@ sed 4.8-1ubuntu2 deb selenium 4.8.2 python sensible-utils 0.0.17 deb setuptools 59.6.0 python -setuptools 67.4.0 python +setuptools 67.5.1 python six 1.16.0 python sniffio 1.3.0 python snowballstemmer 2.2.0 python @@ -354,7 +354,7 @@ sphinxcontrib-jsmath 1.0.1 pyt sphinxcontrib-qthelp 1.0.3 python sphinxcontrib-serializinghtml 1.1.5 python sysvinit-utils 3.01-1ubuntu1 deb -tar 1.34+dfsg-1build3 deb +tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb tornado 6.2 python trio 0.22.0 python trio-websocket 0.9.2 python From 47811fadeb972b926a3579d20b81cdecacdef36d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 14 Mar 2023 10:44:40 +0100 Subject: [PATCH 155/248] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cd33440b8..161cffd8f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -62,7 +62,7 @@ docutils 0.18.1 pyt dpkg 1.21.1ubuntu2.1 deb dpkg-dev 1.21.1ubuntu2.1 deb e2fsprogs 1.46.5-2ubuntu1.1 deb -exceptiongroup 1.1.0 python +exceptiongroup 1.1.1 python fake-useragent 1.1.1 python findutils 4.8.0-1ubuntu3 deb flask-babel 3.0.1 python @@ -299,14 +299,14 @@ pip 22.0.2 pyt pip 23.0.1 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb -protobuf 4.22.0 python +protobuf 4.22.1 python publicsuffix 20211207.1025-1 deb pyOpenSSL 23.0.0 python pyasn1 0.4.8 python pyasn1-modules 0.2.8 python pycparser 2.21 python pyparsing 3.0.9 python -pypdf 3.5.1 python +pypdf 3.5.2 python pyrsistent 0.19.3 python python 3.10.6 binary python-Levenshtein 0.20.9 python @@ -339,7 +339,7 @@ sed 4.8-1ubuntu2 deb selenium 4.8.2 python sensible-utils 0.0.17 deb setuptools 59.6.0 python -setuptools 67.5.1 python +setuptools 67.6.0 python six 1.16.0 python sniffio 1.3.0 python snowballstemmer 2.2.0 python @@ -357,7 +357,7 @@ sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb tornado 6.2 python trio 0.22.0 python -trio-websocket 0.9.2 python +trio-websocket 0.10.0 python typing_extensions 4.5.0 python tzdata 2022.7 python tzdata 2022g-0ubuntu0.22.04.1 deb @@ -366,7 +366,7 @@ ubuntu-keyring 2021.03.26 deb ucf 3.0043 deb unrar 1:6.1.5-1 deb uritemplate 4.1.1 python -urllib3 1.26.14 python +urllib3 1.26.15 python usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3 deb wheel 0.37.1 python From a29e12bceff449b43e49010961d6b4b27f2ef4e9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 19 Mar 2023 12:14:49 -0500 Subject: [PATCH 156/248] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 161cffd8f..222d30bf0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,7 +16,7 @@ PyDrive2 1.15.1 pyt PySocks 1.7.1 python PyYAML 6.0 python Pygments 2.14.0 python -SQLAlchemy 1.4.46 python +SQLAlchemy 1.4.47 python SQLAlchemy-Utils 0.39.0 python Sphinx 6.1.3 python URLObject 2.4.3 python @@ -178,7 +178,7 @@ libkrb5-3 1.19.2-2ubuntu0.1 deb libkrb5support0 1.19.2-2ubuntu0.1 deb libksba8 1.6.0-2ubuntu0.2 deb liblcms2-2 2.12~rc1-2build2 deb -libldap-2.5-0 2.5.13+dfsg-0ubuntu0.22.04.1 deb +libldap-2.5-0 2.5.14+dfsg-0ubuntu0.22.04.1 deb libldap-common 2.5.13+dfsg-0ubuntu0.22.04.1 deb liblqr-1-0 0.4.2-2.1 deb libltdl7 2.4.6-15build2 deb @@ -349,7 +349,7 @@ sphinx-rtd-theme 1.2.0 pyt sphinxcontrib-applehelp 1.0.4 python sphinxcontrib-devhelp 1.0.2 python sphinxcontrib-htmlhelp 2.0.1 python -sphinxcontrib-jquery 2.0.0 python +sphinxcontrib-jquery 4.1 python sphinxcontrib-jsmath 1.0.1 python sphinxcontrib-qthelp 1.0.3 python sphinxcontrib-serializinghtml 1.1.5 python @@ -357,11 +357,11 @@ sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb tornado 6.2 python trio 0.22.0 python -trio-websocket 0.10.0 python +trio-websocket 0.10.2 python typing_extensions 4.5.0 python tzdata 2022.7 python tzdata 2022g-0ubuntu0.22.04.1 deb -tzlocal 4.2 python +tzlocal 4.3 python ubuntu-keyring 2021.03.26 deb ucf 3.0043 deb unrar 1:6.1.5-1 deb @@ -370,7 +370,7 @@ urllib3 1.26.15 pyt usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3 deb wheel 0.37.1 python -wheel 0.38.4 python +wheel 0.40.0 python wrapt 1.15.0 python wsproto 1.2.0 python x11-common 1:7.7+23ubuntu2 deb @@ -380,4 +380,4 @@ xorg-sgml-doctools 1:1.11-1.1 deb xtrans-dev 1.4.0-1 deb zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb zope.event 4.6 python -zope.interface 5.5.2 python +zope.interface 6.0 python From 7263694f19c8bec6319b9f1de6944cd37104b11f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 20 Mar 2023 19:17:37 +0100 Subject: [PATCH 157/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 222d30bf0..d5e2d393b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -213,8 +213,8 @@ libprocps8 2:3.3.17-6ubuntu2 deb libpsl5 0.21.0-1.2build2 deb libpthread-stubs0-dev 0.4-1build2 deb libpython3-stdlib 3.10.6-1~22.04 deb -libpython3.10-minimal 3.10.6-1~22.04.2 deb -libpython3.10-stdlib 3.10.6-1~22.04.2 deb +libpython3.10-minimal 3.10.6-1~22.04.2ubuntu1 deb +libpython3.10-stdlib 3.10.6-1~22.04.2ubuntu1 deb libreadline8 8.1.2-1 deb librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb @@ -321,8 +321,8 @@ python3-pip 22.0.2+dfsg-1ubuntu0.2 deb python3-pkg-resources 59.6.0-1.2ubuntu0.22.04.1 deb python3-setuptools 59.6.0-1.2ubuntu0.22.04.1 deb python3-wheel 0.37.1-2ubuntu0.22.04.1 deb -python3.10 3.10.6-1~22.04.2 deb -python3.10-minimal 3.10.6-1~22.04.2 deb +python3.10 3.10.6-1~22.04.2ubuntu1 deb +python3.10-minimal 3.10.6-1~22.04.2ubuntu1 deb pytz 2022.7.1 python pytz-deprecation-shim 0.1.0.post0 python rapidfuzz 2.13.7 python From 9baee425b8221136679f21dc49fe23222a1f06f7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 Mar 2023 01:55:34 +0100 Subject: [PATCH 158/248] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d5e2d393b..fcdae5265 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -63,7 +63,7 @@ dpkg 1.21.1ubuntu2.1 deb dpkg-dev 1.21.1ubuntu2.1 deb e2fsprogs 1.46.5-2ubuntu1.1 deb exceptiongroup 1.1.1 python -fake-useragent 1.1.1 python +fake-useragent 1.1.3 python findutils 4.8.0-1ubuntu3 deb flask-babel 3.0.1 python fontconfig-config 2.13.1-4.2ubuntu5 deb @@ -107,9 +107,9 @@ httpcore 0.16.3 pyt httplib2 0.21.0 python httpx 0.23.3 python idna 3.4 python -imagemagick 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.1 deb -imagemagick-6-common 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.1 deb -imagemagick-6.q16 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.1 deb +imagemagick 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 deb +imagemagick-6-common 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 deb +imagemagick-6.q16 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 deb imagesize 1.4.1 python init-system-helpers 1.62 deb iso-639 0.4.5 python @@ -184,8 +184,8 @@ liblqr-1-0 0.4.2-2.1 deb libltdl7 2.4.6-15build2 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb -libmagickcore-6.q16-6 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.1 deb -libmagickwand-6.q16-6 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.1 deb +libmagickcore-6.q16-6 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 deb +libmagickwand-6.q16-6 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 deb libmd0 1.0.4-1build1 deb libmount1 2.37.2-4ubuntu3 deb libmpdec3 2.5.1-2build2 deb From 23781198206b675be611d8af618c98125fcd9681 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 Mar 2023 10:42:22 +0100 Subject: [PATCH 159/248] 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 fcdae5265..b86e1cdf9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -52,7 +52,7 @@ click 8.1.3 pyt comicapi 2.2.1 python coreutils 8.32-4.1ubuntu1 deb cryptography 39.0.2 python -curl 7.81.0-1ubuntu1.8 deb +curl 7.81.0-1ubuntu1.10 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb @@ -137,7 +137,7 @@ libcap2 1:2.44-1build3 deb libcom-err2 1.46.5-2ubuntu1.1 deb libcrypt1 1:4.4.27-1 deb libcups2 2.4.1op1-1ubuntu4.1 deb -libcurl4 7.81.0-1ubuntu1.8 deb +libcurl4 7.81.0-1ubuntu1.10 deb libdav1d5 0.9.2-1 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdbus-1-3 1.12.20-2ubuntu4.1 deb @@ -179,7 +179,7 @@ libkrb5support0 1.19.2-2ubuntu0.1 deb libksba8 1.6.0-2ubuntu0.2 deb liblcms2-2 2.12~rc1-2build2 deb libldap-2.5-0 2.5.14+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.13+dfsg-0ubuntu0.22.04.1 deb +libldap-common 2.5.14+dfsg-0ubuntu0.22.04.1 deb liblqr-1-0 0.4.2-2.1 deb libltdl7 2.4.6-15build2 deb liblz4-1 1.9.3-2build2 deb @@ -231,13 +231,13 @@ libss2 1.46.5-2ubuntu1.1 deb libssh-4 0.9.6-2build1 deb libssl3 3.0.2-0ubuntu1.8 deb libstdc++6 12.1.0-2ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.6 deb +libsystemd0 249.11-0ubuntu3.7 deb libtasn1-6 4.18.0-4build1 deb libtiff5 4.3.0-6ubuntu0.4 deb libtinfo6 6.3-2 deb libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.6 deb +libudev1 249.11-0ubuntu3.7 deb libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3 deb libwebp7 1.2.2-2 deb From fea8453ad58358415ed3a61dbf5de2c9ef0273f7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 Mar 2023 14:18:39 -0500 Subject: [PATCH 160/248] Bot Updating Package Versions --- package_versions.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b86e1cdf9..fe2214b67 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -88,7 +88,7 @@ google-api-python-client 2.77.0 pyt google-auth 2.16.2 python google-auth-httplib2 0.1.0 python google-auth-oauthlib 0.8.0 python -googleapis-common-protos 1.58.0 python +googleapis-common-protos 1.59.0 python gpg 2.2.27-3ubuntu2.1 deb gpg-agent 2.2.27-3ubuntu2.1 deb gpg-wks-client 2.2.27-3ubuntu2.1 deb @@ -111,6 +111,7 @@ imagemagick 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 deb imagemagick-6-common 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 deb imagemagick-6.q16 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 deb imagesize 1.4.1 python +importlib-resources 5.12.0 python init-system-helpers 1.62 deb iso-639 0.4.5 python itsdangerous 2.1.2 python @@ -265,7 +266,7 @@ libxslt1.1 1.1.34-4ubuntu0.22.04.1 deb libxtst6 2:1.2.3-1build4 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb -limits 3.2.0 python +limits 3.3.0 python locales 2.35-0ubuntu3.1 deb login 1:4.8.1-2ubuntu2.1 deb logsave 1.46.5-2ubuntu1.1 deb From 8ce356fa79ac33ed22fc09b1502718471ceede52 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 25 Mar 2023 11:14:11 +0100 Subject: [PATCH 161/248] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fe2214b67..713925b81 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -43,7 +43,6 @@ blinker 1.5 pyt bsdutils 1:2.37.2-4ubuntu3 deb ca-certificates 20211016ubuntu0.22.04.1 deb cachetools 5.3.0 python -cchardet 2.1.7 python certifi 2022.12.7 python cffi 1.15.1 python chardet 4.0.0 python @@ -51,7 +50,7 @@ charset-normalizer 3.1.0 pyt click 8.1.3 python comicapi 2.2.1 python coreutils 8.32-4.1ubuntu1 deb -cryptography 39.0.2 python +cryptography 40.0.1 python curl 7.81.0-1ubuntu1.10 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb @@ -64,6 +63,7 @@ dpkg-dev 1.21.1ubuntu2.1 deb e2fsprogs 1.46.5-2ubuntu1.1 deb exceptiongroup 1.1.1 python fake-useragent 1.1.3 python +faust-cchardet 2.1.18 python findutils 4.8.0-1ubuntu3 deb flask-babel 3.0.1 python fontconfig-config 2.13.1-4.2ubuntu5 deb @@ -85,7 +85,7 @@ golang.org/x/text v0.3.6 go- goodreads 0.3.2 python google-api-core 2.11.0 python google-api-python-client 2.77.0 python -google-auth 2.16.2 python +google-auth 2.16.3 python google-auth-httplib2 0.1.0 python google-auth-oauthlib 0.8.0 python googleapis-common-protos 1.59.0 python @@ -266,7 +266,7 @@ libxslt1.1 1.1.34-4ubuntu0.22.04.1 deb libxtst6 2:1.2.3-1build4 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb -limits 3.3.0 python +limits 3.3.1 python locales 2.35-0ubuntu3.1 deb login 1:4.8.1-2ubuntu2.1 deb logsave 1.46.5-2ubuntu1.1 deb @@ -302,7 +302,7 @@ poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb protobuf 4.22.1 python publicsuffix 20211207.1025-1 deb -pyOpenSSL 23.0.0 python +pyOpenSSL 23.1.0 python pyasn1 0.4.8 python pyasn1-modules 0.2.8 python pycparser 2.21 python @@ -337,7 +337,7 @@ rich 13.3.2 pyt rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb -selenium 4.8.2 python +selenium 4.8.3 python sensible-utils 0.0.17 deb setuptools 59.6.0 python setuptools 67.6.0 python @@ -360,8 +360,8 @@ tornado 6.2 pyt trio 0.22.0 python trio-websocket 0.10.2 python typing_extensions 4.5.0 python -tzdata 2022.7 python tzdata 2022g-0ubuntu0.22.04.1 deb +tzdata 2023.2 python tzlocal 4.3 python ubuntu-keyring 2021.03.26 deb ucf 3.0043 deb From 658a1fc76186ebe0ac332f9c8f9387b4d045a297 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 26 Mar 2023 15:17:22 +0200 Subject: [PATCH 162/248] 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 713925b81..aa21c477d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -84,7 +84,7 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c go- golang.org/x/text v0.3.6 go-module goodreads 0.3.2 python google-api-core 2.11.0 python -google-api-python-client 2.77.0 python +google-api-python-client 2.82.0 python google-auth 2.16.3 python google-auth-httplib2 0.1.0 python google-auth-oauthlib 0.8.0 python @@ -104,7 +104,7 @@ hicolor-icon-theme 0.17-2 deb hostname 3.23ubuntu2 deb html2text 2020.1.16 python httpcore 0.16.3 python -httplib2 0.21.0 python +httplib2 0.22.0 python httpx 0.23.3 python idna 3.4 python imagemagick 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 deb From 86987c123fe3403ad2723cc16d486356d2a63665 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 27 Mar 2023 18:18:23 +0200 Subject: [PATCH 163/248] 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 aa21c477d..6884cd1fb 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -333,7 +333,7 @@ readline-common 8.1.2-1 deb requests 2.28.2 python requests-oauthlib 1.3.1 python rfc3986 1.5.0 python -rich 13.3.2 python +rich 13.3.3 python rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb From 204541f41dd270720f75ab4019b71bb118f7a083 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 28 Mar 2023 04:42:32 -0500 Subject: [PATCH 164/248] 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 6884cd1fb..ed98c9e28 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -302,7 +302,7 @@ poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb protobuf 4.22.1 python publicsuffix 20211207.1025-1 deb -pyOpenSSL 23.1.0 python +pyOpenSSL 23.1.1 python pyasn1 0.4.8 python pyasn1-modules 0.2.8 python pycparser 2.21 python From 9843f619b506641127e51e7c7e7a000c57b265fd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 30 Mar 2023 12:15:44 +0200 Subject: [PATCH 165/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ed98c9e28..cf63197f9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -84,8 +84,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c go- golang.org/x/text v0.3.6 go-module goodreads 0.3.2 python google-api-core 2.11.0 python -google-api-python-client 2.82.0 python -google-auth 2.16.3 python +google-api-python-client 2.83.0 python +google-auth 2.17.0 python google-auth-httplib2 0.1.0 python google-auth-oauthlib 0.8.0 python googleapis-common-protos 1.59.0 python @@ -340,7 +340,7 @@ sed 4.8-1ubuntu2 deb selenium 4.8.3 python sensible-utils 0.0.17 deb setuptools 59.6.0 python -setuptools 67.6.0 python +setuptools 67.6.1 python six 1.16.0 python sniffio 1.3.0 python snowballstemmer 2.2.0 python @@ -361,7 +361,7 @@ trio 0.22.0 pyt trio-websocket 0.10.2 python typing_extensions 4.5.0 python tzdata 2022g-0ubuntu0.22.04.1 deb -tzdata 2023.2 python +tzdata 2023.3 python tzlocal 4.3 python ubuntu-keyring 2021.03.26 deb ucf 3.0043 deb From ca68cd083555e7f77aed2606614c88efaa045aa5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 31 Mar 2023 01:18:18 -0500 Subject: [PATCH 166/248] 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 cf63197f9..e420ef1a0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -85,7 +85,7 @@ golang.org/x/text v0.3.6 go- goodreads 0.3.2 python google-api-core 2.11.0 python google-api-python-client 2.83.0 python -google-auth 2.17.0 python +google-auth 2.17.1 python google-auth-httplib2 0.1.0 python google-auth-oauthlib 0.8.0 python googleapis-common-protos 1.59.0 python From 00513429eea51f4bfb5a0270c75b8da3d789cfaa Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 2 Apr 2023 03:43:54 +0200 Subject: [PATCH 167/248] Bot Updating Templated Files --- Jenkinsfile | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 222065d31..ef5e1aed2 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.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' + 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' } script{ env.LS_RELEASE_NUMBER = sh( @@ -240,17 +240,14 @@ pipeline { } sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' sh '''#! /bin/bash - set -e - docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest docker run --rm \ - -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \ - -e FILE_NAME="shellcheck-result.xml" \ - -e MIMETYPE="text/xml" \ - -v ${WORKSPACE}:/mnt \ - -e SECRET_KEY=\"${S3_SECRET}\" \ - -e ACCESS_KEY=\"${S3_KEY}\" \ - -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \ - python /upload.py''' + -v ${WORKSPACE}:/mnt \ + -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ + -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ + ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + apk add --no-cache py3-pip && \ + pip install s3cmd && \ + s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :''' } } } @@ -287,7 +284,7 @@ pipeline { echo "Jenkinsfile is up to date." fi # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md" + 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" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" @@ -304,7 +301,7 @@ pipeline { 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 templates" + echo "Deleting old and deprecated templates" rm -Rf ${TEMPDIR} exit 0 else From c3c8cce140289daba8f8d364f6d0cba9ba2f5eeb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 1 Apr 2023 20:46:27 -0500 Subject: [PATCH 168/248] Bot Updating Templated Files --- .github/workflows/call_invalid_helper.yml | 12 ------------ .github/workflows/stale.yml | 23 ----------------------- 2 files changed, 35 deletions(-) delete mode 100644 .github/workflows/call_invalid_helper.yml delete mode 100644 .github/workflows/stale.yml diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml deleted file mode 100644 index 773767c27..000000000 --- a/.github/workflows/call_invalid_helper.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Comment on invalid interaction -on: - issues: - types: - - labeled -jobs: - add-comment-on-invalid: - if: github.event.label.name == 'invalid' - permissions: - issues: write - uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1 - secrets: inherit diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml deleted file mode 100644 index 73dfe45ae..000000000 --- a/.github/workflows/stale.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Mark stale issues and pull requests - -on: - schedule: - - cron: "30 1 * * *" - -jobs: - stale: - - runs-on: ubuntu-latest - - steps: - - 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." - stale-issue-label: 'no-issue-activity' - stale-pr-label: 'no-pr-activity' - days-before-stale: 30 - days-before-close: 365 - exempt-issue-labels: 'awaiting-approval,work-in-progress' - exempt-pr-labels: 'awaiting-approval,work-in-progress' - repo-token: ${{ secrets.GITHUB_TOKEN }} From 519e142dd6ce51beaeccfdfdd4f460e33c11b484 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 1 Apr 2023 20:47:58 -0500 Subject: [PATCH 169/248] Bot Updating Templated Files --- .github/workflows/call_issue_pr_tracker.yml | 14 ++++++++++++++ .github/workflows/call_issues_cron.yml | 13 +++++++++++++ .github/workflows/package_trigger_scheduler.yml | 2 +- .github/workflows/permissions.yml | 3 ++- 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100755 .github/workflows/call_issue_pr_tracker.yml create mode 100755 .github/workflows/call_issues_cron.yml diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml new file mode 100755 index 000000000..87243e2c4 --- /dev/null +++ b/.github/workflows/call_issue_pr_tracker.yml @@ -0,0 +1,14 @@ +name: Issue & PR Tracker + +on: + issues: + types: [opened,reopened,labeled,unlabeled] + pull_request_target: + types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled] + +jobs: + manage-project: + permissions: + issues: write + uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1 + secrets: inherit diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml new file mode 100755 index 000000000..400edc4b2 --- /dev/null +++ b/.github/workflows/call_issues_cron.yml @@ -0,0 +1,13 @@ +name: Mark stale issues and pull requests +on: + schedule: + - cron: '56 23 * * *' + workflow_dispatch: + +jobs: + stale: + permissions: + issues: write + pull-requests: write + uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1 + secrets: inherit diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 4423edcdd..1da08b245 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -2,7 +2,7 @@ name: Package Trigger Scheduler on: schedule: - - cron: '31 9 * * 2' + - cron: '9 0 * * 0' workflow_dispatch: jobs: diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml index 2df6b61b8..1447bc55a 100755 --- a/.github/workflows/permissions.yml +++ b/.github/workflows/permissions.yml @@ -1,9 +1,10 @@ name: Permission check on: - pull_request: + pull_request_target: paths: - '**/run' - '**/finish' + - '**/check' jobs: permission_check: uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 From e244159462be668028208ca919ff61e29cf2aae5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 1 Apr 2023 20:55:41 -0500 Subject: [PATCH 170/248] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e420ef1a0..4b8380786 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,7 +12,7 @@ Flask-WTF 1.1.1 pyt Jinja2 3.1.2 python Levenshtein 0.20.9 python MarkupSafe 2.1.2 python -PyDrive2 1.15.1 python +PyDrive2 1.15.2 python PySocks 1.7.1 python PyYAML 6.0 python Pygments 2.14.0 python @@ -107,9 +107,9 @@ httpcore 0.16.3 pyt httplib2 0.22.0 python httpx 0.23.3 python idna 3.4 python -imagemagick 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 deb -imagemagick-6-common 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 deb -imagemagick-6.q16 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 deb +imagemagick 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb +imagemagick-6-common 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb +imagemagick-6.q16 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb imagesize 1.4.1 python importlib-resources 5.12.0 python init-system-helpers 1.62 deb @@ -185,8 +185,8 @@ liblqr-1-0 0.4.2-2.1 deb libltdl7 2.4.6-15build2 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb -libmagickcore-6.q16-6 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 deb -libmagickwand-6.q16-6 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 deb +libmagickcore-6.q16-6 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb +libmagickwand-6.q16-6 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb libmd0 1.0.4-1build1 deb libmount1 2.37.2-4ubuntu3 deb libmpdec3 2.5.1-2build2 deb @@ -326,7 +326,7 @@ python3.10 3.10.6-1~22.04.2ubuntu1 deb python3.10-minimal 3.10.6-1~22.04.2ubuntu1 deb pytz 2022.7.1 python pytz-deprecation-shim 0.1.0.post0 python -rapidfuzz 2.13.7 python +rapidfuzz 2.15.0 python rarfile 4.0 python rauth 0.7.3 python readline-common 8.1.2-1 deb From 8759c0a7c7adb223ecd5ec72eb3b0e82f15dd7ca Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 3 Apr 2023 20:17:11 +0200 Subject: [PATCH 171/248] 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 4b8380786..1410a6f1b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -39,7 +39,7 @@ base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1 deb beautifulsoup4 4.11.2 python bibtexparser 1.4.0 python -blinker 1.5 python +blinker 1.6 python bsdutils 1:2.37.2-4ubuntu3 deb ca-certificates 20211016ubuntu0.22.04.1 deb cachetools 5.3.0 python From b8a2cb316f899100d5527f7e5eccde3539ec5f7f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 9 Apr 2023 03:45:06 +0200 Subject: [PATCH 172/248] 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 1410a6f1b..aa163dc7e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -84,8 +84,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c go- golang.org/x/text v0.3.6 go-module goodreads 0.3.2 python google-api-core 2.11.0 python -google-api-python-client 2.83.0 python -google-auth 2.17.1 python +google-api-python-client 2.84.0 python +google-auth 2.17.2 python google-auth-httplib2 0.1.0 python google-auth-oauthlib 0.8.0 python googleapis-common-protos 1.59.0 python From bbf2284e63ee6e1312e9dc254243786f4c18db87 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 13 Apr 2023 01:20:55 -0500 Subject: [PATCH 173/248] Bot Updating Package Versions --- package_versions.txt | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index aa163dc7e..27a18508f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,10 +12,10 @@ Flask-WTF 1.1.1 pyt Jinja2 3.1.2 python Levenshtein 0.20.9 python MarkupSafe 2.1.2 python -PyDrive2 1.15.2 python +PyDrive2 1.15.3 python PySocks 1.7.1 python PyYAML 6.0 python -Pygments 2.14.0 python +Pygments 2.15.0 python SQLAlchemy 1.4.47 python SQLAlchemy-Utils 0.39.0 python Sphinx 6.1.3 python @@ -39,7 +39,7 @@ base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1 deb beautifulsoup4 4.11.2 python bibtexparser 1.4.0 python -blinker 1.6 python +blinker 1.6.2 python bsdutils 1:2.37.2-4ubuntu3 deb ca-certificates 20211016ubuntu0.22.04.1 deb cachetools 5.3.0 python @@ -84,8 +84,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c go- golang.org/x/text v0.3.6 go-module goodreads 0.3.2 python google-api-core 2.11.0 python -google-api-python-client 2.84.0 python -google-auth 2.17.2 python +google-api-python-client 2.85.0 python +google-auth 2.17.3 python google-auth-httplib2 0.1.0 python google-auth-oauthlib 0.8.0 python googleapis-common-protos 1.59.0 python @@ -103,9 +103,9 @@ h11 0.14.0 pyt hicolor-icon-theme 0.17-2 deb hostname 3.23ubuntu2 deb html2text 2020.1.16 python -httpcore 0.16.3 python +httpcore 0.17.0 python httplib2 0.22.0 python -httpx 0.23.3 python +httpx 0.24.0 python idna 3.4 python imagemagick 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb imagemagick-6-common 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb @@ -179,8 +179,8 @@ libkrb5-3 1.19.2-2ubuntu0.1 deb libkrb5support0 1.19.2-2ubuntu0.1 deb libksba8 1.6.0-2ubuntu0.2 deb liblcms2-2 2.12~rc1-2build2 deb -libldap-2.5-0 2.5.14+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.14+dfsg-0ubuntu0.22.04.1 deb +libldap-2.5-0 2.5.14+dfsg-0ubuntu0.22.04.2 deb +libldap-common 2.5.14+dfsg-0ubuntu0.22.04.2 deb liblqr-1-0 0.4.2-2.1 deb libltdl7 2.4.6-15build2 deb liblz4-1 1.9.3-2build2 deb @@ -291,7 +291,7 @@ oauthlib 3.2.2 pyt openssl 3.0.2-0ubuntu1.8 deb ordered-set 4.1.0 python outcome 1.2.0 python -packaging 23.0 python +packaging 23.1 python passwd 1:4.8.1-2ubuntu2.1 deb perl 5.34.0-3ubuntu1.1 deb perl-base 5.34.0-3ubuntu1.1 deb @@ -300,7 +300,7 @@ pip 22.0.2 pyt pip 23.0.1 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb -protobuf 4.22.1 python +protobuf 4.22.3 python publicsuffix 20211207.1025-1 deb pyOpenSSL 23.1.1 python pyasn1 0.4.8 python @@ -326,14 +326,13 @@ python3.10 3.10.6-1~22.04.2ubuntu1 deb python3.10-minimal 3.10.6-1~22.04.2ubuntu1 deb pytz 2022.7.1 python pytz-deprecation-shim 0.1.0.post0 python -rapidfuzz 2.15.0 python +rapidfuzz 2.15.1 python rarfile 4.0 python rauth 0.7.3 python readline-common 8.1.2-1 deb requests 2.28.2 python requests-oauthlib 1.3.1 python -rfc3986 1.5.0 python -rich 13.3.3 python +rich 13.3.4 python rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb @@ -360,8 +359,8 @@ tornado 6.2 pyt trio 0.22.0 python trio-websocket 0.10.2 python typing_extensions 4.5.0 python -tzdata 2022g-0ubuntu0.22.04.1 deb tzdata 2023.3 python +tzdata 2023c-0ubuntu0.22.04.0 deb tzlocal 4.3 python ubuntu-keyring 2021.03.26 deb ucf 3.0043 deb From cf18a2c81d0fab9296e7eba41bd3fa32ea2a3fc9 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Thu, 13 Apr 2023 13:27:09 +0100 Subject: [PATCH 174/248] Symlink logfiles, don't chown /app --- root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run index 7a45670b7..2f7e18fea 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run @@ -37,7 +37,11 @@ if [[ -f /usr/bin/kepubify ]] && [[ ! -x /usr/bin/kepubify ]]; then chmod +x /usr/bin/kepubify fi +# Symlink logfiles +if [[ ! -L "/app/calibre-web/calibre-web.log" ]]; then + ln -s /config/calibre-web.log /app/calibre-web/calibre-web.log +fi + # permissions chown -R abc:abc \ - /config \ - /app/calibre-web + /config From 7cfde130c2a88a3742668702eaddbe8cbc9fa136 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Thu, 13 Apr 2023 13:27:15 +0100 Subject: [PATCH 175/248] Deprecate armhf --- .github/ISSUE_TEMPLATE/issue.bug.yml | 1 - Dockerfile.armhf | 101 --------------------------- Jenkinsfile | 70 ++----------------- README.md | 3 +- jenkins-vars.yml | 1 + readme-vars.yml | 2 +- 6 files changed, 11 insertions(+), 167 deletions(-) delete mode 100644 Dockerfile.armhf diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml index 59a10f569..ce3d19aff 100755 --- a/.github/ISSUE_TEMPLATE/issue.bug.yml +++ b/.github/ISSUE_TEMPLATE/issue.bug.yml @@ -53,7 +53,6 @@ body: options: - x86-64 - arm64 - - armhf validations: required: true - type: textarea diff --git a/Dockerfile.armhf b/Dockerfile.armhf deleted file mode 100644 index 6e8619207..000000000 --- a/Dockerfile.armhf +++ /dev/null @@ -1,101 +0,0 @@ -# syntax=docker/dockerfile:1 - -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy - -# set version label -ARG BUILD_DATE -ARG VERSION -ARG CALIBREWEB_COMMIT -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="chbmb" - -RUN \ - echo "**** install build packages ****" && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - build-essential \ - cmake \ - git \ - libffi-dev \ - libjpeg-dev \ - libldap2-dev \ - libsasl2-dev \ - libssl-dev \ - libxml2-dev \ - libxslt1-dev \ - python3-dev \ - rustc \ - zlib1g-dev && \ - echo "**** install runtime packages ****" && \ - apt-get install -y --no-install-recommends \ - imagemagick \ - ghostscript \ - libldap-2.5-0 \ - libnss3 \ - libsasl2-2 \ - libxcomposite1 \ - libxi6 \ - libxrandr2 \ - libxkbfile-dev \ - libxslt1.1 \ - libxtst6 \ - python3-minimal \ - python3-pip \ - python3-pkg-resources \ - unrar && \ - echo "**** install calibre-web ****" && \ - if [ -z ${CALIBREWEB_COMMIT+x} ]; then \ - CALIBREWEB_COMMIT=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/commits/master" \ - | awk '/sha/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/calibre-web.tar.gz -L \ - "https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_COMMIT}.tar.gz" && \ - mkdir -p \ - /app/calibre-web && \ - tar xf \ - /tmp/calibre-web.tar.gz -C \ - /app/calibre-web --strip-components=1 && \ - cd /app/calibre-web && \ - pip3 install --no-cache-dir -U \ - pip wheel && \ - pip install --no-cache-dir -U --ignore-installed --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ - requirements.txt -r \ - optional-requirements.txt && \ - echo "***install kepubify" && \ - if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ - KEPUBIFY_RELEASE=$(curl -sX GET "https://api.github.com/repos/pgaskin/kepubify/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /usr/bin/kepubify -L \ - https://github.com/pgaskin/kepubify/releases/download/${KEPUBIFY_RELEASE}/kepubify-linux-arm && \ - echo "**** cleanup ****" && \ - apt-get -y purge \ - build-essential \ - cmake \ - git \ - libffi-dev \ - libjpeg-dev \ - libldap2-dev \ - libsasl2-dev \ - libssl-dev \ - libxml2-dev \ - libxslt1-dev \ - python3-dev \ - rustc \ - zlib1g-dev && \ - apt-get -y autoremove && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* \ - /root/.cache \ - /root/.cargo - -# add local files -COPY root/ / - -# ports and volumes -EXPOSE 8083 -VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile index ef5e1aed2..e34d14ef2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -167,7 +167,7 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.CI_TAGS = 'amd64-nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { env.CI_TAGS = 'nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } @@ -190,7 +190,7 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.CI_TAGS = 'amd64-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } else { env.CI_TAGS = 'nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } @@ -213,7 +213,7 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'amd64-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } else { env.CI_TAGS = 'nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } @@ -498,41 +498,6 @@ pipeline { --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } - stage('Build ARMHF') { - agent { - label 'ARMHF' - } - steps { - echo "Running on node: ${NODE_NAME}" - echo 'Logging into Github' - sh '''#! /bin/bash - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - ''' - sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf" - sh "docker buildx build \ - --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ - --label \"org.opencontainers.image.authors=linuxserver.io\" \ - --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-calibre-web/packages\" \ - --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-calibre-web\" \ - --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-calibre-web\" \ - --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ - --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ - --label \"org.opencontainers.image.vendor=linuxserver.io\" \ - --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ - --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ - --label \"org.opencontainers.image.title=Calibre-web\" \ - --label \"org.opencontainers.image.description=[Calibre-web](https://github.com/janeczku/calibre-web) is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself. This software is a fork of library and licensed under the GPL v3 License. \" \ - --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { - sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - } - sh '''docker rmi \ - ${IMAGE}:arm32v7-${META_TAG} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' - } - } stage('Build ARM64') { agent { label 'ARM64' @@ -683,9 +648,7 @@ pipeline { set -e docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; 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 tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ @@ -801,8 +764,6 @@ 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:arm32v7-${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 @@ -810,47 +771,35 @@ pipeline { docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-nightly 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-nightly - 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-nightly docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:amd64-nightly - docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker push ${MANIFESTIMAGE}:arm32v7-nightly - docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-nightly docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker push ${MANIFESTIMAGE}:amd64-${SEMVER} - docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi docker manifest push --purge ${MANIFESTIMAGE}:nightly || : - docker manifest create ${MANIFESTIMAGE}:nightly ${MANIFESTIMAGE}:amd64-nightly ${MANIFESTIMAGE}:arm32v7-nightly ${MANIFESTIMAGE}:arm64v8-nightly - docker manifest annotate ${MANIFESTIMAGE}:nightly ${MANIFESTIMAGE}:arm32v7-nightly --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:nightly ${MANIFESTIMAGE}:amd64-nightly ${MANIFESTIMAGE}:arm64v8-nightly docker manifest annotate ${MANIFESTIMAGE}:nightly ${MANIFESTIMAGE}:arm64v8-nightly --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 if [ -n "${SEMVER}" ]; then docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : - docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 fi docker manifest push --purge ${MANIFESTIMAGE}:nightly @@ -868,21 +817,16 @@ pipeline { ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-nightly \ ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm32v7-${META_TAG} \ - ${DELETEIMAGE}:arm32v7-nightly \ - ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ ${DELETEIMAGE}:arm64v8-nightly \ ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : if [ -n "${SEMVER}" ]; then docker rmi \ ${DELETEIMAGE}:amd64-${SEMVER} \ - ${DELETEIMAGE}:arm32v7-${SEMVER} \ ${DELETEIMAGE}:arm64v8-${SEMVER} || : fi done docker rmi \ - ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : ''' } diff --git a/README.md b/README.md index db1f34aae..158ee7e71 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ The architectures supported by this image are: | :----: | :----: | ---- | | x86-64 | ✅ | amd64-\<version tag\> | | arm64 | ✅ | arm64v8-\<version tag\> | -| armhf | ✅ | arm32v7-\<version tag\> | +| armhf | ❌ | | ## Version Tags @@ -252,6 +252,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **13.04.23:** - Deprecate armhf. * **29.01.23:** - Add cmake as build dep for Levenshtein. * **27.12.22:** - Add ghostscript, libxtst6, libxkbfile-dev. * **20.12.22:** - Improve init script and prevent harmless error. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 94999a87b..6608e78aa 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -5,6 +5,7 @@ external_type: github_commit release_type: prerelease release_tag: nightly ls_branch: nightly +build_armhf: false external_trigger_delay_hours: 6 repo_vars: - EXT_GIT_BRANCH = 'master' diff --git a/readme-vars.yml b/readme-vars.yml index de18c1d99..d05ea106f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -14,7 +14,6 @@ project_blurb: | available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} # development version development_versions: true @@ -67,6 +66,7 @@ app_setup_block: | # changelog changelogs: + - { date: "13.04.23:", desc: "Deprecate armhf."} - { date: "29.01.23:", desc: "Add cmake as build dep for Levenshtein."} - { date: "27.12.22:", desc: "Add ghostscript, libxtst6, libxkbfile-dev."} - { date: "20.12.22:", desc: "Improve init script and prevent harmless error."} From 336e10ed708b5acceed43b05f38b4152e5717003 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 15 Apr 2023 07:19:21 -0500 Subject: [PATCH 176/248] Bot Updating Package Versions --- package_versions.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 27a18508f..af0e1c790 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -33,7 +33,6 @@ apt-utils 2.4.8 deb arrow 1.2.3 python async-generator 1.10 python attrs 22.2.0 python -backports-abc 0.5 python base-files 12ubuntu4.3 deb base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1 deb @@ -50,7 +49,7 @@ charset-normalizer 3.1.0 pyt click 8.1.3 python comicapi 2.2.1 python coreutils 8.32-4.1ubuntu1 deb -cryptography 40.0.1 python +cryptography 40.0.2 python curl 7.81.0-1ubuntu1.10 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb @@ -71,7 +70,7 @@ fonts-urw-base35 20200910-1 deb free-proxy 1.1.1 python gcc-12-base 12.1.0-2ubuntu1~22.04 deb gevent 22.10.2 python -ghostscript 9.55.0~dfsg1-0ubuntu5.1 deb +ghostscript 9.55.0~dfsg1-0ubuntu5.2 deb github.com/beevik/etree v1.1.0 go-module github.com/kr/smartypants v0.1.0 go-module github.com/pgaskin/kepubify/_/html v0.0.0-20211223234002-6ee2cc632cdc go-module @@ -158,8 +157,8 @@ libgmp10 2:6.2.1+dfsg-3ubuntu1 deb libgnutls30 3.7.3-4ubuntu1.2 deb libgomp1 12.1.0-2ubuntu1~22.04 deb libgpg-error0 1.43-3 deb -libgs9 9.55.0~dfsg1-0ubuntu5.1 deb -libgs9-common 9.55.0~dfsg1-0ubuntu5.1 deb +libgs9 9.55.0~dfsg1-0ubuntu5.2 deb +libgs9-common 9.55.0~dfsg1-0ubuntu5.2 deb libgssapi-krb5-2 1.19.2-2ubuntu0.1 deb libheif1 1.12.0-2build1 deb libhogweed6 3.7.3-1build2 deb @@ -297,7 +296,7 @@ perl 5.34.0-3ubuntu1.1 deb perl-base 5.34.0-3ubuntu1.1 deb pinentry-curses 1.1.1-1build2 deb pip 22.0.2 python -pip 23.0.1 python +pip 23.1 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb protobuf 4.22.3 python @@ -307,7 +306,7 @@ pyasn1 0.4.8 pyt pyasn1-modules 0.2.8 python pycparser 2.21 python pyparsing 3.0.9 python -pypdf 3.5.2 python +pypdf 3.7.1 python pyrsistent 0.19.3 python python 3.10.6 binary python-Levenshtein 0.20.9 python From 856b48cc74c802f3808564f0a7657c4f5958d8cd Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Sat, 15 Apr 2023 16:04:27 +0100 Subject: [PATCH 177/248] Improve permissions handling, use CALIBRE_DBPATH --- Dockerfile | 9 +++-- Dockerfile.aarch64 | 9 +++-- .../s6-rc.d/init-calibre-web-config/run | 35 ++++--------------- .../s6-rc.d/init-calibre-web-config/type | 2 +- .../s6-rc.d/init-calibre-web-config/up | 2 +- .../s6-rc.d/svc-calibre-web/notification-fd | 2 +- .../s6-overlay/s6-rc.d/svc-calibre-web/run | 3 ++ .../s6-overlay/s6-rc.d/svc-calibre-web/type | 2 +- 8 files changed, 21 insertions(+), 43 deletions(-) diff --git a/Dockerfile b/Dockerfile index 70f267c3a..ed6628c8c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,6 @@ RUN \ apt-get update && \ apt-get install -y --no-install-recommends \ build-essential \ - git \ libldap2-dev \ libsasl2-dev \ python3-dev && \ @@ -51,14 +50,15 @@ RUN \ /app/calibre-web --strip-components=1 && \ cd /app/calibre-web && \ pip3 install --no-cache-dir -U \ - pip wheel && \ - pip install --no-cache-dir -U --ignore-installed --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ + pip \ + wheel && \ + pip3 install --no-cache-dir -U --ignore-installed --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ requirements.txt -r \ optional-requirements.txt && \ echo "***install kepubify" && \ if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ KEPUBIFY_RELEASE=$(curl -sX GET "https://api.github.com/repos/pgaskin/kepubify/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ /usr/bin/kepubify -L \ @@ -66,7 +66,6 @@ RUN \ echo "**** cleanup ****" && \ apt-get -y purge \ build-essential \ - git \ libldap2-dev \ libsasl2-dev \ python3-dev && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e85aedf7b..da3f284d3 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -15,7 +15,6 @@ RUN \ apt-get install -y --no-install-recommends \ build-essential \ cmake \ - git \ libffi-dev \ libjpeg-dev \ libldap2-dev \ @@ -56,14 +55,15 @@ RUN \ /app/calibre-web --strip-components=1 && \ cd /app/calibre-web && \ pip3 install --no-cache-dir -U \ - pip wheel && \ - pip install --no-cache-dir -U --ignore-installed --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ + pip \ + wheel && \ + pip3 install --no-cache-dir -U --ignore-installed --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ requirements.txt -r \ optional-requirements.txt && \ echo "***install kepubify" && \ if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ KEPUBIFY_RELEASE=$(curl -sX GET "https://api.github.com/repos/pgaskin/kepubify/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ /usr/bin/kepubify -L \ @@ -72,7 +72,6 @@ RUN \ apt-get -y purge \ build-essential \ cmake \ - git \ libffi-dev \ libjpeg-dev \ libldap2-dev \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run index 2f7e18fea..ade464b4f 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run @@ -1,47 +1,24 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash # create symlinks for imagemagick policy.xml rm -rf /etc/ImageMagick-6/policy.xml ln -s /defaults/policy.xml /etc/ImageMagick-6/policy.xml -# create symlinks for database and log -if [[ ! -f /config/app.db ]] && [[ -f /app/calibre-web/app.db ]]; then - cp /defaults/app.db /config/app.db -fi -rm -rf /app/calibre-web/app.db -ln -s /config/app.db /app/calibre-web/app.db - -# create symlinks for log -if [[ ! -f /config/calibre-web.log ]]; then - touch /config/calibre-web.log -fi -rm -rf /app/calibre-web/calibre-web.log -ln -s /config/calibre-web.log /app/calibre-web/calibre-web.log - # create Google drive client_secrets.json file if [[ ! -f /config/client_secrets.json ]]; then echo "{}" > /config/client_secrets.json fi -rm -rf /app/calibre-web/client_secrets.json -ln -s /config/client_secrets.json /app/calibre-web/client_secrets.json - -# create Google drive symlinks for database -if [[ ! -f /config/gdrive.db ]] && [[ -f /app/calibre-web/gdrive.db ]]; then - cp /app/calibre-web/gdrive.db /config/gdrive.db -fi -rm -rf /app/calibre-web/gdrive.db -ln -s /config/gdrive.db /app/calibre-web/gdrive.db # check if kepubify is present and if so make executable if [[ -f /usr/bin/kepubify ]] && [[ ! -x /usr/bin/kepubify ]]; then chmod +x /usr/bin/kepubify fi -# Symlink logfiles -if [[ ! -L "/app/calibre-web/calibre-web.log" ]]; then - ln -s /config/calibre-web.log /app/calibre-web/calibre-web.log -fi +# Pre-stage some files & directories for permissions purposes +mkdir -p /app/calibre-web/cps/cache # permissions -chown -R abc:abc \ - /config +lsiown -R abc:abc \ + /config \ + /app/calibre-web/cps/cache diff --git a/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/type b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/type index 3d92b15f2..bdd22a185 100644 --- a/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/type +++ b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/type @@ -1 +1 @@ -oneshot \ No newline at end of file +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/up b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/up index 7a022ec8e..ceac1e28d 100644 --- a/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/up +++ b/root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/up @@ -1 +1 @@ -/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run \ No newline at end of file +/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/notification-fd index e440e5c84..00750edc0 100644 --- a/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/notification-fd +++ b/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/notification-fd @@ -1 +1 @@ -3 \ No newline at end of file +3 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/run b/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/run index 3a2419164..79f812fa6 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/run @@ -1,4 +1,7 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash + +export CALIBRE_DBPATH=/config exec \ s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8083" \ diff --git a/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/type b/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/type index 1780f9f44..5883cff0c 100644 --- a/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/type +++ b/root/etc/s6-overlay/s6-rc.d/svc-calibre-web/type @@ -1 +1 @@ -longrun \ No newline at end of file +longrun From 4f8ce03b508929f503e36e9b3119c6bd8d13643c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 16 Apr 2023 10:13:20 -0500 Subject: [PATCH 178/248] 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 af0e1c790..f7c0a1b09 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -32,7 +32,7 @@ apt 2.4.8 deb apt-utils 2.4.8 deb arrow 1.2.3 python async-generator 1.10 python -attrs 22.2.0 python +attrs 23.1.0 python base-files 12ubuntu4.3 deb base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1 deb From cc74fb2ec3edfdecefc36e1839ec9a7529ccbc73 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 17 Apr 2023 19:12:18 +0200 Subject: [PATCH 179/248] 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 f7c0a1b09..da8c6907a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -265,7 +265,7 @@ libxslt1.1 1.1.34-4ubuntu0.22.04.1 deb libxtst6 2:1.2.3-1build4 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb -limits 3.3.1 python +limits 3.4.0 python locales 2.35-0ubuntu3.1 deb login 1:4.8.1-2ubuntu2.1 deb logsave 1.46.5-2ubuntu1.1 deb @@ -343,7 +343,7 @@ six 1.16.0 pyt sniffio 1.3.0 python snowballstemmer 2.2.0 python sortedcontainers 2.4.0 python -soupsieve 2.4 python +soupsieve 2.4.1 python sphinx-rtd-theme 1.2.0 python sphinxcontrib-applehelp 1.0.4 python sphinxcontrib-devhelp 1.0.2 python From d04286cc6b7f933250260b9056f9bad8d4fbe978 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 18 Apr 2023 20:16:12 +0200 Subject: [PATCH 180/248] 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 da8c6907a..da7c1382e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -83,7 +83,7 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c go- golang.org/x/text v0.3.6 go-module goodreads 0.3.2 python google-api-core 2.11.0 python -google-api-python-client 2.85.0 python +google-api-python-client 2.86.0 python google-auth 2.17.3 python google-auth-httplib2 0.1.0 python google-auth-oauthlib 0.8.0 python From e73f3f255d25d2561c20aa310dfc41bb7bcb296d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 18 Apr 2023 19:54:50 -0500 Subject: [PATCH 181/248] 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 da7c1382e..f1b9d28c6 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -15,7 +15,7 @@ MarkupSafe 2.1.2 pyt PyDrive2 1.15.3 python PySocks 1.7.1 python PyYAML 6.0 python -Pygments 2.15.0 python +Pygments 2.15.1 python SQLAlchemy 1.4.47 python SQLAlchemy-Utils 0.39.0 python Sphinx 6.1.3 python @@ -231,13 +231,13 @@ libss2 1.46.5-2ubuntu1.1 deb libssh-4 0.9.6-2build1 deb libssl3 3.0.2-0ubuntu1.8 deb libstdc++6 12.1.0-2ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.7 deb +libsystemd0 249.11-0ubuntu3.9 deb libtasn1-6 4.18.0-4build1 deb libtiff5 4.3.0-6ubuntu0.4 deb libtinfo6 6.3-2 deb libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.7 deb +libudev1 249.11-0ubuntu3.9 deb libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3 deb libwebp7 1.2.2-2 deb From b39ab34b80fd92435dc572f9493ce21593947d3b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 22 Apr 2023 08:13:23 +0000 Subject: [PATCH 182/248] 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 f1b9d28c6..7b579cdc4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -258,7 +258,7 @@ libxext6 2:1.3.4-1build1 deb libxi6 2:1.8-1build1 deb libxkbfile-dev 1:1.1.0-1build3 deb libxkbfile1 1:1.1.0-1build3 deb -libxml2 2.9.13+dfsg-1ubuntu0.2 deb +libxml2 2.9.13+dfsg-1ubuntu0.3 deb libxrandr2 2:1.5.2-1build1 deb libxrender1 1:0.9.10-1build4 deb libxslt1.1 1.1.34-4ubuntu0.22.04.1 deb @@ -335,10 +335,10 @@ rich 13.3.4 pyt rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb -selenium 4.8.3 python +selenium 4.9.0 python sensible-utils 0.0.17 deb setuptools 59.6.0 python -setuptools 67.6.1 python +setuptools 67.7.1 python six 1.16.0 python sniffio 1.3.0 python snowballstemmer 2.2.0 python From 1439008223ea8299dcf5f3046019e1d40f6c04be Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 23 Apr 2023 03:54:15 +0200 Subject: [PATCH 183/248] 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 7b579cdc4..d156f1808 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -296,7 +296,7 @@ perl 5.34.0-3ubuntu1.1 deb perl-base 5.34.0-3ubuntu1.1 deb pinentry-curses 1.1.1-1build2 deb pip 22.0.2 python -pip 23.1 python +pip 23.1.1 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb protobuf 4.22.3 python From 5ae17dcd18ce360e5930ada4558616be8a8b1c9d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 29 Apr 2023 20:44:34 -0500 Subject: [PATCH 184/248] Bot Updating Templated Files --- Jenkinsfile | 94 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 88 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e34d14ef2..c9d13c68b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,10 +42,11 @@ pipeline { // Setup all the basic environment variables needed for the build stage("Set ENV Variables base"){ steps{ + sh '''docker pull quay.io/skopeo/stable:v1 || : ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( - script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':nightly 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', + script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:nightly 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() env.LS_RELEASE_NOTES = sh( script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', @@ -238,7 +239,7 @@ pipeline { script{ env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' } - sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' + sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-jenkins-builder/master/checkrun.sh | /bin/bash''' sh '''#! /bin/bash docker run --rm \ -v ${WORKSPACE}:/mnt \ @@ -386,6 +387,26 @@ pipeline { } } } + // If this is a nightly build check the S6 service file perms + stage("Check S6 Service file Permissions"){ + when { + branch "nightly" + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + script{ + sh '''#! /bin/bash + WRONG_PERM=$(find ./ -path "./.git" -prune -o \\( -name "run" -o -name "finish" -o -name "check" \\) -not -perm -u=x,g=x,o=x -print) + if [[ -n "${WRONG_PERM}" ]]; then + echo "The following S6 service files are missing the executable bit; canceling the faulty build: ${WRONG_PERM}" + exit 1 + else + echo "S6 service file perms look good." + fi ''' + } + } + } /* ####################### GitLab Mirroring ####################### */ @@ -643,6 +664,7 @@ pipeline { ]) { script{ env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html' + env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json' } sh '''#! /bin/bash set -e @@ -667,8 +689,6 @@ pipeline { -e WEB_SCREENSHOT=\"${CI_WEB}\" \ -e WEB_AUTH=\"${CI_AUTH}\" \ -e WEB_PATH=\"${CI_WEBPATH}\" \ - -e DO_REGION="ams3" \ - -e DO_BUCKET="lsio-ci" \ -t ghcr.io/linuxserver/ci:latest \ python3 test_build.py''' } @@ -802,6 +822,9 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 fi + docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-nightly || : + docker manifest create ${MANIFESTIMAGE}:arm32v7-nightly ${MANIFESTIMAGE}:amd64-nightly + docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-nightly docker manifest push --purge ${MANIFESTIMAGE}:nightly docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} @@ -903,8 +926,67 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \ - -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' ''' + sh '''#! /bin/bash + # Function to retrieve JSON data from URL + get_json() { + local url="$1" + local response=$(curl -s "$url") + if [ $? -ne 0 ]; then + echo "Failed to retrieve JSON data from $url" + return 1 + fi + local json=$(echo "$response" | jq .) + if [ $? -ne 0 ]; then + echo "Failed to parse JSON data from $url" + return 1 + fi + echo "$json" + } + + build_table() { + local data="$1" + + # Get the keys in the JSON data + local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]') + + # Check if keys are empty + if [ -z "$keys" ]; then + echo "JSON report data does not contain any keys or the report does not exist." + return 1 + fi + + # Build table header + local header="| Tag | Passed |\\n| --- | --- |\\n" + + # Loop through the JSON data to build the table rows + local rows="" + for build in $keys; do + local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success") + if [ "$status" = "true" ]; then + status="✅" + else + status="❌" + fi + local row="| "$build" | "$status" |\\n" + rows="${rows}${row}" + done + + local table="${header}${rows}" + local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g') + echo "$escaped_table" + } + + # Retrieve JSON data from URL + data=$(get_json "$CI_JSON_URL") + # Create table from JSON data + table=$(build_table "$data") + echo -e "$table" + + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"''' + } } } From 599d314cf2e29e4c7c96b7621429c72b101a687c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 29 Apr 2023 20:46:22 -0500 Subject: [PATCH 185/248] Bot Updating Templated Files --- .github/workflows/call_issue_pr_tracker.yml | 6 ++++-- .github/workflows/external_trigger.yml | 9 +++++++++ .../workflows/external_trigger_scheduler.yml | 18 ++++++++++-------- .github/workflows/package_trigger.yml | 4 ++++ .../workflows/package_trigger_scheduler.yml | 8 ++++---- 5 files changed, 31 insertions(+), 14 deletions(-) diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml index 87243e2c4..2c3078434 100755 --- a/.github/workflows/call_issue_pr_tracker.yml +++ b/.github/workflows/call_issue_pr_tracker.yml @@ -2,9 +2,11 @@ name: Issue & PR Tracker on: issues: - types: [opened,reopened,labeled,unlabeled] + types: [opened,reopened,labeled,unlabeled,closed] pull_request_target: - types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled] + types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed] + pull_request_review: + types: [submitted,edited,dismissed] jobs: manage-project: diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 14708f299..eae8094a1 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -14,9 +14,11 @@ jobs: run: | if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_CALIBRE_WEB_NIGHTLY }}" ]; then echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_CALIBRE_WEB_NIGHTLY is set; skipping trigger. ****" + echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_CALIBRE_WEB_NIGHTLY\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi echo "**** External trigger running off of nightly branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_CALIBRE_WEB_NIGHTLY\". ****" + echo "External trigger running off of nightly branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_CALIBRE_WEB_NIGHTLY\`" >> $GITHUB_STEP_SUMMARY echo "**** Retrieving external version ****" EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/janeczku/calibre-web/commits/master" | jq -r '. | .sha' | cut -c1-8) if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then @@ -30,6 +32,7 @@ jobs: fi EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') echo "**** External version: ${EXT_RELEASE} ****" + echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY echo "**** Retrieving last pushed version ****" image="linuxserver/calibre-web" tag="nightly" @@ -65,17 +68,22 @@ jobs: exit 1 fi echo "**** Last pushed version: ${IMAGE_VERSION} ****" + echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" + echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY exit 0 elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/nightly/lastBuild/api/json | jq -r '.building') == "true" ]; then echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****" + echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY exit 0 elif [[ $(( $(date +%s%3N) - $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/nightly/lastBuild/api/json | jq -r '.timestamp') )) -lt $(( 6 * 3600000 )) ]]; then echo "**** New version ${EXT_RELEASE} found; but the last build was less than 6 hours ago; skipping trigger ****" + echo "New version ${EXT_RELEASE} found; but the last build was less than 6 hours ago; skipping trigger" >> $GITHUB_STEP_SUMMARY exit 0 else echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****" + echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/nightly/buildWithParameters?PACKAGE_CHECK=false \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") @@ -85,6 +93,7 @@ jobs: buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" echo "**** Jenkins job build url: ${buildurl} ****" + echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY echo "**** Attempting to change the Jenkins job description ****" curl -iX POST \ "${buildurl}submitDescription" \ diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index 60dd6bd8f..2bd94887a 100644 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -2,7 +2,7 @@ name: External Trigger Scheduler on: schedule: - - cron: '55 * * * *' + - cron: '4 * * * *' workflow_dispatch: jobs: @@ -17,18 +17,18 @@ jobs: run: | echo "**** Branches found: ****" git for-each-ref --format='%(refname:short)' refs/remotes - echo "**** Pulling the yq docker image ****" - docker pull ghcr.io/linuxserver/yq for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) do br=$(echo "$br" | sed 's|origin/||g') echo "**** Evaluating branch ${br} ****" - ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-calibre-web/${br}/jenkins-vars.yml \ - | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) - if [ "$br" == "$ls_branch" ]; then - echo "**** Branch ${br} appears to be live; checking workflow. ****" + ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-calibre-web/${br}/jenkins-vars.yml) + ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch') + ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type') + if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then + echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****" if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-calibre-web/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****." + echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY curl -iX POST \ -H "Authorization: token ${{ secrets.CR_PAT }}" \ -H "Accept: application/vnd.github.v3+json" \ @@ -36,8 +36,10 @@ jobs: https://api.github.com/repos/linuxserver/docker-calibre-web/actions/workflows/external_trigger.yml/dispatches else echo "**** Workflow doesn't exist; skipping trigger. ****" + echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY fi else - echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****" + echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY fi done diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index 5c0a83d94..9a52efe9d 100644 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -14,13 +14,16 @@ jobs: run: | if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_CALIBRE_WEB_NIGHTLY }}" ]; then echo "**** Github secret PAUSE_PACKAGE_TRIGGER_CALIBRE_WEB_NIGHTLY is set; skipping trigger. ****" + echo "Github secret \`PAUSE_PACKAGE_TRIGGER_CALIBRE_WEB_NIGHTLY\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/nightly/lastBuild/api/json | jq -r '.building') == "true" ]; then echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" + echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY exit 0 fi echo "**** Package trigger running off of nightly branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_CALIBRE_WEB_NIGHTLY\". ****" + echo "Package trigger running off of nightly branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_CALIBRE_WEB_NIGHTLY\`" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-calibre-web/job/nightly/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") @@ -30,6 +33,7 @@ jobs: buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" echo "**** Jenkins job build url: ${buildurl} ****" + echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY echo "**** Attempting to change the Jenkins job description ****" curl -iX POST \ "${buildurl}submitDescription" \ diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 1da08b245..6cfe03f68 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -17,18 +17,16 @@ jobs: run: | echo "**** Branches found: ****" git for-each-ref --format='%(refname:short)' refs/remotes - echo "**** Pulling the yq docker image ****" - docker pull ghcr.io/linuxserver/yq for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) do br=$(echo "$br" | sed 's|origin/||g') echo "**** Evaluating branch ${br} ****" - ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-calibre-web/${br}/jenkins-vars.yml \ - | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) + ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-calibre-web/${br}/jenkins-vars.yml | yq -r '.ls_branch') if [ "${br}" == "${ls_branch}" ]; then echo "**** Branch ${br} appears to be live; checking workflow. ****" if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-calibre-web/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" + echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY triggered_branches="${triggered_branches}${br} " curl -iX POST \ -H "Authorization: token ${{ secrets.CR_PAT }}" \ @@ -38,9 +36,11 @@ jobs: sleep 30 else echo "**** Workflow doesn't exist; skipping trigger. ****" + echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY fi else echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY fi done echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" From bf8b4183b35ed69c332e26d484503b287e5e058a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 29 Apr 2023 20:51:26 -0500 Subject: [PATCH 186/248] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d156f1808..0ddfca6ed 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,7 +18,7 @@ PyYAML 6.0 pyt Pygments 2.15.1 python SQLAlchemy 1.4.47 python SQLAlchemy-Utils 0.39.0 python -Sphinx 6.1.3 python +Sphinx 6.2.1 python URLObject 2.4.3 python Unidecode 1.3.6 python WTForms 3.0.1 python @@ -28,8 +28,8 @@ adduser 3.118ubuntu5 deb advocate 1.0.0 python alabaster 0.7.13 python anyio 3.6.2 python -apt 2.4.8 deb -apt-utils 2.4.8 deb +apt 2.4.9 deb +apt-utils 2.4.9 deb arrow 1.2.3 python async-generator 1.10 python attrs 23.1.0 python @@ -118,7 +118,7 @@ jq 1.6-2.1ubuntu3 deb jsonschema 4.17.3 python libacl1 2.3.1-1 deb libaom3 3.3.0-1 deb -libapt-pkg6.0 2.4.8 deb +libapt-pkg6.0 2.4.9 deb libassuan0 2.5.5-1build1 deb libattr1 1:2.5.1-1build1 deb libaudit-common 1:3.0.7-1build1 deb @@ -152,7 +152,7 @@ libfontconfig1 2.13.1-4.2ubuntu5 deb libfreetype6 2.11.1+dfsg-1ubuntu0.1 deb libgcc-s1 12.1.0-2ubuntu1~22.04 deb libgcrypt20 1.9.4-3ubuntu3 deb -libglib2.0-0 2.72.4-0ubuntu1 deb +libglib2.0-0 2.72.4-0ubuntu2 deb libgmp10 2:6.2.1+dfsg-3ubuntu1 deb libgnutls30 3.7.3-4ubuntu1.2 deb libgomp1 12.1.0-2ubuntu1~22.04 deb @@ -287,7 +287,7 @@ netifaces 0.11.0 pyt nose 1.3.7 python oauth2client 4.1.3 python oauthlib 3.2.2 python -openssl 3.0.2-0ubuntu1.8 deb +openssl 3.0.2-0ubuntu1.9 deb ordered-set 4.1.0 python outcome 1.2.0 python packaging 23.1 python @@ -296,7 +296,7 @@ perl 5.34.0-3ubuntu1.1 deb perl-base 5.34.0-3ubuntu1.1 deb pinentry-curses 1.1.1-1build2 deb pip 22.0.2 python -pip 23.1.1 python +pip 23.1.2 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb protobuf 4.22.3 python @@ -331,14 +331,14 @@ rauth 0.7.3 pyt readline-common 8.1.2-1 deb requests 2.28.2 python requests-oauthlib 1.3.1 python -rich 13.3.4 python +rich 13.3.5 python rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb selenium 4.9.0 python sensible-utils 0.0.17 deb setuptools 59.6.0 python -setuptools 67.7.1 python +setuptools 67.7.2 python six 1.16.0 python sniffio 1.3.0 python snowballstemmer 2.2.0 python From 55328879a5b6c065ead01b5c5ccf064bd38de5dc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 30 Apr 2023 23:21:17 +0000 Subject: [PATCH 187/248] 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 0ddfca6ed..df6bf5968 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,7 +16,7 @@ PyDrive2 1.15.3 pyt PySocks 1.7.1 python PyYAML 6.0 python Pygments 2.15.1 python -SQLAlchemy 1.4.47 python +SQLAlchemy 1.4.48 python SQLAlchemy-Utils 0.39.0 python Sphinx 6.2.1 python URLObject 2.4.3 python From 42cd2a55d69b4a47103305f8793ed67406dbb5bf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 7 May 2023 01:49:34 +0000 Subject: [PATCH 188/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index df6bf5968..aa927a0ba 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ Babel 2.12.1 pyt Deprecated 1.2.13 python Flask 2.1.3 python Flask-Dance 6.2.0 python -Flask-Limiter 3.3.0 python +Flask-Limiter 3.3.1 python Flask-Login 0.6.2 python Flask-Principal 0.4.0 python Flask-SimpleLDAP 1.4.0 python @@ -229,7 +229,7 @@ libsmartcols1 2.37.2-4ubuntu3 deb libsqlite3-0 3.37.2-2ubuntu0.1 deb libss2 1.46.5-2ubuntu1.1 deb libssh-4 0.9.6-2build1 deb -libssl3 3.0.2-0ubuntu1.8 deb +libssl3 3.0.2-0ubuntu1.9 deb libstdc++6 12.1.0-2ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.9 deb libtasn1-6 4.18.0-4build1 deb @@ -299,7 +299,7 @@ pip 22.0.2 pyt pip 23.1.2 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb -protobuf 4.22.3 python +protobuf 4.22.4 python publicsuffix 20211207.1025-1 deb pyOpenSSL 23.1.1 python pyasn1 0.4.8 python @@ -359,7 +359,7 @@ trio 0.22.0 pyt trio-websocket 0.10.2 python typing_extensions 4.5.0 python tzdata 2023.3 python -tzdata 2023c-0ubuntu0.22.04.0 deb +tzdata 2023c-0ubuntu0.22.04.1 deb tzlocal 4.3 python ubuntu-keyring 2021.03.26 deb ucf 3.0043 deb From df0fb15f2a1563366af674c32bb8ad084b742005 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 14 May 2023 01:50:46 +0000 Subject: [PATCH 189/248] 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 aa927a0ba..1f5e10d81 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -42,7 +42,7 @@ blinker 1.6.2 pyt bsdutils 1:2.37.2-4ubuntu3 deb ca-certificates 20211016ubuntu0.22.04.1 deb cachetools 5.3.0 python -certifi 2022.12.7 python +certifi 2023.5.7 python cffi 1.15.1 python chardet 4.0.0 python charset-normalizer 3.1.0 python @@ -84,7 +84,7 @@ golang.org/x/text v0.3.6 go- goodreads 0.3.2 python google-api-core 2.11.0 python google-api-python-client 2.86.0 python -google-auth 2.17.3 python +google-auth 2.18.0 python google-auth-httplib2 0.1.0 python google-auth-oauthlib 0.8.0 python googleapis-common-protos 1.59.0 python @@ -149,7 +149,7 @@ libext2fs2 1.46.5-2ubuntu1.1 deb libffi8 3.4.2-4 deb libfftw3-double3 3.3.8-2ubuntu8 deb libfontconfig1 2.13.1-4.2ubuntu5 deb -libfreetype6 2.11.1+dfsg-1ubuntu0.1 deb +libfreetype6 2.11.1+dfsg-1ubuntu0.2 deb libgcc-s1 12.1.0-2ubuntu1~22.04 deb libgcrypt20 1.9.4-3ubuntu3 deb libglib2.0-0 2.72.4-0ubuntu2 deb @@ -299,7 +299,7 @@ pip 22.0.2 pyt pip 23.1.2 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb -protobuf 4.22.4 python +protobuf 4.23.0 python publicsuffix 20211207.1025-1 deb pyOpenSSL 23.1.1 python pyasn1 0.4.8 python @@ -335,7 +335,7 @@ rich 13.3.5 pyt rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb -selenium 4.9.0 python +selenium 4.9.1 python sensible-utils 0.0.17 deb setuptools 59.6.0 python setuptools 67.7.2 python From 70e8dd322ee442d6ceaaaab0370e00de0c488b39 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 21 May 2023 01:50:49 +0000 Subject: [PATCH 190/248] Bot Updating Package Versions --- package_versions.txt | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1f5e10d81..260336385 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -84,7 +84,7 @@ golang.org/x/text v0.3.6 go- goodreads 0.3.2 python google-api-core 2.11.0 python google-api-python-client 2.86.0 python -google-auth 2.18.0 python +google-auth 2.18.1 python google-auth-httplib2 0.1.0 python google-auth-oauthlib 0.8.0 python googleapis-common-protos 1.59.0 python @@ -102,9 +102,9 @@ h11 0.14.0 pyt hicolor-icon-theme 0.17-2 deb hostname 3.23ubuntu2 deb html2text 2020.1.16 python -httpcore 0.17.0 python +httpcore 0.17.1 python httplib2 0.22.0 python -httpx 0.24.0 python +httpx 0.24.1 python idna 3.4 python imagemagick 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb imagemagick-6-common 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb @@ -240,9 +240,9 @@ libtirpc3 1.3.2-2ubuntu0.1 deb libudev1 249.11-0ubuntu3.9 deb libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3 deb -libwebp7 1.2.2-2 deb -libwebpdemux2 1.2.2-2 deb -libwebpmux3 1.2.2-2 deb +libwebp7 1.2.2-2ubuntu0.22.04.1 deb +libwebpdemux2 1.2.2-2ubuntu0.22.04.1 deb +libwebpmux3 1.2.2-2ubuntu0.22.04.1 deb libx11-6 2:1.7.5-1 deb libx11-data 2:1.7.5-1 deb libx11-dev 2:1.7.5-1 deb @@ -265,7 +265,7 @@ libxslt1.1 1.1.34-4ubuntu0.22.04.1 deb libxtst6 2:1.2.3-1build4 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb -limits 3.4.0 python +limits 3.5.0 python locales 2.35-0ubuntu3.1 deb login 1:4.8.1-2ubuntu2.1 deb logsave 1.46.5-2ubuntu1.1 deb @@ -299,7 +299,7 @@ pip 22.0.2 pyt pip 23.1.2 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb -protobuf 4.23.0 python +protobuf 4.23.1 python publicsuffix 20211207.1025-1 deb pyOpenSSL 23.1.1 python pyasn1 0.4.8 python @@ -324,7 +324,6 @@ python3-wheel 0.37.1-2ubuntu0.22.04.1 deb python3.10 3.10.6-1~22.04.2ubuntu1 deb python3.10-minimal 3.10.6-1~22.04.2ubuntu1 deb pytz 2022.7.1 python -pytz-deprecation-shim 0.1.0.post0 python rapidfuzz 2.15.1 python rarfile 4.0 python rauth 0.7.3 python @@ -338,7 +337,7 @@ sed 4.8-1ubuntu2 deb selenium 4.9.1 python sensible-utils 0.0.17 deb setuptools 59.6.0 python -setuptools 67.7.2 python +setuptools 67.8.0 python six 1.16.0 python sniffio 1.3.0 python snowballstemmer 2.2.0 python @@ -358,9 +357,8 @@ tornado 6.2 pyt trio 0.22.0 python trio-websocket 0.10.2 python typing_extensions 4.5.0 python -tzdata 2023.3 python tzdata 2023c-0ubuntu0.22.04.1 deb -tzlocal 4.3 python +tzlocal 5.0.1 python ubuntu-keyring 2021.03.26 deb ucf 3.0043 deb unrar 1:6.1.5-1 deb From 8e0ef861bf214d23dbea1f6460e292511975e11a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 28 May 2023 01:55:38 +0000 Subject: [PATCH 191/248] Bot Updating Templated Files --- Jenkinsfile | 120 +++++++++++++++++++++++----------------------------- 1 file changed, 54 insertions(+), 66 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c9d13c68b..a1c10888d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,7 +42,12 @@ pipeline { // Setup all the basic environment variables needed for the build stage("Set ENV Variables base"){ steps{ - sh '''docker pull quay.io/skopeo/stable:v1 || : ''' + sh '''#! /bin/bash + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -214,12 +219,12 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'amd64-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } else { - env.CI_TAGS = 'nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } - env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST - env.META_TAG = 'nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + env.META_TAG = 'nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST env.EXT_RELEASE_TAG = 'nightly-version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' @@ -347,6 +352,8 @@ pipeline { 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/ @@ -438,8 +445,7 @@ pipeline { } steps{ sh '''#! /bin/bash - set -e - PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/calibre-web") | .uuid') + PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/calibre-web") | .uuid' || :) if [ -z "${PACKAGE_UUID}" ]; then echo "Adding package to Scarf.sh" curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \ @@ -549,9 +555,12 @@ pipeline { retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" } - sh '''docker rmi \ - ${IMAGE}:arm64v8-${META_TAG} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + sh '''#! /bin/bash + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : ''' } } } @@ -612,13 +621,6 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - sh '''#! /bin/bash - echo "Packages were updated. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then - docker rmi ${IMAGE}:amd64-${META_TAG} - else - docker rmi ${IMAGE}:${META_TAG} - fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -636,13 +638,6 @@ pipeline { } } steps { - sh '''#! /bin/bash - echo "There are no package updates. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then - docker rmi ${IMAGE}:amd64-${META_TAG} - else - docker rmi ${IMAGE}:${META_TAG} - fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -741,17 +736,6 @@ pipeline { done ''' } - sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do - docker rmi \ - ${DELETEIMAGE}:${META_TAG} \ - ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:nightly || : - if [ -n "${SEMVER}" ]; then - docker rmi ${DELETEIMAGE}:${SEMVER} || : - fi - done - ''' } } } @@ -822,9 +806,16 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 fi - docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-nightly || : - docker manifest create ${MANIFESTIMAGE}:arm32v7-nightly ${MANIFESTIMAGE}:amd64-nightly - docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-nightly + token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token') + digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-nightly") + if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then + docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-nightly || : + docker manifest create ${MANIFESTIMAGE}:arm32v7-nightly ${MANIFESTIMAGE}:amd64-nightly + docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-nightly + fi docker manifest push --purge ${MANIFESTIMAGE}:nightly docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} @@ -834,24 +825,6 @@ pipeline { done ''' } - sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do - docker rmi \ - ${DELETEIMAGE}:amd64-${META_TAG} \ - ${DELETEIMAGE}:amd64-nightly \ - ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm64v8-${META_TAG} \ - ${DELETEIMAGE}:arm64v8-nightly \ - ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : - if [ -n "${SEMVER}" ]; then - docker rmi \ - ${DELETEIMAGE}:amd64-${SEMVER} \ - ${DELETEIMAGE}:arm64v8-${SEMVER} || : - fi - done - docker rmi \ - ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : - ''' } } } @@ -922,7 +895,6 @@ pipeline { stage('Pull Request Comment') { when { not {environment name: 'CHANGE_ID', value: ''} - environment name: 'CI', value: 'true' environment name: 'EXIT_STATUS', value: '' } steps { @@ -976,16 +948,24 @@ pipeline { echo "$escaped_table" } - # Retrieve JSON data from URL - data=$(get_json "$CI_JSON_URL") - # Create table from JSON data - table=$(build_table "$data") - echo -e "$table" + if [[ "${CI}" = "true" ]]; then + # Retrieve JSON data from URL + data=$(get_json "$CI_JSON_URL") + # Create table from JSON data + table=$(build_table "$data") + echo -e "$table" - curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ - -H "Accept: application/vnd.github.v3+json" \ - "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"''' + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" + else + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" + fi + ''' } } @@ -1012,6 +992,14 @@ pipeline { } } cleanup { + sh '''#! /bin/bash + echo "Performing docker system prune!!" + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : + ''' cleanWs() } } From a4efb77d7a95ce58a1aea97c021da58b85fe6802 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 28 May 2023 02:01:43 +0000 Subject: [PATCH 192/248] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 260336385..9a5030d4f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ NAME VERSION TYPE APScheduler 3.10.1 python Babel 2.12.1 python -Deprecated 1.2.13 python +Deprecated 1.2.14 python Flask 2.1.3 python Flask-Dance 6.2.0 python Flask-Limiter 3.3.1 python @@ -12,7 +12,7 @@ Flask-WTF 1.1.1 pyt Jinja2 3.1.2 python Levenshtein 0.20.9 python MarkupSafe 2.1.2 python -PyDrive2 1.15.3 python +PyDrive2 1.15.4 python PySocks 1.7.1 python PyYAML 6.0 python Pygments 2.15.1 python @@ -27,7 +27,7 @@ Werkzeug 2.0.3 pyt adduser 3.118ubuntu5 deb advocate 1.0.0 python alabaster 0.7.13 python -anyio 3.6.2 python +anyio 3.7.0 python apt 2.4.9 deb apt-utils 2.4.9 deb arrow 1.2.3 python @@ -41,7 +41,7 @@ bibtexparser 1.4.0 pyt blinker 1.6.2 python bsdutils 1:2.37.2-4ubuntu3 deb ca-certificates 20211016ubuntu0.22.04.1 deb -cachetools 5.3.0 python +cachetools 5.3.1 python certifi 2023.5.7 python cffi 1.15.1 python chardet 4.0.0 python @@ -58,7 +58,7 @@ diffutils 1:3.8-0ubuntu2 deb dirmngr 2.2.27-3ubuntu2.1 deb docutils 0.18.1 python dpkg 1.21.1ubuntu2.1 deb -dpkg-dev 1.21.1ubuntu2.1 deb +dpkg-dev 1.21.1ubuntu2.2 deb e2fsprogs 1.46.5-2ubuntu1.1 deb exceptiongroup 1.1.1 python fake-useragent 1.1.3 python @@ -83,8 +83,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c go- golang.org/x/text v0.3.6 go-module goodreads 0.3.2 python google-api-core 2.11.0 python -google-api-python-client 2.86.0 python -google-auth 2.18.1 python +google-api-python-client 2.87.0 python +google-auth 2.19.0 python google-auth-httplib2 0.1.0 python google-auth-oauthlib 0.8.0 python googleapis-common-protos 1.59.0 python @@ -102,7 +102,7 @@ h11 0.14.0 pyt hicolor-icon-theme 0.17-2 deb hostname 3.23ubuntu2 deb html2text 2020.1.16 python -httpcore 0.17.1 python +httpcore 0.17.2 python httplib2 0.22.0 python httpx 0.24.1 python idna 3.4 python @@ -299,7 +299,7 @@ pip 22.0.2 pyt pip 23.1.2 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb -protobuf 4.23.1 python +protobuf 4.23.2 python publicsuffix 20211207.1025-1 deb pyOpenSSL 23.1.1 python pyasn1 0.4.8 python @@ -343,7 +343,7 @@ sniffio 1.3.0 pyt snowballstemmer 2.2.0 python sortedcontainers 2.4.0 python soupsieve 2.4.1 python -sphinx-rtd-theme 1.2.0 python +sphinx-rtd-theme 1.2.1 python sphinxcontrib-applehelp 1.0.4 python sphinxcontrib-devhelp 1.0.2 python sphinxcontrib-htmlhelp 2.0.1 python @@ -356,14 +356,14 @@ tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb tornado 6.2 python trio 0.22.0 python trio-websocket 0.10.2 python -typing_extensions 4.5.0 python +typing_extensions 4.6.2 python tzdata 2023c-0ubuntu0.22.04.1 deb tzlocal 5.0.1 python ubuntu-keyring 2021.03.26 deb ucf 3.0043 deb unrar 1:6.1.5-1 deb uritemplate 4.1.1 python -urllib3 1.26.15 python +urllib3 1.26.16 python usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3 deb wheel 0.37.1 python From 5db4cb6a13df311d943c5cd33cbcd97f4213ed78 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 28 May 2023 18:24:46 +0000 Subject: [PATCH 193/248] 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 9a5030d4f..54dad0239 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,7 +2,7 @@ NAME VERSION TYP APScheduler 3.10.1 python Babel 2.12.1 python Deprecated 1.2.14 python -Flask 2.1.3 python +Flask 2.3.2 python Flask-Dance 6.2.0 python Flask-Limiter 3.3.1 python Flask-Login 0.6.2 python @@ -23,7 +23,7 @@ URLObject 2.4.3 pyt Unidecode 1.3.6 python WTForms 3.0.1 python Wand 0.6.11 python -Werkzeug 2.0.3 python +Werkzeug 2.3.4 python adduser 3.118ubuntu5 deb advocate 1.0.0 python alabaster 0.7.13 python From bd30ca12b7d70ed24d93914fb09fb41a44267268 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 29 May 2023 10:24:33 +0000 Subject: [PATCH 194/248] 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 54dad0239..f2b946604 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -302,8 +302,8 @@ procps 2:3.3.17-6ubuntu2 deb protobuf 4.23.2 python publicsuffix 20211207.1025-1 deb pyOpenSSL 23.1.1 python -pyasn1 0.4.8 python -pyasn1-modules 0.2.8 python +pyasn1 0.5.0 python +pyasn1-modules 0.3.0 python pycparser 2.21 python pyparsing 3.0.9 python pypdf 3.7.1 python From 3523c7656eab24b5af65649a3a9429eaa3c3321d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 4 Jun 2023 02:21:48 +0000 Subject: [PATCH 195/248] Bot Updating Package Versions --- package_versions.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f2b946604..af744831f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ Flask-SimpleLDAP 1.4.0 pyt Flask-WTF 1.1.1 python Jinja2 3.1.2 python Levenshtein 0.20.9 python -MarkupSafe 2.1.2 python +MarkupSafe 2.1.3 python PyDrive2 1.15.4 python PySocks 1.7.1 python PyYAML 6.0 python @@ -40,7 +40,7 @@ beautifulsoup4 4.11.2 pyt bibtexparser 1.4.0 python blinker 1.6.2 python bsdutils 1:2.37.2-4ubuntu3 deb -ca-certificates 20211016ubuntu0.22.04.1 deb +ca-certificates 20230311ubuntu0.22.04.1 deb cachetools 5.3.1 python certifi 2023.5.7 python cffi 1.15.1 python @@ -49,7 +49,7 @@ charset-normalizer 3.1.0 pyt click 8.1.3 python comicapi 2.2.1 python coreutils 8.32-4.1ubuntu1 deb -cryptography 40.0.2 python +cryptography 41.0.1 python curl 7.81.0-1ubuntu1.10 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb @@ -83,8 +83,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c go- golang.org/x/text v0.3.6 go-module goodreads 0.3.2 python google-api-core 2.11.0 python -google-api-python-client 2.87.0 python -google-auth 2.19.0 python +google-api-python-client 2.88.0 python +google-auth 2.19.1 python google-auth-httplib2 0.1.0 python google-auth-oauthlib 0.8.0 python googleapis-common-protos 1.59.0 python @@ -123,9 +123,9 @@ libassuan0 2.5.5-1build1 deb libattr1 1:2.5.1-1build1 deb libaudit-common 1:3.0.7-1build1 deb libaudit1 1:3.0.7-1build1 deb -libavahi-client3 0.8-5ubuntu5 deb -libavahi-common-data 0.8-5ubuntu5 deb -libavahi-common3 0.8-5ubuntu5 deb +libavahi-client3 0.8-5ubuntu5.1 deb +libavahi-common-data 0.8-5ubuntu5.1 deb +libavahi-common3 0.8-5ubuntu5.1 deb libblkid1 2.37.2-4ubuntu3 deb libbrotli1 1.0.9-2build6 deb libbsd0 0.11.5-1 deb @@ -136,7 +136,7 @@ libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1build3 deb libcom-err2 1.46.5-2ubuntu1.1 deb libcrypt1 1:4.4.27-1 deb -libcups2 2.4.1op1-1ubuntu4.1 deb +libcups2 2.4.1op1-1ubuntu4.2 deb libcurl4 7.81.0-1ubuntu1.10 deb libdav1d5 0.9.2-1 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb @@ -287,7 +287,7 @@ netifaces 0.11.0 pyt nose 1.3.7 python oauth2client 4.1.3 python oauthlib 3.2.2 python -openssl 3.0.2-0ubuntu1.9 deb +openssl 3.0.2-0ubuntu1.10 deb ordered-set 4.1.0 python outcome 1.2.0 python packaging 23.1 python @@ -301,7 +301,7 @@ poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb protobuf 4.23.2 python publicsuffix 20211207.1025-1 deb -pyOpenSSL 23.1.1 python +pyOpenSSL 23.2.0 python pyasn1 0.5.0 python pyasn1-modules 0.3.0 python pycparser 2.21 python @@ -330,7 +330,7 @@ rauth 0.7.3 pyt readline-common 8.1.2-1 deb requests 2.28.2 python requests-oauthlib 1.3.1 python -rich 13.3.5 python +rich 13.4.1 python rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb @@ -356,7 +356,7 @@ tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb tornado 6.2 python trio 0.22.0 python trio-websocket 0.10.2 python -typing_extensions 4.6.2 python +typing_extensions 4.6.3 python tzdata 2023c-0ubuntu0.22.04.1 deb tzlocal 5.0.1 python ubuntu-keyring 2021.03.26 deb From ea19d08a15bbc801d9b1536805b6d67c43425421 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 5 Jun 2023 13:27:19 +0000 Subject: [PATCH 196/248] 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 af744831f..207f8ec1e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -292,8 +292,8 @@ ordered-set 4.1.0 pyt outcome 1.2.0 python packaging 23.1 python passwd 1:4.8.1-2ubuntu2.1 deb -perl 5.34.0-3ubuntu1.1 deb -perl-base 5.34.0-3ubuntu1.1 deb +perl 5.34.0-3ubuntu1.2 deb +perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb pip 22.0.2 python pip 23.1.2 python From 55ba5444841bd98c1a260da37a253dde08bb78cf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 11 Jun 2023 02:16:27 +0000 Subject: [PATCH 197/248] 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 207f8ec1e..6b0cdd972 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,7 +23,7 @@ URLObject 2.4.3 pyt Unidecode 1.3.6 python WTForms 3.0.1 python Wand 0.6.11 python -Werkzeug 2.3.4 python +Werkzeug 2.3.6 python adduser 3.118ubuntu5 deb advocate 1.0.0 python alabaster 0.7.13 python @@ -57,7 +57,7 @@ debianutils 5.5-1ubuntu2 deb diffutils 1:3.8-0ubuntu2 deb dirmngr 2.2.27-3ubuntu2.1 deb docutils 0.18.1 python -dpkg 1.21.1ubuntu2.1 deb +dpkg 1.21.1ubuntu2.2 deb dpkg-dev 1.21.1ubuntu2.2 deb e2fsprogs 1.46.5-2ubuntu1.1 deb exceptiongroup 1.1.1 python @@ -159,7 +159,7 @@ libgomp1 12.1.0-2ubuntu1~22.04 deb libgpg-error0 1.43-3 deb libgs9 9.55.0~dfsg1-0ubuntu5.2 deb libgs9-common 9.55.0~dfsg1-0ubuntu5.2 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.1 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.2 deb libheif1 1.12.0-2build1 deb libhogweed6 3.7.3-1build2 deb libicu70 70.1-2 deb @@ -172,10 +172,10 @@ libjpeg-turbo8 2.1.2-0ubuntu1 deb libjpeg8 8c-2ubuntu10 deb libjq1 1.6-2.1ubuntu3 deb libjs-jquery 3.6.0+dfsg+~3.5.13-1 deb -libk5crypto3 1.19.2-2ubuntu0.1 deb +libk5crypto3 1.19.2-2ubuntu0.2 deb libkeyutils1 1.6.1-2ubuntu3 deb -libkrb5-3 1.19.2-2ubuntu0.1 deb -libkrb5support0 1.19.2-2ubuntu0.1 deb +libkrb5-3 1.19.2-2ubuntu0.2 deb +libkrb5support0 1.19.2-2ubuntu0.2 deb libksba8 1.6.0-2ubuntu0.2 deb liblcms2-2 2.12~rc1-2build2 deb libldap-2.5-0 2.5.14+dfsg-0ubuntu0.22.04.2 deb @@ -189,8 +189,8 @@ libmagickwand-6.q16-6 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb libmd0 1.0.4-1build1 deb libmount1 2.37.2-4ubuntu3 deb libmpdec3 2.5.1-2build2 deb -libncurses6 6.3-2 deb -libncursesw6 6.3-2 deb +libncurses6 6.3-2ubuntu0.1 deb +libncursesw6 6.3-2ubuntu0.1 deb libnettle8 3.7.3-1build2 deb libnghttp2-14 1.43.0-1build3 deb libnpth0 1.6-3build2 deb @@ -213,8 +213,8 @@ libprocps8 2:3.3.17-6ubuntu2 deb libpsl5 0.21.0-1.2build2 deb libpthread-stubs0-dev 0.4-1build2 deb libpython3-stdlib 3.10.6-1~22.04 deb -libpython3.10-minimal 3.10.6-1~22.04.2ubuntu1 deb -libpython3.10-stdlib 3.10.6-1~22.04.2ubuntu1 deb +libpython3.10-minimal 3.10.6-1~22.04.2ubuntu1.1 deb +libpython3.10-stdlib 3.10.6-1~22.04.2ubuntu1.1 deb libreadline8 8.1.2-1 deb librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb @@ -228,13 +228,13 @@ libsepol2 3.3-1build1 deb libsmartcols1 2.37.2-4ubuntu3 deb libsqlite3-0 3.37.2-2ubuntu0.1 deb libss2 1.46.5-2ubuntu1.1 deb -libssh-4 0.9.6-2build1 deb -libssl3 3.0.2-0ubuntu1.9 deb +libssh-4 0.9.6-2ubuntu0.22.04.1 deb +libssl3 3.0.2-0ubuntu1.10 deb libstdc++6 12.1.0-2ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.9 deb libtasn1-6 4.18.0-4build1 deb libtiff5 4.3.0-6ubuntu0.4 deb -libtinfo6 6.3-2 deb +libtinfo6 6.3-2ubuntu0.1 deb libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb libudev1 249.11-0ubuntu3.9 deb @@ -278,8 +278,8 @@ mdurl 0.1.2 pyt media-types 7.0.0 deb mount 2.37.2-4ubuntu3 deb natsort 8.3.1 python -ncurses-base 6.3-2 deb -ncurses-bin 6.3-2 deb +ncurses-base 6.3-2ubuntu0.1 deb +ncurses-bin 6.3-2ubuntu0.1 deb ndg-httpsclient 0.5.1 python netcat 1.218-4ubuntu1 deb netcat-openbsd 1.218-4ubuntu1 deb @@ -321,8 +321,8 @@ python3-pip 22.0.2+dfsg-1ubuntu0.2 deb python3-pkg-resources 59.6.0-1.2ubuntu0.22.04.1 deb python3-setuptools 59.6.0-1.2ubuntu0.22.04.1 deb python3-wheel 0.37.1-2ubuntu0.22.04.1 deb -python3.10 3.10.6-1~22.04.2ubuntu1 deb -python3.10-minimal 3.10.6-1~22.04.2ubuntu1 deb +python3.10 3.10.6-1~22.04.2ubuntu1.1 deb +python3.10-minimal 3.10.6-1~22.04.2ubuntu1.1 deb pytz 2022.7.1 python rapidfuzz 2.15.1 python rarfile 4.0 python @@ -334,7 +334,7 @@ rich 13.4.1 pyt rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb -selenium 4.9.1 python +selenium 4.10.0 python sensible-utils 0.0.17 deb setuptools 59.6.0 python setuptools 67.8.0 python @@ -343,7 +343,7 @@ sniffio 1.3.0 pyt snowballstemmer 2.2.0 python sortedcontainers 2.4.0 python soupsieve 2.4.1 python -sphinx-rtd-theme 1.2.1 python +sphinx-rtd-theme 1.2.2 python sphinxcontrib-applehelp 1.0.4 python sphinxcontrib-devhelp 1.0.2 python sphinxcontrib-htmlhelp 2.0.1 python @@ -355,9 +355,9 @@ sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb tornado 6.2 python trio 0.22.0 python -trio-websocket 0.10.2 python +trio-websocket 0.10.3 python typing_extensions 4.6.3 python -tzdata 2023c-0ubuntu0.22.04.1 deb +tzdata 2023c-0ubuntu0.22.04.2 deb tzlocal 5.0.1 python ubuntu-keyring 2021.03.26 deb ucf 3.0043 deb From 5c4c49bb1623fc009df502b18e6f3904a19b2639 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 17 Jun 2023 14:21:54 +0000 Subject: [PATCH 198/248] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6b0cdd972..06ecee243 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -82,12 +82,12 @@ gnupg-utils 2.2.27-3ubuntu2.1 deb golang.org/x/sync v0.0.0-20210220032951-036812b2e83c go-module golang.org/x/text v0.3.6 go-module goodreads 0.3.2 python -google-api-core 2.11.0 python -google-api-python-client 2.88.0 python -google-auth 2.19.1 python +google-api-core 2.11.1 python +google-api-python-client 2.89.0 python +google-auth 2.20.0 python google-auth-httplib2 0.1.0 python google-auth-oauthlib 0.8.0 python -googleapis-common-protos 1.59.0 python +googleapis-common-protos 1.59.1 python gpg 2.2.27-3ubuntu2.1 deb gpg-agent 2.2.27-3ubuntu2.1 deb gpg-wks-client 2.2.27-3ubuntu2.1 deb @@ -152,7 +152,7 @@ libfontconfig1 2.13.1-4.2ubuntu5 deb libfreetype6 2.11.1+dfsg-1ubuntu0.2 deb libgcc-s1 12.1.0-2ubuntu1~22.04 deb libgcrypt20 1.9.4-3ubuntu3 deb -libglib2.0-0 2.72.4-0ubuntu2 deb +libglib2.0-0 2.72.4-0ubuntu2.2 deb libgmp10 2:6.2.1+dfsg-3ubuntu1 deb libgnutls30 3.7.3-4ubuntu1.2 deb libgomp1 12.1.0-2ubuntu1~22.04 deb @@ -243,9 +243,9 @@ libuuid1 2.37.2-4ubuntu3 deb libwebp7 1.2.2-2ubuntu0.22.04.1 deb libwebpdemux2 1.2.2-2ubuntu0.22.04.1 deb libwebpmux3 1.2.2-2ubuntu0.22.04.1 deb -libx11-6 2:1.7.5-1 deb -libx11-data 2:1.7.5-1 deb -libx11-dev 2:1.7.5-1 deb +libx11-6 2:1.7.5-1ubuntu0.2 deb +libx11-data 2:1.7.5-1ubuntu0.2 deb +libx11-dev 2:1.7.5-1ubuntu0.2 deb libx265-199 3.5-2 deb libxau-dev 1:1.0.9-1build5 deb libxau6 1:1.0.9-1build5 deb @@ -271,7 +271,7 @@ login 1:4.8.1-2ubuntu2.1 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb lxml 4.9.2 python -markdown-it-py 2.2.0 python +markdown-it-py 3.0.0 python markdown2 2.4.8 python mawk 1.3.4.20200120-3 deb mdurl 0.1.2 python @@ -299,7 +299,7 @@ pip 22.0.2 pyt pip 23.1.2 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb -protobuf 4.23.2 python +protobuf 4.23.3 python publicsuffix 20211207.1025-1 deb pyOpenSSL 23.2.0 python pyasn1 0.5.0 python @@ -317,7 +317,7 @@ python3 3.10.6-1~22.04 deb python3-distutils 3.10.6-1~22.04 deb python3-lib2to3 3.10.6-1~22.04 deb python3-minimal 3.10.6-1~22.04 deb -python3-pip 22.0.2+dfsg-1ubuntu0.2 deb +python3-pip 22.0.2+dfsg-1ubuntu0.3 deb python3-pkg-resources 59.6.0-1.2ubuntu0.22.04.1 deb python3-setuptools 59.6.0-1.2ubuntu0.22.04.1 deb python3-wheel 0.37.1-2ubuntu0.22.04.1 deb @@ -330,7 +330,7 @@ rauth 0.7.3 pyt readline-common 8.1.2-1 deb requests 2.28.2 python requests-oauthlib 1.3.1 python -rich 13.4.1 python +rich 13.4.2 python rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb From 67d21c1492add6b82ca18e634028791fd96134b4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 25 Jun 2023 02:24:19 +0000 Subject: [PATCH 199/248] 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 06ecee243..df2a7ef45 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -136,7 +136,7 @@ libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1build3 deb libcom-err2 1.46.5-2ubuntu1.1 deb libcrypt1 1:4.4.27-1 deb -libcups2 2.4.1op1-1ubuntu4.2 deb +libcups2 2.4.1op1-1ubuntu4.4 deb libcurl4 7.81.0-1ubuntu1.10 deb libdav1d5 0.9.2-1 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb @@ -272,7 +272,7 @@ logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb lxml 4.9.2 python markdown-it-py 3.0.0 python -markdown2 2.4.8 python +markdown2 2.4.9 python mawk 1.3.4.20200120-3 deb mdurl 0.1.2 python media-types 7.0.0 deb @@ -305,7 +305,7 @@ pyOpenSSL 23.2.0 pyt pyasn1 0.5.0 python pyasn1-modules 0.3.0 python pycparser 2.21 python -pyparsing 3.0.9 python +pyparsing 3.1.0 python pypdf 3.7.1 python pyrsistent 0.19.3 python python 3.10.6 binary @@ -337,7 +337,7 @@ sed 4.8-1ubuntu2 deb selenium 4.10.0 python sensible-utils 0.0.17 deb setuptools 59.6.0 python -setuptools 67.8.0 python +setuptools 68.0.0 python six 1.16.0 python sniffio 1.3.0 python snowballstemmer 2.2.0 python @@ -376,5 +376,5 @@ xmltodict 0.13.0 pyt xorg-sgml-doctools 1:1.11-1.1 deb xtrans-dev 1.4.0-1 deb zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb -zope.event 4.6 python +zope.event 5.0 python zope.interface 6.0 python From 4748cadb35ad903e5c9633b1ccc92eb18072175a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 2 Jul 2023 02:12:05 +0000 Subject: [PATCH 200/248] Bot Updating Templated Files --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a1c10888d..cdf2628c8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -290,7 +290,7 @@ pipeline { 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" + 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}" @@ -326,12 +326,13 @@ pipeline { 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 ${TEMPLATED_FILES} + 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} From 3737e95110fd320f2fca353ec7723c8a99a026d9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 2 Jul 2023 02:17:53 +0000 Subject: [PATCH 201/248] 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 df2a7ef45..6a76227a1 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -84,7 +84,7 @@ golang.org/x/text v0.3.6 go- goodreads 0.3.2 python google-api-core 2.11.1 python google-api-python-client 2.89.0 python -google-auth 2.20.0 python +google-auth 2.21.0 python google-auth-httplib2 0.1.0 python google-auth-oauthlib 0.8.0 python googleapis-common-protos 1.59.1 python @@ -133,7 +133,7 @@ libbz2-1.0 1.0.8-5build1 deb libc-bin 2.35-0ubuntu3.1 deb libc6 2.35-0ubuntu3.1 deb libcap-ng0 0.7.9-2.2build3 deb -libcap2 1:2.44-1build3 deb +libcap2 1:2.44-1ubuntu0.22.04.1 deb libcom-err2 1.46.5-2ubuntu1.1 deb libcrypt1 1:4.4.27-1 deb libcups2 2.4.1op1-1ubuntu4.4 deb @@ -356,7 +356,7 @@ tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb tornado 6.2 python trio 0.22.0 python trio-websocket 0.10.3 python -typing_extensions 4.6.3 python +typing_extensions 4.7.0 python tzdata 2023c-0ubuntu0.22.04.2 deb tzlocal 5.0.1 python ubuntu-keyring 2021.03.26 deb From f80bd41e3a8586e5683f38acfab4591f5799f888 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 9 Jul 2023 02:19:50 +0000 Subject: [PATCH 202/248] Bot Updating Package Versions --- package_versions.txt | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6a76227a1..b4732a6d4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,7 +16,7 @@ PyDrive2 1.15.4 pyt PySocks 1.7.1 python PyYAML 6.0 python Pygments 2.15.1 python -SQLAlchemy 1.4.48 python +SQLAlchemy 1.4.49 python SQLAlchemy-Utils 0.39.0 python Sphinx 6.2.1 python URLObject 2.4.3 python @@ -27,11 +27,10 @@ Werkzeug 2.3.6 pyt adduser 3.118ubuntu5 deb advocate 1.0.0 python alabaster 0.7.13 python -anyio 3.7.0 python +anyio 3.7.1 python apt 2.4.9 deb apt-utils 2.4.9 deb arrow 1.2.3 python -async-generator 1.10 python attrs 23.1.0 python base-files 12ubuntu4.3 deb base-passwd 3.5.52build1 deb @@ -45,8 +44,8 @@ cachetools 5.3.1 pyt certifi 2023.5.7 python cffi 1.15.1 python chardet 4.0.0 python -charset-normalizer 3.1.0 python -click 8.1.3 python +charset-normalizer 3.2.0 python +click 8.1.4 python comicapi 2.2.1 python coreutils 8.32-4.1ubuntu1 deb cryptography 41.0.1 python @@ -60,7 +59,7 @@ docutils 0.18.1 pyt dpkg 1.21.1ubuntu2.2 deb dpkg-dev 1.21.1ubuntu2.2 deb e2fsprogs 1.46.5-2ubuntu1.1 deb -exceptiongroup 1.1.1 python +exceptiongroup 1.1.2 python fake-useragent 1.1.3 python faust-cchardet 2.1.18 python findutils 4.8.0-1ubuntu3 deb @@ -102,7 +101,7 @@ h11 0.14.0 pyt hicolor-icon-theme 0.17-2 deb hostname 3.23ubuntu2 deb html2text 2020.1.16 python -httpcore 0.17.2 python +httpcore 0.17.3 python httplib2 0.22.0 python httpx 0.24.1 python idna 3.4 python @@ -110,7 +109,7 @@ imagemagick 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb imagemagick-6-common 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb imagemagick-6.q16 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb imagesize 1.4.1 python -importlib-resources 5.12.0 python +importlib-resources 6.0.0 python init-system-helpers 1.62 deb iso-639 0.4.5 python itsdangerous 2.1.2 python @@ -163,7 +162,7 @@ libgssapi-krb5-2 1.19.2-2ubuntu0.2 deb libheif1 1.12.0-2build1 deb libhogweed6 3.7.3-1build2 deb libicu70 70.1-2 deb -libidn12 1.38-4build1 deb +libidn12 1.38-4ubuntu1 deb libidn2-0 2.3.2-2build1 deb libijs-0.35 0.35-15build2 deb libjbig0 2.1-3.1ubuntu0.22.04.1 deb @@ -270,7 +269,7 @@ locales 2.35-0ubuntu3.1 deb login 1:4.8.1-2ubuntu2.1 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb -lxml 4.9.2 python +lxml 4.9.3 python markdown-it-py 3.0.0 python markdown2 2.4.9 python mawk 1.3.4.20200120-3 deb @@ -299,7 +298,7 @@ pip 22.0.2 pyt pip 23.1.2 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb -protobuf 4.23.3 python +protobuf 4.23.4 python publicsuffix 20211207.1025-1 deb pyOpenSSL 23.2.0 python pyasn1 0.5.0 python @@ -354,9 +353,9 @@ sphinxcontrib-serializinghtml 1.1.5 pyt sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb tornado 6.2 python -trio 0.22.0 python +trio 0.22.1 python trio-websocket 0.10.3 python -typing_extensions 4.7.0 python +typing_extensions 4.7.1 python tzdata 2023c-0ubuntu0.22.04.2 deb tzlocal 5.0.1 python ubuntu-keyring 2021.03.26 deb From 31b63505429e3392bd4b74531eb9f45cfd830a79 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 16 Jul 2023 02:26:25 +0000 Subject: [PATCH 203/248] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b4732a6d4..0509228a5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,10 +45,10 @@ certifi 2023.5.7 pyt cffi 1.15.1 python chardet 4.0.0 python charset-normalizer 3.2.0 python -click 8.1.4 python +click 8.1.5 python comicapi 2.2.1 python coreutils 8.32-4.1ubuntu1 deb -cryptography 41.0.1 python +cryptography 41.0.2 python curl 7.81.0-1ubuntu1.10 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb @@ -69,7 +69,7 @@ fonts-urw-base35 20200910-1 deb free-proxy 1.1.1 python gcc-12-base 12.1.0-2ubuntu1~22.04 deb gevent 22.10.2 python -ghostscript 9.55.0~dfsg1-0ubuntu5.2 deb +ghostscript 9.55.0~dfsg1-0ubuntu5.3 deb github.com/beevik/etree v1.1.0 go-module github.com/kr/smartypants v0.1.0 go-module github.com/pgaskin/kepubify/_/html v0.0.0-20211223234002-6ee2cc632cdc go-module @@ -83,7 +83,7 @@ golang.org/x/text v0.3.6 go- goodreads 0.3.2 python google-api-core 2.11.1 python google-api-python-client 2.89.0 python -google-auth 2.21.0 python +google-auth 2.22.0 python google-auth-httplib2 0.1.0 python google-auth-oauthlib 0.8.0 python googleapis-common-protos 1.59.1 python @@ -156,8 +156,8 @@ libgmp10 2:6.2.1+dfsg-3ubuntu1 deb libgnutls30 3.7.3-4ubuntu1.2 deb libgomp1 12.1.0-2ubuntu1~22.04 deb libgpg-error0 1.43-3 deb -libgs9 9.55.0~dfsg1-0ubuntu5.2 deb -libgs9-common 9.55.0~dfsg1-0ubuntu5.2 deb +libgs9 9.55.0~dfsg1-0ubuntu5.3 deb +libgs9-common 9.55.0~dfsg1-0ubuntu5.3 deb libgssapi-krb5-2 1.19.2-2ubuntu0.2 deb libheif1 1.12.0-2build1 deb libhogweed6 3.7.3-1build2 deb @@ -295,7 +295,7 @@ perl 5.34.0-3ubuntu1.2 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb pip 22.0.2 python -pip 23.1.2 python +pip 23.2 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb protobuf 4.23.4 python @@ -353,7 +353,7 @@ sphinxcontrib-serializinghtml 1.1.5 pyt sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb tornado 6.2 python -trio 0.22.1 python +trio 0.22.2 python trio-websocket 0.10.3 python typing_extensions 4.7.1 python tzdata 2023c-0ubuntu0.22.04.2 deb From af9ff6484373aa0fe45e58c5124b49ae79010aa3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 23 Jul 2023 01:53:24 +0000 Subject: [PATCH 204/248] 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 0509228a5..e2d044592 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,7 +14,7 @@ Levenshtein 0.20.9 pyt MarkupSafe 2.1.3 python PyDrive2 1.15.4 python PySocks 1.7.1 python -PyYAML 6.0 python +PyYAML 6.0.1 python Pygments 2.15.1 python SQLAlchemy 1.4.49 python SQLAlchemy-Utils 0.39.0 python @@ -41,11 +41,11 @@ blinker 1.6.2 pyt bsdutils 1:2.37.2-4ubuntu3 deb ca-certificates 20230311ubuntu0.22.04.1 deb cachetools 5.3.1 python -certifi 2023.5.7 python +certifi 2023.7.22 python cffi 1.15.1 python chardet 4.0.0 python charset-normalizer 3.2.0 python -click 8.1.5 python +click 8.1.6 python comicapi 2.2.1 python coreutils 8.32-4.1ubuntu1 deb cryptography 41.0.2 python @@ -295,7 +295,7 @@ perl 5.34.0-3ubuntu1.2 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb pip 22.0.2 python -pip 23.2 python +pip 23.2.1 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb protobuf 4.23.4 python @@ -366,7 +366,7 @@ urllib3 1.26.16 pyt usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3 deb wheel 0.37.1 python -wheel 0.40.0 python +wheel 0.41.0 python wrapt 1.15.0 python wsproto 1.2.0 python x11-common 1:7.7+23ubuntu2 deb From 6c1841c5f7ebc1c5f823efeff04e41d47b1354bf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 26 Jul 2023 19:20:09 +0000 Subject: [PATCH 205/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e2d044592..77b54443b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -49,7 +49,7 @@ click 8.1.6 pyt comicapi 2.2.1 python coreutils 8.32-4.1ubuntu1 deb cryptography 41.0.2 python -curl 7.81.0-1ubuntu1.10 deb +curl 7.81.0-1ubuntu1.13 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb @@ -136,7 +136,7 @@ libcap2 1:2.44-1ubuntu0.22.04.1 deb libcom-err2 1.46.5-2ubuntu1.1 deb libcrypt1 1:4.4.27-1 deb libcups2 2.4.1op1-1ubuntu4.4 deb -libcurl4 7.81.0-1ubuntu1.10 deb +libcurl4 7.81.0-1ubuntu1.13 deb libdav1d5 0.9.2-1 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdbus-1-3 1.12.20-2ubuntu4.1 deb @@ -177,7 +177,7 @@ libkrb5-3 1.19.2-2ubuntu0.2 deb libkrb5support0 1.19.2-2ubuntu0.2 deb libksba8 1.6.0-2ubuntu0.2 deb liblcms2-2 2.12~rc1-2build2 deb -libldap-2.5-0 2.5.14+dfsg-0ubuntu0.22.04.2 deb +libldap-2.5-0 2.5.15+dfsg-0ubuntu0.22.04.1 deb libldap-common 2.5.14+dfsg-0ubuntu0.22.04.2 deb liblqr-1-0 0.4.2-2.1 deb libltdl7 2.4.6-15build2 deb @@ -271,7 +271,7 @@ logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb lxml 4.9.3 python markdown-it-py 3.0.0 python -markdown2 2.4.9 python +markdown2 2.4.10 python mawk 1.3.4.20200120-3 deb mdurl 0.1.2 python media-types 7.0.0 deb From 7f07eb38bc3079fbb2179c8713dd9a7e8f5f25c5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 28 Jul 2023 12:43:11 +0000 Subject: [PATCH 206/248] Bot Updating Package Versions --- package_versions.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 77b54443b..6bfd60138 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,6 +12,7 @@ Flask-WTF 1.1.1 pyt Jinja2 3.1.2 python Levenshtein 0.20.9 python MarkupSafe 2.1.3 python +Pillow 10.0.0 python PyDrive2 1.15.4 python PySocks 1.7.1 python PyYAML 6.0.1 python @@ -46,7 +47,7 @@ cffi 1.15.1 pyt chardet 4.0.0 python charset-normalizer 3.2.0 python click 8.1.6 python -comicapi 2.2.1 python +comicapi 3.2.0 python coreutils 8.32-4.1ubuntu1 deb cryptography 41.0.2 python curl 7.81.0-1ubuntu1.13 deb @@ -109,6 +110,7 @@ imagemagick 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb imagemagick-6-common 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb imagemagick-6.q16 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb imagesize 1.4.1 python +importlib-metadata 6.8.0 python importlib-resources 6.0.0 python init-system-helpers 1.62 deb iso-639 0.4.5 python @@ -303,6 +305,7 @@ publicsuffix 20211207.1025-1 deb pyOpenSSL 23.2.0 python pyasn1 0.5.0 python pyasn1-modules 0.3.0 python +pycountry 22.3.5 python pycparser 2.21 python pyparsing 3.1.0 python pypdf 3.7.1 python @@ -352,6 +355,7 @@ sphinxcontrib-qthelp 1.0.3 pyt sphinxcontrib-serializinghtml 1.1.5 python sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb +text2digits 0.1.0 python tornado 6.2 python trio 0.22.2 python trio-websocket 0.10.3 python @@ -367,6 +371,7 @@ usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3 deb wheel 0.37.1 python wheel 0.41.0 python +wordninja 2.0.0 python wrapt 1.15.0 python wsproto 1.2.0 python x11-common 1:7.7+23ubuntu2 deb @@ -374,6 +379,7 @@ x11proto-dev 2021.5-1 deb xmltodict 0.13.0 python xorg-sgml-doctools 1:1.11-1.1 deb xtrans-dev 1.4.0-1 deb +zipp 3.16.2 python zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb zope.event 5.0 python zope.interface 6.0 python From 2152905620ca49320ab3fe9b98222e49d07abc9d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 29 Jul 2023 16:26:33 +0000 Subject: [PATCH 207/248] 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 6bfd60138..66b14ccc8 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -332,7 +332,7 @@ rauth 0.7.3 pyt readline-common 8.1.2-1 deb requests 2.28.2 python requests-oauthlib 1.3.1 python -rich 13.4.2 python +rich 13.5.0 python rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb From ebc993eac9735aec823b10db08f21a6ce7e8910f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 30 Jul 2023 18:26:25 +0000 Subject: [PATCH 208/248] 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 66b14ccc8..86942e8e6 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -307,7 +307,7 @@ pyasn1 0.5.0 pyt pyasn1-modules 0.3.0 python pycountry 22.3.5 python pycparser 2.21 python -pyparsing 3.1.0 python +pyparsing 3.1.1 python pypdf 3.7.1 python pyrsistent 0.19.3 python python 3.10.6 binary From a0b8483e82d002ad4f0c26e105d77e3d1d79f739 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 31 Jul 2023 17:20:32 +0000 Subject: [PATCH 209/248] Bot Updating Package Versions --- package_versions.txt | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 86942e8e6..66e3dfcda 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -19,6 +19,7 @@ PyYAML 6.0.1 pyt Pygments 2.15.1 python SQLAlchemy 1.4.49 python SQLAlchemy-Utils 0.39.0 python +Simple Launcher Executable 1.1.0.14 dotnet Sphinx 6.2.1 python URLObject 2.4.3 python Unidecode 1.3.6 python @@ -68,7 +69,7 @@ flask-babel 3.0.1 pyt fontconfig-config 2.13.1-4.2ubuntu5 deb fonts-urw-base35 20200910-1 deb free-proxy 1.1.1 python -gcc-12-base 12.1.0-2ubuntu1~22.04 deb +gcc-12-base 12.3.0-1ubuntu1~22.04 deb gevent 22.10.2 python ghostscript 9.55.0~dfsg1-0ubuntu5.3 deb github.com/beevik/etree v1.1.0 go-module @@ -87,7 +88,7 @@ google-api-python-client 2.89.0 pyt google-auth 2.22.0 python google-auth-httplib2 0.1.0 python google-auth-oauthlib 0.8.0 python -googleapis-common-protos 1.59.1 python +googleapis-common-protos 1.60.0 python gpg 2.2.27-3ubuntu2.1 deb gpg-agent 2.2.27-3ubuntu2.1 deb gpg-wks-client 2.2.27-3ubuntu2.1 deb @@ -151,12 +152,12 @@ libffi8 3.4.2-4 deb libfftw3-double3 3.3.8-2ubuntu8 deb libfontconfig1 2.13.1-4.2ubuntu5 deb libfreetype6 2.11.1+dfsg-1ubuntu0.2 deb -libgcc-s1 12.1.0-2ubuntu1~22.04 deb +libgcc-s1 12.3.0-1ubuntu1~22.04 deb libgcrypt20 1.9.4-3ubuntu3 deb libglib2.0-0 2.72.4-0ubuntu2.2 deb libgmp10 2:6.2.1+dfsg-3ubuntu1 deb libgnutls30 3.7.3-4ubuntu1.2 deb -libgomp1 12.1.0-2ubuntu1~22.04 deb +libgomp1 12.3.0-1ubuntu1~22.04 deb libgpg-error0 1.43-3 deb libgs9 9.55.0~dfsg1-0ubuntu5.3 deb libgs9-common 9.55.0~dfsg1-0ubuntu5.3 deb @@ -214,8 +215,8 @@ libprocps8 2:3.3.17-6ubuntu2 deb libpsl5 0.21.0-1.2build2 deb libpthread-stubs0-dev 0.4-1build2 deb libpython3-stdlib 3.10.6-1~22.04 deb -libpython3.10-minimal 3.10.6-1~22.04.2ubuntu1.1 deb -libpython3.10-stdlib 3.10.6-1~22.04.2ubuntu1.1 deb +libpython3.10-minimal 3.10.12-1~22.04.2 deb +libpython3.10-stdlib 3.10.12-1~22.04.2 deb libreadline8 8.1.2-1 deb librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb @@ -231,7 +232,7 @@ libsqlite3-0 3.37.2-2ubuntu0.1 deb libss2 1.46.5-2ubuntu1.1 deb libssh-4 0.9.6-2ubuntu0.22.04.1 deb libssl3 3.0.2-0ubuntu1.10 deb -libstdc++6 12.1.0-2ubuntu1~22.04 deb +libstdc++6 12.3.0-1ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.9 deb libtasn1-6 4.18.0-4build1 deb libtiff5 4.3.0-6ubuntu0.4 deb @@ -310,21 +311,21 @@ pycparser 2.21 pyt pyparsing 3.1.1 python pypdf 3.7.1 python pyrsistent 0.19.3 python -python 3.10.6 binary +python 3.10.12 binary python-Levenshtein 0.20.9 python python-dateutil 2.8.2 python python-dotenv 1.0.0 python python-ldap 3.4.3 python python3 3.10.6-1~22.04 deb -python3-distutils 3.10.6-1~22.04 deb -python3-lib2to3 3.10.6-1~22.04 deb +python3-distutils 3.10.8-1~22.04 deb +python3-lib2to3 3.10.8-1~22.04 deb python3-minimal 3.10.6-1~22.04 deb python3-pip 22.0.2+dfsg-1ubuntu0.3 deb python3-pkg-resources 59.6.0-1.2ubuntu0.22.04.1 deb python3-setuptools 59.6.0-1.2ubuntu0.22.04.1 deb python3-wheel 0.37.1-2ubuntu0.22.04.1 deb -python3.10 3.10.6-1~22.04.2ubuntu1.1 deb -python3.10-minimal 3.10.6-1~22.04.2ubuntu1.1 deb +python3.10 3.10.12-1~22.04.2 deb +python3.10-minimal 3.10.12-1~22.04.2 deb pytz 2022.7.1 python rapidfuzz 2.15.1 python rarfile 4.0 python @@ -332,7 +333,7 @@ rauth 0.7.3 pyt readline-common 8.1.2-1 deb requests 2.28.2 python requests-oauthlib 1.3.1 python -rich 13.5.0 python +rich 13.5.1 python rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb From 8293fe1953945e8c9f78c622450f625eb2012915 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 6 Aug 2023 01:33:09 +0000 Subject: [PATCH 210/248] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 66e3dfcda..cd7b2159e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -50,7 +50,7 @@ charset-normalizer 3.2.0 pyt click 8.1.6 python comicapi 3.2.0 python coreutils 8.32-4.1ubuntu1 deb -cryptography 41.0.2 python +cryptography 41.0.3 python curl 7.81.0-1ubuntu1.13 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb @@ -62,7 +62,7 @@ dpkg 1.21.1ubuntu2.2 deb dpkg-dev 1.21.1ubuntu2.2 deb e2fsprogs 1.46.5-2ubuntu1.1 deb exceptiongroup 1.1.2 python -fake-useragent 1.1.3 python +fake-useragent 1.2.1 python faust-cchardet 2.1.18 python findutils 4.8.0-1ubuntu3 deb flask-babel 3.0.1 python @@ -181,7 +181,7 @@ libkrb5support0 1.19.2-2ubuntu0.2 deb libksba8 1.6.0-2ubuntu0.2 deb liblcms2-2 2.12~rc1-2build2 deb libldap-2.5-0 2.5.15+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.14+dfsg-0ubuntu0.22.04.2 deb +libldap-common 2.5.15+dfsg-0ubuntu0.22.04.1 deb liblqr-1-0 0.4.2-2.1 deb libltdl7 2.4.6-15build2 deb liblz4-1 1.9.3-2build2 deb @@ -333,11 +333,11 @@ rauth 0.7.3 pyt readline-common 8.1.2-1 deb requests 2.28.2 python requests-oauthlib 1.3.1 python -rich 13.5.1 python +rich 13.5.2 python rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb -selenium 4.10.0 python +selenium 4.11.2 python sensible-utils 0.0.17 deb setuptools 59.6.0 python setuptools 68.0.0 python @@ -371,7 +371,7 @@ urllib3 1.26.16 pyt usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3 deb wheel 0.37.1 python -wheel 0.41.0 python +wheel 0.41.1 python wordninja 2.0.0 python wrapt 1.15.0 python wsproto 1.2.0 python From a0ec64861cbe378db347f15dcc289f395f757fa3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 8 Aug 2023 19:21:08 +0000 Subject: [PATCH 211/248] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cd7b2159e..af27c5385 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,7 +16,7 @@ Pillow 10.0.0 pyt PyDrive2 1.15.4 python PySocks 1.7.1 python PyYAML 6.0.1 python -Pygments 2.15.1 python +Pygments 2.16.1 python SQLAlchemy 1.4.49 python SQLAlchemy-Utils 0.39.0 python Simple Launcher Executable 1.1.0.14 dotnet @@ -112,7 +112,7 @@ imagemagick-6-common 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb imagemagick-6.q16 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb imagesize 1.4.1 python importlib-metadata 6.8.0 python -importlib-resources 6.0.0 python +importlib-resources 6.0.1 python init-system-helpers 1.62 deb iso-639 0.4.5 python itsdangerous 2.1.2 python @@ -347,13 +347,13 @@ snowballstemmer 2.2.0 pyt sortedcontainers 2.4.0 python soupsieve 2.4.1 python sphinx-rtd-theme 1.2.2 python -sphinxcontrib-applehelp 1.0.4 python -sphinxcontrib-devhelp 1.0.2 python -sphinxcontrib-htmlhelp 2.0.1 python +sphinxcontrib-applehelp 1.0.5 python +sphinxcontrib-devhelp 1.0.3 python +sphinxcontrib-htmlhelp 2.0.2 python sphinxcontrib-jquery 4.1 python sphinxcontrib-jsmath 1.0.1 python -sphinxcontrib-qthelp 1.0.3 python -sphinxcontrib-serializinghtml 1.1.5 python +sphinxcontrib-qthelp 1.0.4 python +sphinxcontrib-serializinghtml 1.1.6 python sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb text2digits 0.1.0 python From 883e6ba53018438eab53705606f1a03af4912bea Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 12 Aug 2023 12:34:31 +0000 Subject: [PATCH 212/248] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index af27c5385..cfc34b837 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -63,7 +63,7 @@ dpkg-dev 1.21.1ubuntu2.2 deb e2fsprogs 1.46.5-2ubuntu1.1 deb exceptiongroup 1.1.2 python fake-useragent 1.2.1 python -faust-cchardet 2.1.18 python +faust-cchardet 2.1.19 python findutils 4.8.0-1ubuntu3 deb flask-babel 3.0.1 python fontconfig-config 2.13.1-4.2ubuntu5 deb @@ -180,7 +180,7 @@ libkrb5-3 1.19.2-2ubuntu0.2 deb libkrb5support0 1.19.2-2ubuntu0.2 deb libksba8 1.6.0-2ubuntu0.2 deb liblcms2-2 2.12~rc1-2build2 deb -libldap-2.5-0 2.5.15+dfsg-0ubuntu0.22.04.1 deb +libldap-2.5-0 2.5.16+dfsg-0ubuntu0.22.04.1 deb libldap-common 2.5.15+dfsg-0ubuntu0.22.04.1 deb liblqr-1-0 0.4.2-2.1 deb libltdl7 2.4.6-15build2 deb @@ -301,7 +301,7 @@ pip 22.0.2 pyt pip 23.2.1 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb -protobuf 4.23.4 python +protobuf 4.24.0 python publicsuffix 20211207.1025-1 deb pyOpenSSL 23.2.0 python pyasn1 0.5.0 python @@ -347,13 +347,13 @@ snowballstemmer 2.2.0 pyt sortedcontainers 2.4.0 python soupsieve 2.4.1 python sphinx-rtd-theme 1.2.2 python -sphinxcontrib-applehelp 1.0.5 python -sphinxcontrib-devhelp 1.0.3 python -sphinxcontrib-htmlhelp 2.0.2 python +sphinxcontrib-applehelp 1.0.6 python +sphinxcontrib-devhelp 1.0.4 python +sphinxcontrib-htmlhelp 2.0.3 python sphinxcontrib-jquery 4.1 python sphinxcontrib-jsmath 1.0.1 python -sphinxcontrib-qthelp 1.0.4 python -sphinxcontrib-serializinghtml 1.1.6 python +sphinxcontrib-qthelp 1.0.5 python +sphinxcontrib-serializinghtml 1.1.7 python sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb text2digits 0.1.0 python From 26e1cdba11380010bf9ff41ab22d71349b06a355 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Sat, 12 Aug 2023 15:17:31 -0400 Subject: [PATCH 213/248] Update readme-vars.yml --- readme-vars.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/readme-vars.yml b/readme-vars.yml index d05ea106f..d8bbe4a7e 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -55,6 +55,10 @@ app_setup_block: | *Username:* admin *Password:* admin123 + If you lock yourself out or forget a password, you will need to specify the app.db similar to this: + `docker exec -it calibre-web python3 /app/calibre-web/cps.py -p /config/app.db -s <user>:<pass>` + If you fail to specify the proper db, it will appear to succeed, but it will not work. + Unrar is included by default and needs to be set in the Calibre-Web admin page (Basic Configuration:External Binaries) with a path of `/usr/bin/unrar` **x86-64 only** We have implemented the optional ability to pull in the dependencies to enable ebook conversion utilising Calibre, this means if you don't require this feature the container isn't uneccessarily bloated but should you require it, it is easily available. From e151a600f9db3c57457df7d680c646acbeb17416 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Sat, 12 Aug 2023 15:17:55 -0400 Subject: [PATCH 214/248] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 158ee7e71..2094cf8d0 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,10 @@ On the initial setup screen, enter `/books` as your calibre library location. *Username:* admin *Password:* admin123 +If you lock yourself out or forget a password, you will need to specify the app.db similar to this: +`docker exec -it calibre-web python3 /app/calibre-web/cps.py -p /config/app.db -s <user>:<pass>` +If you fail to specify the proper db, it will appear to succeed, but it will not work. + Unrar is included by default and needs to be set in the Calibre-Web admin page (Basic Configuration:External Binaries) with a path of `/usr/bin/unrar` **x86-64 only** We have implemented the optional ability to pull in the dependencies to enable ebook conversion utilising Calibre, this means if you don't require this feature the container isn't uneccessarily bloated but should you require it, it is easily available. From 781608283063e42a2ea2338dc9c65368a9ee3653 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 13 Aug 2023 01:26:44 +0000 Subject: [PATCH 215/248] 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 cfc34b837..91ab8fb9e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,5 +1,5 @@ NAME VERSION TYPE -APScheduler 3.10.1 python +APScheduler 3.10.2 python Babel 2.12.1 python Deprecated 1.2.14 python Flask 2.3.2 python From d5ad96bbac19d3ae4e53258f51a899be7e0cb445 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 16 Aug 2023 16:28:35 +0000 Subject: [PATCH 216/248] Bot Updating Package Versions --- package_versions.txt | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 91ab8fb9e..54477e612 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,5 +1,5 @@ NAME VERSION TYPE -APScheduler 3.10.2 python +APScheduler 3.10.3 python Babel 2.12.1 python Deprecated 1.2.14 python Flask 2.3.2 python @@ -25,13 +25,13 @@ URLObject 2.4.3 pyt Unidecode 1.3.6 python WTForms 3.0.1 python Wand 0.6.11 python -Werkzeug 2.3.6 python +Werkzeug 2.3.7 python adduser 3.118ubuntu5 deb advocate 1.0.0 python alabaster 0.7.13 python anyio 3.7.1 python -apt 2.4.9 deb -apt-utils 2.4.9 deb +apt 2.4.10 deb +apt-utils 2.4.10 deb arrow 1.2.3 python attrs 23.1.0 python base-files 12ubuntu4.3 deb @@ -61,7 +61,7 @@ docutils 0.18.1 pyt dpkg 1.21.1ubuntu2.2 deb dpkg-dev 1.21.1ubuntu2.2 deb e2fsprogs 1.46.5-2ubuntu1.1 deb -exceptiongroup 1.1.2 python +exceptiongroup 1.1.3 python fake-useragent 1.2.1 python faust-cchardet 2.1.19 python findutils 4.8.0-1ubuntu3 deb @@ -120,7 +120,7 @@ jq 1.6-2.1ubuntu3 deb jsonschema 4.17.3 python libacl1 2.3.1-1 deb libaom3 3.3.0-1 deb -libapt-pkg6.0 2.4.9 deb +libapt-pkg6.0 2.4.10 deb libassuan0 2.5.5-1build1 deb libattr1 1:2.5.1-1build1 deb libaudit-common 1:3.0.7-1build1 deb @@ -181,7 +181,7 @@ libkrb5support0 1.19.2-2ubuntu0.2 deb libksba8 1.6.0-2ubuntu0.2 deb liblcms2-2 2.12~rc1-2build2 deb libldap-2.5-0 2.5.16+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.15+dfsg-0ubuntu0.22.04.1 deb +libldap-common 2.5.16+dfsg-0ubuntu0.22.04.1 deb liblqr-1-0 0.4.2-2.1 deb libltdl7 2.4.6-15build2 deb liblz4-1 1.9.3-2build2 deb @@ -235,7 +235,7 @@ libssl3 3.0.2-0ubuntu1.10 deb libstdc++6 12.3.0-1ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.9 deb libtasn1-6 4.18.0-4build1 deb -libtiff5 4.3.0-6ubuntu0.4 deb +libtiff5 4.3.0-6ubuntu0.5 deb libtinfo6 6.3-2ubuntu0.1 deb libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb @@ -311,7 +311,6 @@ pycparser 2.21 pyt pyparsing 3.1.1 python pypdf 3.7.1 python pyrsistent 0.19.3 python -python 3.10.12 binary python-Levenshtein 0.20.9 python python-dateutil 2.8.2 python python-dotenv 1.0.0 python @@ -340,20 +339,20 @@ sed 4.8-1ubuntu2 deb selenium 4.11.2 python sensible-utils 0.0.17 deb setuptools 59.6.0 python -setuptools 68.0.0 python +setuptools 68.1.0 python six 1.16.0 python sniffio 1.3.0 python snowballstemmer 2.2.0 python sortedcontainers 2.4.0 python soupsieve 2.4.1 python sphinx-rtd-theme 1.2.2 python -sphinxcontrib-applehelp 1.0.6 python -sphinxcontrib-devhelp 1.0.4 python -sphinxcontrib-htmlhelp 2.0.3 python +sphinxcontrib-applehelp 1.0.7 python +sphinxcontrib-devhelp 1.0.5 python +sphinxcontrib-htmlhelp 2.0.4 python sphinxcontrib-jquery 4.1 python sphinxcontrib-jsmath 1.0.1 python -sphinxcontrib-qthelp 1.0.5 python -sphinxcontrib-serializinghtml 1.1.7 python +sphinxcontrib-qthelp 1.0.6 python +sphinxcontrib-serializinghtml 1.1.8 python sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb text2digits 0.1.0 python From 82bf0c9880d4c9cf65778eeb2be47f8ee202821a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 20 Aug 2023 01:26:18 +0000 Subject: [PATCH 217/248] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 54477e612..c6cb662cc 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,5 +1,5 @@ NAME VERSION TYPE -APScheduler 3.10.3 python +APScheduler 3.10.4 python Babel 2.12.1 python Deprecated 1.2.14 python Flask 2.3.2 python @@ -47,7 +47,7 @@ certifi 2023.7.22 pyt cffi 1.15.1 python chardet 4.0.0 python charset-normalizer 3.2.0 python -click 8.1.6 python +click 8.1.7 python comicapi 3.2.0 python coreutils 8.32-4.1ubuntu1 deb cryptography 41.0.3 python @@ -71,7 +71,7 @@ fonts-urw-base35 20200910-1 deb free-proxy 1.1.1 python gcc-12-base 12.3.0-1ubuntu1~22.04 deb gevent 22.10.2 python -ghostscript 9.55.0~dfsg1-0ubuntu5.3 deb +ghostscript 9.55.0~dfsg1-0ubuntu5.4 deb github.com/beevik/etree v1.1.0 go-module github.com/kr/smartypants v0.1.0 go-module github.com/pgaskin/kepubify/_/html v0.0.0-20211223234002-6ee2cc632cdc go-module @@ -159,8 +159,8 @@ libgmp10 2:6.2.1+dfsg-3ubuntu1 deb libgnutls30 3.7.3-4ubuntu1.2 deb libgomp1 12.3.0-1ubuntu1~22.04 deb libgpg-error0 1.43-3 deb -libgs9 9.55.0~dfsg1-0ubuntu5.3 deb -libgs9-common 9.55.0~dfsg1-0ubuntu5.3 deb +libgs9 9.55.0~dfsg1-0ubuntu5.4 deb +libgs9-common 9.55.0~dfsg1-0ubuntu5.4 deb libgssapi-krb5-2 1.19.2-2ubuntu0.2 deb libheif1 1.12.0-2build1 deb libhogweed6 3.7.3-1build2 deb @@ -301,7 +301,7 @@ pip 22.0.2 pyt pip 23.2.1 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb -protobuf 4.24.0 python +protobuf 4.24.1 python publicsuffix 20211207.1025-1 deb pyOpenSSL 23.2.0 python pyasn1 0.5.0 python @@ -339,7 +339,7 @@ sed 4.8-1ubuntu2 deb selenium 4.11.2 python sensible-utils 0.0.17 deb setuptools 59.6.0 python -setuptools 68.1.0 python +setuptools 68.1.2 python six 1.16.0 python sniffio 1.3.0 python snowballstemmer 2.2.0 python From 9f8c89dce6336b342a3696789004b8269318c216 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 23 Aug 2023 19:20:40 +0000 Subject: [PATCH 218/248] Bot Updating Package Versions --- package_versions.txt | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c6cb662cc..e66f4bd13 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,8 +1,9 @@ NAME VERSION TYPE APScheduler 3.10.4 python Babel 2.12.1 python +Brotli 1.0.9 python Deprecated 1.2.14 python -Flask 2.3.2 python +Flask 2.3.3 python Flask-Dance 6.2.0 python Flask-Limiter 3.3.1 python Flask-Login 0.6.2 python @@ -20,7 +21,7 @@ Pygments 2.16.1 pyt SQLAlchemy 1.4.49 python SQLAlchemy-Utils 0.39.0 python Simple Launcher Executable 1.1.0.14 dotnet -Sphinx 6.2.1 python +Sphinx 7.2.2 python URLObject 2.4.3 python Unidecode 1.3.6 python WTForms 3.0.1 python @@ -113,6 +114,7 @@ imagemagick-6.q16 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb imagesize 1.4.1 python importlib-metadata 6.8.0 python importlib-resources 6.0.1 python +inflate64 0.3.1 python init-system-helpers 1.62 deb iso-639 0.4.5 python itsdangerous 2.1.2 python @@ -279,6 +281,7 @@ mawk 1.3.4.20200120-3 deb mdurl 0.1.2 python media-types 7.0.0 deb mount 2.37.2-4ubuntu3 deb +multivolumefile 0.2.3 python natsort 8.3.1 python ncurses-base 6.3-2ubuntu0.1 deb ncurses-bin 6.3-2ubuntu0.1 deb @@ -302,14 +305,19 @@ pip 23.2.1 pyt poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb protobuf 4.24.1 python +psutil 5.9.5 python publicsuffix 20211207.1025-1 deb +py7zr 0.20.6 python pyOpenSSL 23.2.0 python pyasn1 0.5.0 python pyasn1-modules 0.3.0 python +pybcj 1.0.1 python pycountry 22.3.5 python pycparser 2.21 python +pycryptodomex 3.18.0 python pyparsing 3.1.1 python pypdf 3.7.1 python +pyppmd 1.0.0 python pyrsistent 0.19.3 python python-Levenshtein 0.20.9 python python-dateutil 2.8.2 python @@ -326,6 +334,7 @@ python3-wheel 0.37.1-2ubuntu0.22.04.1 deb python3.10 3.10.12-1~22.04.2 deb python3.10-minimal 3.10.12-1~22.04.2 deb pytz 2022.7.1 python +pyzstd 0.15.9 python rapidfuzz 2.15.1 python rarfile 4.0 python rauth 0.7.3 python @@ -345,17 +354,18 @@ sniffio 1.3.0 pyt snowballstemmer 2.2.0 python sortedcontainers 2.4.0 python soupsieve 2.4.1 python -sphinx-rtd-theme 1.2.2 python +sphinx-rtd-theme 1.3.0 python sphinxcontrib-applehelp 1.0.7 python sphinxcontrib-devhelp 1.0.5 python sphinxcontrib-htmlhelp 2.0.4 python sphinxcontrib-jquery 4.1 python sphinxcontrib-jsmath 1.0.1 python sphinxcontrib-qthelp 1.0.6 python -sphinxcontrib-serializinghtml 1.1.8 python +sphinxcontrib-serializinghtml 1.1.9 python sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb text2digits 0.1.0 python +texttable 1.6.7 python tornado 6.2 python trio 0.22.2 python trio-websocket 0.10.3 python @@ -370,7 +380,7 @@ urllib3 1.26.16 pyt usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3 deb wheel 0.37.1 python -wheel 0.41.1 python +wheel 0.41.2 python wordninja 2.0.0 python wrapt 1.15.0 python wsproto 1.2.0 python From 7605883ed7b3a5ee7adddf68d50f914f20f35c7f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 24 Aug 2023 09:21:45 +0000 Subject: [PATCH 219/248] 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 e66f4bd13..9ba21cd4a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,7 +21,7 @@ Pygments 2.16.1 pyt SQLAlchemy 1.4.49 python SQLAlchemy-Utils 0.39.0 python Simple Launcher Executable 1.1.0.14 dotnet -Sphinx 7.2.2 python +Sphinx 7.2.3 python URLObject 2.4.3 python Unidecode 1.3.6 python WTForms 3.0.1 python From 85497d4fdf2906bdc9a3fea9e4028e4f19928472 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 27 Aug 2023 01:26:29 +0000 Subject: [PATCH 220/248] Bot Updating Package Versions --- package_versions.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9ba21cd4a..79b0c2b0c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -38,6 +38,7 @@ attrs 23.1.0 pyt base-files 12ubuntu4.3 deb base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1 deb +bash 5.1.16 binary beautifulsoup4 4.11.2 python bibtexparser 1.4.0 python blinker 1.6.2 python @@ -304,7 +305,7 @@ pip 22.0.2 pyt pip 23.2.1 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb -protobuf 4.24.1 python +protobuf 4.24.2 python psutil 5.9.5 python publicsuffix 20211207.1025-1 deb py7zr 0.20.6 python From 2ff6446dab6894e2d73fffe93e25bba3afffd6d2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 3 Sep 2023 01:29:40 +0000 Subject: [PATCH 221/248] 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 79b0c2b0c..32d2a10c4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,7 +21,7 @@ Pygments 2.16.1 pyt SQLAlchemy 1.4.49 python SQLAlchemy-Utils 0.39.0 python Simple Launcher Executable 1.1.0.14 dotnet -Sphinx 7.2.3 python +Sphinx 7.2.5 python URLObject 2.4.3 python Unidecode 1.3.6 python WTForms 3.0.1 python @@ -30,7 +30,7 @@ Werkzeug 2.3.7 pyt adduser 3.118ubuntu5 deb advocate 1.0.0 python alabaster 0.7.13 python -anyio 3.7.1 python +anyio 4.0.0 python apt 2.4.10 deb apt-utils 2.4.10 deb arrow 1.2.3 python @@ -270,7 +270,7 @@ libxslt1.1 1.1.34-4ubuntu0.22.04.1 deb libxtst6 2:1.2.3-1build4 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb -limits 3.5.0 python +limits 3.6.0 python locales 2.35-0ubuntu3.1 deb login 1:4.8.1-2ubuntu2.1 deb logsave 1.46.5-2ubuntu1.1 deb @@ -346,7 +346,7 @@ rich 13.5.2 pyt rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb -selenium 4.11.2 python +selenium 4.12.0 python sensible-utils 0.0.17 deb setuptools 59.6.0 python setuptools 68.1.2 python @@ -354,7 +354,7 @@ six 1.16.0 pyt sniffio 1.3.0 python snowballstemmer 2.2.0 python sortedcontainers 2.4.0 python -soupsieve 2.4.1 python +soupsieve 2.5 python sphinx-rtd-theme 1.3.0 python sphinxcontrib-applehelp 1.0.7 python sphinxcontrib-devhelp 1.0.5 python From dc2abd0ffa602ef0f5ebe706a4554c3e01d2fb16 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 10 Sep 2023 01:29:25 +0000 Subject: [PATCH 222/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 32d2a10c4..a943f479b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ NAME VERSION TYPE APScheduler 3.10.4 python Babel 2.12.1 python -Brotli 1.0.9 python +Brotli 1.1.0 python Deprecated 1.2.14 python Flask 2.3.3 python Flask-Dance 6.2.0 python @@ -305,7 +305,7 @@ pip 22.0.2 pyt pip 23.2.1 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb -protobuf 4.24.2 python +protobuf 4.24.3 python psutil 5.9.5 python publicsuffix 20211207.1025-1 deb py7zr 0.20.6 python @@ -349,7 +349,7 @@ sed 4.8-1ubuntu2 deb selenium 4.12.0 python sensible-utils 0.0.17 deb setuptools 59.6.0 python -setuptools 68.1.2 python +setuptools 68.2.0 python six 1.16.0 python sniffio 1.3.0 python snowballstemmer 2.2.0 python @@ -369,7 +369,7 @@ text2digits 0.1.0 pyt texttable 1.6.7 python tornado 6.2 python trio 0.22.2 python -trio-websocket 0.10.3 python +trio-websocket 0.10.4 python typing_extensions 4.7.1 python tzdata 2023c-0ubuntu0.22.04.2 deb tzlocal 5.0.1 python From 8b24aadb20ff84e3fd8f68992286cdcbf16cb6c8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 17 Sep 2023 01:28:02 +0000 Subject: [PATCH 223/248] Bot Updating Package Versions --- package_versions.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a943f479b..14ca77c06 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -13,7 +13,7 @@ Flask-WTF 1.1.1 pyt Jinja2 3.1.2 python Levenshtein 0.20.9 python MarkupSafe 2.1.3 python -Pillow 10.0.0 python +Pillow 10.0.1 python PyDrive2 1.15.4 python PySocks 1.7.1 python PyYAML 6.0.1 python @@ -21,7 +21,7 @@ Pygments 2.16.1 pyt SQLAlchemy 1.4.49 python SQLAlchemy-Utils 0.39.0 python Simple Launcher Executable 1.1.0.14 dotnet -Sphinx 7.2.5 python +Sphinx 7.2.6 python URLObject 2.4.3 python Unidecode 1.3.6 python WTForms 3.0.1 python @@ -87,8 +87,8 @@ golang.org/x/text v0.3.6 go- goodreads 0.3.2 python google-api-core 2.11.1 python google-api-python-client 2.89.0 python -google-auth 2.22.0 python -google-auth-httplib2 0.1.0 python +google-auth 2.23.0 python +google-auth-httplib2 0.1.1 python google-auth-oauthlib 0.8.0 python googleapis-common-protos 1.60.0 python gpg 2.2.27-3ubuntu2.1 deb @@ -105,9 +105,9 @@ h11 0.14.0 pyt hicolor-icon-theme 0.17-2 deb hostname 3.23ubuntu2 deb html2text 2020.1.16 python -httpcore 0.17.3 python +httpcore 0.18.0 python httplib2 0.22.0 python -httpx 0.24.1 python +httpx 0.25.0 python idna 3.4 python imagemagick 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb imagemagick-6-common 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb @@ -136,12 +136,12 @@ 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.1 deb -libc6 2.35-0ubuntu3.1 deb +libc6 2.35-0ubuntu3.3 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 libcrypt1 1:4.4.27-1 deb -libcups2 2.4.1op1-1ubuntu4.4 deb +libcups2 2.4.1op1-1ubuntu4.6 deb libcurl4 7.81.0-1ubuntu1.13 deb libdav1d5 0.9.2-1 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb @@ -245,9 +245,9 @@ libtirpc3 1.3.2-2ubuntu0.1 deb libudev1 249.11-0ubuntu3.9 deb libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3 deb -libwebp7 1.2.2-2ubuntu0.22.04.1 deb -libwebpdemux2 1.2.2-2ubuntu0.22.04.1 deb -libwebpmux3 1.2.2-2ubuntu0.22.04.1 deb +libwebp7 1.2.2-2ubuntu0.22.04.2 deb +libwebpdemux2 1.2.2-2ubuntu0.22.04.2 deb +libwebpmux3 1.2.2-2ubuntu0.22.04.2 deb libx11-6 2:1.7.5-1ubuntu0.2 deb libx11-data 2:1.7.5-1ubuntu0.2 deb libx11-dev 2:1.7.5-1ubuntu0.2 deb @@ -271,7 +271,7 @@ libxtst6 2:1.2.3-1build4 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb limits 3.6.0 python -locales 2.35-0ubuntu3.1 deb +locales 2.35-0ubuntu3.3 deb login 1:4.8.1-2ubuntu2.1 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb @@ -315,7 +315,7 @@ pyasn1-modules 0.3.0 pyt pybcj 1.0.1 python pycountry 22.3.5 python pycparser 2.21 python -pycryptodomex 3.18.0 python +pycryptodomex 3.19.0 python pyparsing 3.1.1 python pypdf 3.7.1 python pyppmd 1.0.0 python @@ -349,7 +349,7 @@ sed 4.8-1ubuntu2 deb selenium 4.12.0 python sensible-utils 0.0.17 deb setuptools 59.6.0 python -setuptools 68.2.0 python +setuptools 68.2.2 python six 1.16.0 python sniffio 1.3.0 python snowballstemmer 2.2.0 python From c2713497e60f38a6f121b89c59c3d55e0da8205c Mon Sep 17 00:00:00 2001 From: quietsy <github@qtsy.cc> Date: Sun, 24 Sep 2023 00:14:24 +0300 Subject: [PATCH 224/248] Add categories to readme-vars.yml --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index d8bbe4a7e..7d07e5702 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -5,6 +5,7 @@ project_name: calibre-web project_url: "https://github.com/janeczku/calibre-web" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/calibre-web-icon.png" project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" +project_categories: "Books" project_blurb: | [{{ project_name|capitalize }}]({{ project_url }}) is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself. From 1d8be71a7d594230d573b19bbfd936f7d143e6ec Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 24 Sep 2023 01:29:38 +0000 Subject: [PATCH 225/248] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 14ca77c06..55aeb3b9d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -40,7 +40,7 @@ base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1 deb bash 5.1.16 binary beautifulsoup4 4.11.2 python -bibtexparser 1.4.0 python +bibtexparser 1.4.1 python blinker 1.6.2 python bsdutils 1:2.37.2-4ubuntu3 deb ca-certificates 20230311ubuntu0.22.04.1 deb @@ -52,7 +52,7 @@ charset-normalizer 3.2.0 pyt click 8.1.7 python comicapi 3.2.0 python coreutils 8.32-4.1ubuntu1 deb -cryptography 41.0.3 python +cryptography 41.0.4 python curl 7.81.0-1ubuntu1.13 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb @@ -114,7 +114,7 @@ imagemagick-6-common 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb imagemagick-6.q16 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 deb imagesize 1.4.1 python importlib-metadata 6.8.0 python -importlib-resources 6.0.1 python +importlib-resources 6.1.0 python inflate64 0.3.1 python init-system-helpers 1.62 deb iso-639 0.4.5 python @@ -141,7 +141,7 @@ 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 libcrypt1 1:4.4.27-1 deb -libcups2 2.4.1op1-1ubuntu4.6 deb +libcups2 2.4.1op1-1ubuntu4.7 deb libcurl4 7.81.0-1ubuntu1.13 deb libdav1d5 0.9.2-1 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb @@ -337,12 +337,12 @@ python3.10-minimal 3.10.12-1~22.04.2 deb pytz 2022.7.1 python pyzstd 0.15.9 python rapidfuzz 2.15.1 python -rarfile 4.0 python +rarfile 4.1 python rauth 0.7.3 python readline-common 8.1.2-1 deb requests 2.28.2 python requests-oauthlib 1.3.1 python -rich 13.5.2 python +rich 13.5.3 python rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb @@ -370,7 +370,7 @@ texttable 1.6.7 pyt tornado 6.2 python trio 0.22.2 python trio-websocket 0.10.4 python -typing_extensions 4.7.1 python +typing_extensions 4.8.0 python tzdata 2023c-0ubuntu0.22.04.2 deb tzlocal 5.0.1 python ubuntu-keyring 2021.03.26 deb @@ -390,7 +390,7 @@ x11proto-dev 2021.5-1 deb xmltodict 0.13.0 python xorg-sgml-doctools 1:1.11-1.1 deb xtrans-dev 1.4.0-1 deb -zipp 3.16.2 python +zipp 3.17.0 python zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb zope.event 5.0 python zope.interface 6.0 python From 8145bd6c9b065767c06198f083f85e764ff45b99 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 1 Oct 2023 01:42:49 +0000 Subject: [PATCH 226/248] Bot Updating Package Versions --- package_versions.txt | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 55aeb3b9d..0c8584607 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ Flask-Limiter 3.3.1 pyt Flask-Login 0.6.2 python Flask-Principal 0.4.0 python Flask-SimpleLDAP 1.4.0 python -Flask-WTF 1.1.1 python +Flask-WTF 1.1.2 python Jinja2 3.1.2 python Levenshtein 0.20.9 python MarkupSafe 2.1.3 python @@ -23,17 +23,17 @@ SQLAlchemy-Utils 0.39.0 pyt Simple Launcher Executable 1.1.0.14 dotnet Sphinx 7.2.6 python URLObject 2.4.3 python -Unidecode 1.3.6 python +Unidecode 1.3.7 python WTForms 3.0.1 python Wand 0.6.11 python -Werkzeug 2.3.7 python +Werkzeug 3.0.0 python adduser 3.118ubuntu5 deb advocate 1.0.0 python alabaster 0.7.13 python anyio 4.0.0 python apt 2.4.10 deb apt-utils 2.4.10 deb -arrow 1.2.3 python +arrow 1.3.0 python attrs 23.1.0 python base-files 12ubuntu4.3 deb base-passwd 3.5.52build1 deb @@ -46,9 +46,9 @@ bsdutils 1:2.37.2-4ubuntu3 deb ca-certificates 20230311ubuntu0.22.04.1 deb cachetools 5.3.1 python certifi 2023.7.22 python -cffi 1.15.1 python +cffi 1.16.0 python chardet 4.0.0 python -charset-normalizer 3.2.0 python +charset-normalizer 3.3.0 python click 8.1.7 python comicapi 3.2.0 python coreutils 8.32-4.1ubuntu1 deb @@ -85,9 +85,9 @@ gnupg-utils 2.2.27-3ubuntu2.1 deb golang.org/x/sync v0.0.0-20210220032951-036812b2e83c go-module golang.org/x/text v0.3.6 go-module goodreads 0.3.2 python -google-api-core 2.11.1 python +google-api-core 2.12.0 python google-api-python-client 2.89.0 python -google-auth 2.23.0 python +google-auth 2.23.2 python google-auth-httplib2 0.1.1 python google-auth-oauthlib 0.8.0 python googleapis-common-protos 1.60.0 python @@ -342,11 +342,11 @@ rauth 0.7.3 pyt readline-common 8.1.2-1 deb requests 2.28.2 python requests-oauthlib 1.3.1 python -rich 13.5.3 python +rich 13.6.0 python rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb -selenium 4.12.0 python +selenium 4.13.0 python sensible-utils 0.0.17 deb setuptools 59.6.0 python setuptools 68.2.2 python @@ -369,7 +369,8 @@ text2digits 0.1.0 pyt texttable 1.6.7 python tornado 6.2 python trio 0.22.2 python -trio-websocket 0.10.4 python +trio-websocket 0.11.1 python +types-python-dateutil 2.8.19.14 python typing_extensions 4.8.0 python tzdata 2023c-0ubuntu0.22.04.2 deb tzlocal 5.0.1 python From 23be764a2f1e64261e3ce6f4c123fe41fac10e4b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 2 Oct 2023 18:28:26 +0000 Subject: [PATCH 227/248] 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 0c8584607..adc1b57c5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -296,7 +296,7 @@ oauthlib 3.2.2 pyt openssl 3.0.2-0ubuntu1.10 deb ordered-set 4.1.0 python outcome 1.2.0 python -packaging 23.1 python +packaging 23.2 python passwd 1:4.8.1-2ubuntu2.1 deb perl 5.34.0-3ubuntu1.2 deb perl-base 5.34.0-3ubuntu1.2 deb @@ -378,7 +378,7 @@ ubuntu-keyring 2021.03.26 deb ucf 3.0043 deb unrar 1:6.1.5-1 deb uritemplate 4.1.1 python -urllib3 1.26.16 python +urllib3 1.26.17 python usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3 deb wheel 0.37.1 python From 22c674aa48dc69d1f1132f9df529c2c5a0d81ce3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 3 Oct 2023 01:24:24 +0000 Subject: [PATCH 228/248] 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 adc1b57c5..84858d7b4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -64,7 +64,7 @@ dpkg 1.21.1ubuntu2.2 deb dpkg-dev 1.21.1ubuntu2.2 deb e2fsprogs 1.46.5-2ubuntu1.1 deb exceptiongroup 1.1.3 python -fake-useragent 1.2.1 python +fake-useragent 1.3.0 python faust-cchardet 2.1.19 python findutils 4.8.0-1ubuntu3 deb flask-babel 3.0.1 python From 9134d6bbf50bb04c00f8105c4eafbd5c8a6fc404 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 3 Oct 2023 08:30:16 +0000 Subject: [PATCH 229/248] 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 84858d7b4..a60278a18 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ NAME VERSION TYPE APScheduler 3.10.4 python -Babel 2.12.1 python +Babel 2.13.0 python Brotli 1.1.0 python Deprecated 1.2.14 python Flask 2.3.3 python From 9eeab79657605430824ec1c499b39af35e36c588 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 3 Oct 2023 15:25:31 +0000 Subject: [PATCH 230/248] 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 a60278a18..caa8ed16c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -366,7 +366,7 @@ sphinxcontrib-serializinghtml 1.1.9 pyt sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb text2digits 0.1.0 python -texttable 1.6.7 python +texttable 1.7.0 python tornado 6.2 python trio 0.22.2 python trio-websocket 0.11.1 python From e2238a7c46cc13a451ceeec28fb570d24ef2f7b2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 3 Oct 2023 22:21:55 +0000 Subject: [PATCH 231/248] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index caa8ed16c..67e1afbf6 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -136,7 +136,7 @@ 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.1 deb -libc6 2.35-0ubuntu3.3 deb +libc6 2.35-0ubuntu3.4 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 @@ -248,9 +248,9 @@ libuuid1 2.37.2-4ubuntu3 deb libwebp7 1.2.2-2ubuntu0.22.04.2 deb libwebpdemux2 1.2.2-2ubuntu0.22.04.2 deb libwebpmux3 1.2.2-2ubuntu0.22.04.2 deb -libx11-6 2:1.7.5-1ubuntu0.2 deb -libx11-data 2:1.7.5-1ubuntu0.2 deb -libx11-dev 2:1.7.5-1ubuntu0.2 deb +libx11-6 2:1.7.5-1ubuntu0.3 deb +libx11-data 2:1.7.5-1ubuntu0.3 deb +libx11-dev 2:1.7.5-1ubuntu0.3 deb libx265-199 3.5-2 deb libxau-dev 1:1.0.9-1build5 deb libxau6 1:1.0.9-1build5 deb From cc498b49ba77840a365eeeb13154da81bece4974 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 4 Oct 2023 05:22:20 +0000 Subject: [PATCH 232/248] 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 67e1afbf6..0c8c30339 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -271,7 +271,7 @@ libxtst6 2:1.2.3-1build4 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb limits 3.6.0 python -locales 2.35-0ubuntu3.3 deb +locales 2.35-0ubuntu3.4 deb login 1:4.8.1-2ubuntu2.1 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb From 0ced617011ed6901cdb4b536aa0fc0c128954c70 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 4 Oct 2023 19:20:17 +0000 Subject: [PATCH 233/248] 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 0c8c30339..d0eb8a9e9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -26,7 +26,7 @@ URLObject 2.4.3 pyt Unidecode 1.3.7 python WTForms 3.0.1 python Wand 0.6.11 python -Werkzeug 3.0.0 python +Werkzeug 2.3.7 python adduser 3.118ubuntu5 deb advocate 1.0.0 python alabaster 0.7.13 python @@ -305,7 +305,7 @@ pip 22.0.2 pyt pip 23.2.1 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb -protobuf 4.24.3 python +protobuf 4.24.4 python psutil 5.9.5 python publicsuffix 20211207.1025-1 deb py7zr 0.20.6 python @@ -373,7 +373,7 @@ trio-websocket 0.11.1 pyt types-python-dateutil 2.8.19.14 python typing_extensions 4.8.0 python tzdata 2023c-0ubuntu0.22.04.2 deb -tzlocal 5.0.1 python +tzlocal 5.1 python ubuntu-keyring 2021.03.26 deb ucf 3.0043 deb unrar 1:6.1.5-1 deb From 1bf24879fde2c7bc34d809a84b56a4e2e0eae7df Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 6 Oct 2023 18:30:17 +0000 Subject: [PATCH 234/248] Bot Updating Templated Files --- Jenkinsfile | 77 ++++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cdf2628c8..92c4f57c7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,6 @@ pipeline { GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') - SCARF_TOKEN=credentials('scarf_api_key') EXT_GIT_BRANCH = 'master' EXT_USER = 'janeczku' EXT_REPO = 'calibre-web' @@ -339,12 +338,12 @@ pipeline { else echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} fi - mkdir -p ${TEMPDIR}/gitbook - git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/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}/gitbook/docker-documentation/images/ - cd ${TEMPDIR}/gitbook/docker-documentation/ - git add images/docker-${CONTAINER_NAME}.md + 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 @@ -435,35 +434,6 @@ pipeline { "visibility":"public"}' ''' } } - /* ####################### - Scarf.sh package registry - ####################### */ - // Add package to Scarf.sh and set permissions - stage("Scarf.sh package registry"){ - when { - branch "nightly" - environment name: 'EXIT_STATUS', value: '' - } - steps{ - sh '''#! /bin/bash - PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/calibre-web") | .uuid' || :) - if [ -z "${PACKAGE_UUID}" ]; then - echo "Adding package to Scarf.sh" - curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \ - -H "Authorization: Bearer ${SCARF_TOKEN}" \ - -H "Content-Type: application/json" \ - -d '{"name":"linuxserver/calibre-web",\ - "shortDescription":"example description",\ - "libraryType":"docker",\ - "website":"https://github.com/linuxserver/docker-calibre-web",\ - "backendUrl":"https://ghcr.io/linuxserver/calibre-web",\ - "publicUrl":"https://lscr.io/linuxserver/calibre-web"}' || : - else - echo "Package already exists on Scarf.sh" - fi - ''' - } - } /* ############### Build Container ############### */ @@ -859,6 +829,41 @@ pipeline { curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' } } + // Add protection to the release branch + stage('Github-Release-Branch-Protection') { + when { + branch "nightly" + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + echo "Setting up protection for release branch nightly" + sh '''#! /bin/bash + curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/nightly/protection \ + -d $(jq -c . << EOF + { + "required_status_checks": null, + "enforce_admins": true, + "required_pull_request_reviews": { + "dismiss_stale_reviews": false, + "require_code_owner_reviews": false, + "require_last_push_approval": false, + "required_approving_review_count": 1 + }, + "restrictions": null, + "required_linear_history": false, + "allow_force_pushes": false, + "allow_deletions": false, + "block_creations": false, + "required_conversation_resolution": true, + "lock_branch": false, + "allow_fork_syncing": false, + "required_signatures": false + } +EOF + ) ''' + } + } // Use helper container to sync the current README on master to the dockerhub endpoint stage('Sync-README') { when { From aea829586f2822c4e00afa413ef2f3a11a74ebf4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 6 Oct 2023 18:36:40 +0000 Subject: [PATCH 235/248] Bot Updating Templated Files --- README.md | 136 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 101 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 2094cf8d0..f99208abb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ -<!-- DO NOT EDIT THIS FILE MANUALLY --> -<!-- Please read the https://github.com/linuxserver/docker-calibre-web/blob/nightly/.github/CONTRIBUTING.md --> - +<!-- DO NOT EDIT THIS FILE MANUALLY --> +<!-- Please read https://github.com/linuxserver/docker-calibre-web/blob/nightly/.github/CONTRIBUTING.md --> [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") @@ -68,6 +67,7 @@ This image provides various versions that are available via tags. Please read th | :----: | :----: |--- | | latest | ✅ | Releases of Calibre-Web | | nightly | ✅ | Commits to the master branch of Calibre-Web | + ## Application Setup Webui can be found at `http://your-ip:8083` @@ -92,7 +92,7 @@ This image contains the [kepubify](https://pgaskin.net/kepubify/) ebook conversi ## Usage -Here are some example snippets to help you get started creating a container. +To help you get started creating a container from this image you can either use docker-compose or the docker cli. ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose)) @@ -130,12 +130,11 @@ docker run -d \ -v /path/to/calibre/library:/books \ --restart unless-stopped \ lscr.io/linuxserver/calibre-web:nightly - ``` ## Parameters -Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. +Containers are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. | Parameter | Function | | :----: | --- | @@ -154,10 +153,10 @@ You can set any environment variable from a file by using a special prepend `FIL As an example: ```bash --e FILE__PASSWORD=/run/secrets/mysecretpassword +-e FILE__MYVAR=/run/secrets/mysecretvariable ``` -Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file. +Will set the environment variable `MYVAR` based on the contents of the `/run/secrets/mysecretvariable` file. ## Umask for running applications @@ -166,15 +165,20 @@ Keep in mind umask is not chmod it subtracts from permissions based on it's valu ## User / Group Identifiers -When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`. +When using volumes (`-v` flags), permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`. Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic. -In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below: +In this instance `PUID=1000` and `PGID=1000`, to find yours use `id your_user` as below: ```bash - $ id username - uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup) +id your_user +``` + +Example output: + +```text +uid=1000(your_user) gid=1000(your_user) groups=1000(your_user) ``` ## Docker Mods @@ -185,12 +189,29 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to ## Support Info -* Shell access whilst the container is running: `docker exec -it calibre-web /bin/bash` -* To monitor the logs of the container in realtime: `docker logs -f calibre-web` -* container version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' calibre-web` -* image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/calibre-web:nightly` +* Shell access whilst the container is running: + + ```bash + docker exec -it calibre-web /bin/bash + ``` + +* To monitor the logs of the container in realtime: + + ```bash + docker logs -f calibre-web + ``` + +* Container version number: + + ```bash + docker inspect -f '{{ index .Config.Labels "build_version" }}' calibre-web + ``` + +* Image version number: + + ```bash + docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/calibre-web:nightly + ``` ## Updating Info @@ -200,38 +221,83 @@ Below are the instructions for updating containers: ### Via Docker Compose -* Update all images: `docker-compose pull` - * or update a single image: `docker-compose pull calibre-web` -* Let compose update all containers as necessary: `docker-compose up -d` - * or update a single container: `docker-compose up -d calibre-web` -* You can also remove the old dangling images: `docker image prune` +* Update images: + * All images: + + ```bash + docker-compose pull + ``` + + * Single image: + + ```bash + docker-compose pull calibre-web + ``` + +* Update containers: + * All containers: + + ```bash + docker-compose up -d + ``` + + * Single container: + + ```bash + docker-compose up -d calibre-web + ``` + +* You can also remove the old dangling images: + + ```bash + docker image prune + ``` ### Via Docker Run -* Update the image: `docker pull lscr.io/linuxserver/calibre-web:nightly` -* Stop the running container: `docker stop calibre-web` -* Delete the container: `docker rm calibre-web` +* Update the image: + + ```bash + docker pull lscr.io/linuxserver/calibre-web:nightly + ``` + +* Stop the running container: + + ```bash + docker stop calibre-web + ``` + +* Delete the container: + + ```bash + docker rm calibre-web + ``` + * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) -* You can also remove the old dangling images: `docker image prune` +* You can also remove the old dangling images: + + ```bash + 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 calibre-web - ``` + ```bash + docker run --rm \ + -v /var/run/docker.sock:/var/run/docker.sock \ + containrrr/watchtower \ + --run-once calibre-web + ``` * You can also remove the old dangling images: `docker image prune` -**Note:** 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). +**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) -* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. +**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. ## Building locally From d9c268063f1f90fe0f4c316cf7ea3aafdc5a7645 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 6 Oct 2023 18:43:09 +0000 Subject: [PATCH 236/248] 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 d0eb8a9e9..88e30ccef 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -394,4 +394,4 @@ xtrans-dev 1.4.0-1 deb zipp 3.17.0 python zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb zope.event 5.0 python -zope.interface 6.0 python +zope.interface 6.1 python From 4f4719ae2b7deb758cf3ad4334fab428416f7805 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Sat, 7 Oct 2023 20:37:27 -0400 Subject: [PATCH 237/248] install unrar from lsio repo --- Dockerfile | 8 ++++++-- Dockerfile.aarch64 | 8 ++++++-- Jenkinsfile | 4 ++-- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index ed6628c8c..f1744c990 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ # syntax=docker/dockerfile:1 +FROM ghcr.io/linuxserver/unrar:latest as unrar + FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy @@ -33,8 +35,7 @@ RUN \ libxtst6 \ python3-minimal \ python3-pip \ - python3-pkg-resources \ - unrar && \ + python3-pkg-resources && \ echo "**** install calibre-web ****" && \ if [ -z ${CALIBREWEB_COMMIT+x} ]; then \ CALIBREWEB_COMMIT=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/commits/master" \ @@ -79,6 +80,9 @@ RUN \ # add local files COPY root/ / +# add unrar +COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar + # ports and volumes EXPOSE 8083 VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index da3f284d3..b6284b964 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,5 +1,7 @@ # syntax=docker/dockerfile:1 +FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar + FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy # set version label @@ -38,8 +40,7 @@ RUN \ libxtst6 \ python3-minimal \ python3-pip \ - python3-pkg-resources \ - unrar && \ + python3-pkg-resources && \ echo "**** install calibre-web ****" && \ if [ -z ${CALIBREWEB_COMMIT+x} ]; then \ CALIBREWEB_COMMIT=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/commits/master" \ @@ -90,6 +91,9 @@ RUN \ # add local files COPY root/ / +# add unrar +COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar + # ports and volumes EXPOSE 8083 VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile index 92c4f57c7..80f1fa494 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -839,11 +839,11 @@ pipeline { steps { echo "Setting up protection for release branch nightly" sh '''#! /bin/bash - curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/nightly/protection \ + curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/nightly/protection \ -d $(jq -c . << EOF { "required_status_checks": null, - "enforce_admins": true, + "enforce_admins": false, "required_pull_request_reviews": { "dismiss_stale_reviews": false, "require_code_owner_reviews": false, diff --git a/README.md b/README.md index f99208abb..7c2104b99 100644 --- a/README.md +++ b/README.md @@ -322,6 +322,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **07.10.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). * **13.04.23:** - Deprecate armhf. * **29.01.23:** - Add cmake as build dep for Levenshtein. * **27.12.22:** - Add ghostscript, libxtst6, libxkbfile-dev. diff --git a/readme-vars.yml b/readme-vars.yml index 7d07e5702..a051368c6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -71,6 +71,7 @@ app_setup_block: | # changelog changelogs: + - { date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} - { date: "13.04.23:", desc: "Deprecate armhf."} - { date: "29.01.23:", desc: "Add cmake as build dep for Levenshtein."} - { date: "27.12.22:", desc: "Add ghostscript, libxtst6, libxkbfile-dev."} From 3526ba0105974506e7edaf18a1a3abae87403d31 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 8 Oct 2023 01:32:26 +0000 Subject: [PATCH 238/248] Bot Updating Templated Files --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 92c4f57c7..80f1fa494 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -839,11 +839,11 @@ pipeline { steps { echo "Setting up protection for release branch nightly" sh '''#! /bin/bash - curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/nightly/protection \ + curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/nightly/protection \ -d $(jq -c . << EOF { "required_status_checks": null, - "enforce_admins": true, + "enforce_admins": false, "required_pull_request_reviews": { "dismiss_stale_reviews": false, "require_code_owner_reviews": false, From acf84f50259a3d181bc852a161da06313f8914c7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 8 Oct 2023 01:36:52 +0000 Subject: [PATCH 239/248] 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 88e30ccef..614c693b4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -41,7 +41,7 @@ bash 5.1-6ubuntu1 deb bash 5.1.16 binary beautifulsoup4 4.11.2 python bibtexparser 1.4.1 python -blinker 1.6.2 python +blinker 1.6.3 python bsdutils 1:2.37.2-4ubuntu3 deb ca-certificates 20230311ubuntu0.22.04.1 deb cachetools 5.3.1 python @@ -336,7 +336,7 @@ python3.10 3.10.12-1~22.04.2 deb python3.10-minimal 3.10.12-1~22.04.2 deb pytz 2022.7.1 python pyzstd 0.15.9 python -rapidfuzz 2.15.1 python +rapidfuzz 2.15.2 python rarfile 4.1 python rauth 0.7.3 python readline-common 8.1.2-1 deb From 0624152210197f324f0943bff92ca97c97872ae3 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Sat, 7 Oct 2023 21:57:48 -0400 Subject: [PATCH 240/248] use venv --- Dockerfile | 9 ++++----- Dockerfile.aarch64 | 9 ++++----- readme-vars.yml | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index f1744c990..dc5c32867 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,9 +33,7 @@ RUN \ libxkbfile-dev \ libxslt1.1 \ libxtst6 \ - python3-minimal \ - python3-pip \ - python3-pkg-resources && \ + python3-venv && \ echo "**** install calibre-web ****" && \ if [ -z ${CALIBREWEB_COMMIT+x} ]; then \ CALIBREWEB_COMMIT=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/commits/master" \ @@ -50,10 +48,11 @@ RUN \ /tmp/calibre-web.tar.gz -C \ /app/calibre-web --strip-components=1 && \ cd /app/calibre-web && \ - pip3 install --no-cache-dir -U \ + python3 -m venv /lsiopy && \ + pip install -U --no-cache-dir \ pip \ wheel && \ - pip3 install --no-cache-dir -U --ignore-installed --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ + pip install -U --no-cache-dir -U --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ requirements.txt -r \ optional-requirements.txt && \ echo "***install kepubify" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index b6284b964..96eae4727 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -38,9 +38,7 @@ RUN \ libxkbfile-dev \ libxslt1.1 \ libxtst6 \ - python3-minimal \ - python3-pip \ - python3-pkg-resources && \ + python3-venv && \ echo "**** install calibre-web ****" && \ if [ -z ${CALIBREWEB_COMMIT+x} ]; then \ CALIBREWEB_COMMIT=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/commits/master" \ @@ -55,10 +53,11 @@ RUN \ /tmp/calibre-web.tar.gz -C \ /app/calibre-web --strip-components=1 && \ cd /app/calibre-web && \ - pip3 install --no-cache-dir -U \ + python3 -m venv /lsiopy && \ + pip install -U --no-cache-dir \ pip \ wheel && \ - pip3 install --no-cache-dir -U --ignore-installed --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ requirements.txt -r \ optional-requirements.txt && \ echo "***install kepubify" && \ diff --git a/readme-vars.yml b/readme-vars.yml index a051368c6..6bc2cc6b1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -71,7 +71,7 @@ app_setup_block: | # changelog changelogs: - - { date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} + - { date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). Switch to Python virtual environment."} - { date: "13.04.23:", desc: "Deprecate armhf."} - { date: "29.01.23:", desc: "Add cmake as build dep for Levenshtein."} - { date: "27.12.22:", desc: "Add ghostscript, libxtst6, libxkbfile-dev."} From c29d40c389a22d0661420539e19bd3a0385576d4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 8 Oct 2023 13:15:00 +0000 Subject: [PATCH 241/248] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7c2104b99..08c7ab996 100644 --- a/README.md +++ b/README.md @@ -322,7 +322,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **07.10.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). +* **07.10.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). Switch to Python virtual environment. * **13.04.23:** - Deprecate armhf. * **29.01.23:** - Add cmake as build dep for Levenshtein. * **27.12.22:** - Add ghostscript, libxtst6, libxkbfile-dev. From a0b1e1c5eb623d11bfca33272a14347247f79a82 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 8 Oct 2023 13:20:33 +0000 Subject: [PATCH 242/248] Bot Updating Package Versions --- package_versions.txt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 614c693b4..7a374df17 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -301,7 +301,6 @@ passwd 1:4.8.1-2ubuntu2.1 deb perl 5.34.0-3ubuntu1.2 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb -pip 22.0.2 python pip 23.2.1 python poppler-data 0.4.11-1 deb procps 2:3.3.17-6ubuntu2 deb @@ -328,12 +327,12 @@ python3 3.10.6-1~22.04 deb python3-distutils 3.10.8-1~22.04 deb python3-lib2to3 3.10.8-1~22.04 deb python3-minimal 3.10.6-1~22.04 deb -python3-pip 22.0.2+dfsg-1ubuntu0.3 deb -python3-pkg-resources 59.6.0-1.2ubuntu0.22.04.1 deb -python3-setuptools 59.6.0-1.2ubuntu0.22.04.1 deb -python3-wheel 0.37.1-2ubuntu0.22.04.1 deb +python3-pip-whl 22.0.2+dfsg-1ubuntu0.3 deb +python3-setuptools-whl 59.6.0-1.2ubuntu0.22.04.1 deb +python3-venv 3.10.6-1~22.04 deb python3.10 3.10.12-1~22.04.2 deb python3.10-minimal 3.10.12-1~22.04.2 deb +python3.10-venv 3.10.12-1~22.04.2 deb pytz 2022.7.1 python pyzstd 0.15.9 python rapidfuzz 2.15.2 python @@ -349,7 +348,6 @@ sed 4.8-1ubuntu2 deb selenium 4.13.0 python sensible-utils 0.0.17 deb setuptools 59.6.0 python -setuptools 68.2.2 python six 1.16.0 python sniffio 1.3.0 python snowballstemmer 2.2.0 python @@ -376,12 +374,10 @@ tzdata 2023c-0ubuntu0.22.04.2 deb tzlocal 5.1 python ubuntu-keyring 2021.03.26 deb ucf 3.0043 deb -unrar 1:6.1.5-1 deb uritemplate 4.1.1 python urllib3 1.26.17 python usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3 deb -wheel 0.37.1 python wheel 0.41.2 python wordninja 2.0.0 python wrapt 1.15.0 python From 1e11acb05244a3bf76ba2baf64b2b1d8e835c7ac Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 14 Oct 2023 08:27:14 +0000 Subject: [PATCH 243/248] Bot Updating Package Versions --- package_versions.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7a374df17..b4bb51e8d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -24,7 +24,7 @@ Simple Launcher Executable 1.1.0.14 dot Sphinx 7.2.6 python URLObject 2.4.3 python Unidecode 1.3.7 python -WTForms 3.0.1 python +WTForms 3.1.0 python Wand 0.6.11 python Werkzeug 2.3.7 python adduser 3.118ubuntu5 deb @@ -87,10 +87,10 @@ golang.org/x/text v0.3.6 go- goodreads 0.3.2 python google-api-core 2.12.0 python google-api-python-client 2.89.0 python -google-auth 2.23.2 python +google-auth 2.23.3 python google-auth-httplib2 0.1.1 python google-auth-oauthlib 0.8.0 python -googleapis-common-protos 1.60.0 python +googleapis-common-protos 1.61.0 python gpg 2.2.27-3ubuntu2.1 deb gpg-agent 2.2.27-3ubuntu2.1 deb gpg-wks-client 2.2.27-3ubuntu2.1 deb @@ -238,7 +238,7 @@ libssl3 3.0.2-0ubuntu1.10 deb libstdc++6 12.3.0-1ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.9 deb libtasn1-6 4.18.0-4build1 deb -libtiff5 4.3.0-6ubuntu0.5 deb +libtiff5 4.3.0-6ubuntu0.6 deb libtinfo6 6.3-2ubuntu0.1 deb libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb @@ -345,7 +345,7 @@ rich 13.6.0 pyt rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb -selenium 4.13.0 python +selenium 4.14.0 python sensible-utils 0.0.17 deb setuptools 59.6.0 python six 1.16.0 python @@ -361,6 +361,7 @@ sphinxcontrib-jquery 4.1 pyt sphinxcontrib-jsmath 1.0.1 python sphinxcontrib-qthelp 1.0.6 python sphinxcontrib-serializinghtml 1.1.9 python +stdlib go1.17.8 go-module sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb text2digits 0.1.0 python From 6743b5b0e50d2612551c14302f5997b1a898de57 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 14 Oct 2023 15:20:40 +0000 Subject: [PATCH 244/248] Bot Updating Package Versions --- package_versions.txt | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b4bb51e8d..ed8d2ce90 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,22 +4,22 @@ Babel 2.13.0 pyt Brotli 1.1.0 python Deprecated 1.2.14 python Flask 2.3.3 python -Flask-Dance 6.2.0 python -Flask-Limiter 3.3.1 python +Flask-Dance 7.0.0 python +Flask-Limiter 3.4.1 python Flask-Login 0.6.2 python Flask-Principal 0.4.0 python Flask-SimpleLDAP 1.4.0 python Flask-WTF 1.1.2 python Jinja2 3.1.2 python -Levenshtein 0.20.9 python +Levenshtein 0.21.1 python MarkupSafe 2.1.3 python Pillow 10.0.1 python -PyDrive2 1.15.4 python +PyDrive2 1.17.0 python PySocks 1.7.1 python PyYAML 6.0.1 python Pygments 2.16.1 python SQLAlchemy 1.4.49 python -SQLAlchemy-Utils 0.39.0 python +SQLAlchemy-Utils 0.41.1 python Simple Launcher Executable 1.1.0.14 dotnet Sphinx 7.2.6 python URLObject 2.4.3 python @@ -39,7 +39,7 @@ base-files 12ubuntu4.3 deb base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1 deb bash 5.1.16 binary -beautifulsoup4 4.11.2 python +beautifulsoup4 4.12.2 python bibtexparser 1.4.1 python blinker 1.6.3 python bsdutils 1:2.37.2-4ubuntu3 deb @@ -67,12 +67,12 @@ exceptiongroup 1.1.3 pyt fake-useragent 1.3.0 python faust-cchardet 2.1.19 python findutils 4.8.0-1ubuntu3 deb -flask-babel 3.0.1 python +flask-babel 3.1.0 python fontconfig-config 2.13.1-4.2ubuntu5 deb fonts-urw-base35 20200910-1 deb free-proxy 1.1.1 python gcc-12-base 12.3.0-1ubuntu1~22.04 deb -gevent 22.10.2 python +gevent 23.9.1 python ghostscript 9.55.0~dfsg1-0ubuntu5.4 deb github.com/beevik/etree v1.1.0 go-module github.com/kr/smartypants v0.1.0 go-module @@ -86,10 +86,10 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c go- golang.org/x/text v0.3.6 go-module goodreads 0.3.2 python google-api-core 2.12.0 python -google-api-python-client 2.89.0 python +google-api-python-client 2.97.0 python google-auth 2.23.3 python google-auth-httplib2 0.1.1 python -google-auth-oauthlib 0.8.0 python +google-auth-oauthlib 1.0.0 python googleapis-common-protos 1.61.0 python gpg 2.2.27-3ubuntu2.1 deb gpg-agent 2.2.27-3ubuntu2.1 deb @@ -120,7 +120,8 @@ init-system-helpers 1.62 deb iso-639 0.4.5 python itsdangerous 2.1.2 python jq 1.6-2.1ubuntu3 deb -jsonschema 4.17.3 python +jsonschema 4.19.1 python +jsonschema-specifications 2023.7.1 python libacl1 2.3.1-1 deb libaom3 3.3.0-1 deb libapt-pkg6.0 2.4.10 deb @@ -316,10 +317,9 @@ pycountry 22.3.5 pyt pycparser 2.21 python pycryptodomex 3.19.0 python pyparsing 3.1.1 python -pypdf 3.7.1 python +pypdf 3.15.5 python pyppmd 1.0.0 python -pyrsistent 0.19.3 python -python-Levenshtein 0.20.9 python +python-Levenshtein 0.21.1 python python-dateutil 2.8.2 python python-dotenv 1.0.0 python python-ldap 3.4.3 python @@ -333,15 +333,17 @@ python3-venv 3.10.6-1~22.04 deb python3.10 3.10.12-1~22.04.2 deb python3.10-minimal 3.10.12-1~22.04.2 deb python3.10-venv 3.10.12-1~22.04.2 deb -pytz 2022.7.1 python +pytz 2023.3.post1 python pyzstd 0.15.9 python -rapidfuzz 2.15.2 python +rapidfuzz 3.4.0 python rarfile 4.1 python rauth 0.7.3 python readline-common 8.1.2-1 deb -requests 2.28.2 python +referencing 0.30.2 python +requests 2.31.0 python requests-oauthlib 1.3.1 python rich 13.6.0 python +rpds-py 0.10.6 python rsa 4.9 python scholarly 1.7.11 python sed 4.8-1ubuntu2 deb @@ -366,7 +368,7 @@ sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb text2digits 0.1.0 python texttable 1.7.0 python -tornado 6.2 python +tornado 6.3.3 python trio 0.22.2 python trio-websocket 0.11.1 python types-python-dateutil 2.8.19.14 python From 71198a21cf6db9abefedd940c434af65030b9379 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Tue, 17 Oct 2023 15:16:37 -0400 Subject: [PATCH 245/248] Update Dockerfile --- Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index dc5c32867..38d79731c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ARG BUILD_DATE ARG VERSION ARG CALIBREWEB_COMMIT LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="chbmb" +LABEL maintainer="notdriz" RUN \ echo "**** install build packages ****" && \ @@ -25,14 +25,9 @@ RUN \ imagemagick \ ghostscript \ libldap-2.5-0 \ - libnss3 \ libsasl2-2 \ - libxcomposite1 \ libxi6 \ - libxrandr2 \ - libxkbfile-dev \ libxslt1.1 \ - libxtst6 \ python3-venv && \ echo "**** install calibre-web ****" && \ if [ -z ${CALIBREWEB_COMMIT+x} ]; then \ From cd53d49d7c6009fb9a193de3630ba4fa4cd21f37 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Tue, 17 Oct 2023 15:19:52 -0400 Subject: [PATCH 246/248] Update Dockerfile.aarch64 --- Dockerfile.aarch64 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 96eae4727..b08e6e6ec 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -9,7 +9,7 @@ ARG BUILD_DATE ARG VERSION ARG CALIBREWEB_COMMIT LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="chbmb" +LABEL maintainer="notdriz" RUN \ echo "**** install build packages ****" && \ @@ -30,14 +30,9 @@ RUN \ imagemagick \ ghostscript \ libldap-2.5-0 \ - libnss3 \ libsasl2-2 \ - libxcomposite1 \ libxi6 \ - libxrandr2 \ - libxkbfile-dev \ libxslt1.1 \ - libxtst6 \ python3-venv && \ echo "**** install calibre-web ****" && \ if [ -z ${CALIBREWEB_COMMIT+x} ]; then \ From b6220f62f480fed1cde204091302a3d3cf90f3d6 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Tue, 17 Oct 2023 15:20:13 -0400 Subject: [PATCH 247/248] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 08c7ab996..d361e6c2c 100644 --- a/README.md +++ b/README.md @@ -322,6 +322,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **17.10.23:** - Remove some packages that are required by the calibre mod but not the base container. * **07.10.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). Switch to Python virtual environment. * **13.04.23:** - Deprecate armhf. * **29.01.23:** - Add cmake as build dep for Levenshtein. From 79b67d7e437954fd75b7a60bfe23976c7897cf4d Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Tue, 17 Oct 2023 15:20:34 -0400 Subject: [PATCH 248/248] Update readme-vars.yml --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index 6bc2cc6b1..9df85c310 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -71,6 +71,7 @@ app_setup_block: | # changelog changelogs: + - { date: "17.10.23:", desc: "Remove some packages that are required by the calibre mod but not the base container."} - { date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). Switch to Python virtual environment."} - { date: "13.04.23:", desc: "Deprecate armhf."} - { date: "29.01.23:", desc: "Add cmake as build dep for Levenshtein."}