From 94e12b10c539c2487e9933d6655df31ddc264aee Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 31 May 2024 17:04:07 +0100 Subject: [PATCH 1/5] Rebase to 3.20 --- Dockerfile | 10 ++++++---- Dockerfile.aarch64 | 10 ++++++---- Jenkinsfile | 4 ++-- README.md | 1 + jenkins-vars.yml | 5 ++--- readme-vars.yml | 7 +------ 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 57561b3..e85889e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 ARG BUILD_DATE ARG VERSION @@ -46,14 +46,16 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ -r /app/changedetection/requirements.txt && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r /app/changedetection/requirements.txt && \ PLAYWRIGHT_PY_RELEASE=$(curl -sX GET "https://api.github.com/repos/microsoft/playwright-python/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ git clone --depth 1 --branch "${PLAYWRIGHT_PY_RELEASE}" https://github.com/microsoft/playwright-python /tmp/playwright-python && \ cd /tmp/playwright-python && \ pip install -U --no-cache-dir . && \ - rm -f /lsiopy/lib/python3.11/site-packages/playwright/driver/node && \ - ln -s /usr/bin/node /lsiopy/lib/python3.11/site-packages/playwright/driver/node && \ + rm -f /lsiopy/lib/python3.12/site-packages/playwright/driver/node && \ + ln -s /usr/bin/node /lsiopy/lib/python3.12/site-packages/playwright/driver/node && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ + echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 87964c6..c4abfdb 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 ARG BUILD_DATE ARG VERSION @@ -46,15 +46,17 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ -r /app/changedetection/requirements.txt && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r /app/changedetection/requirements.txt && \ echo "**** install playwright ****" && \ PLAYWRIGHT_PY_RELEASE=$(curl -sX GET "https://api.github.com/repos/microsoft/playwright-python/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ git clone --depth 1 --branch "${PLAYWRIGHT_PY_RELEASE}" https://github.com/microsoft/playwright-python /tmp/playwright-python && \ cd /tmp/playwright-python && \ pip install -U --no-cache-dir . && \ - rm -f /lsiopy/lib/python3.11/site-packages/playwright/driver/node && \ - ln -s /usr/bin/node /lsiopy/lib/python3.11/site-packages/playwright/driver/node && \ + rm -f /lsiopy/lib/python3.12/site-packages/playwright/driver/node && \ + ln -s /usr/bin/node /lsiopy/lib/python3.12/site-packages/playwright/driver/node && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ + echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ rm -rf \ diff --git a/Jenkinsfile b/Jenkinsfile index cc4d19e..9035700 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,8 +34,8 @@ pipeline { CI_PORT='5000' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=Europe/London' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index 2cd912f..10c2f96 100644 --- a/README.md +++ b/README.md @@ -281,6 +281,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **31.05.24:** - Rebase to Alpine 3.20. * **09.03.24:** - Build Playwright from source because Microsoft's build and packaging process is awful. * **08.03.24:** - Build Playwright-python from source, add libjpeg. * **23.12.23:** - Rebase to Alpine 3.19. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 4f17476..f9bdd10 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,7 +6,6 @@ external_type: github_stable release_type: stable release_tag: latest ls_branch: main -build_armhf: false repo_vars: - EXT_GIT_BRANCH = 'master' - EXT_USER = 'dgtlmoon' @@ -25,6 +24,6 @@ repo_vars: - CI_PORT='5000' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=Europe/London' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' diff --git a/readme-vars.yml b/readme-vars.yml index 1230e83..168ccb8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -12,9 +12,6 @@ available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} -# development version -development_versions: false - # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" @@ -25,9 +22,6 @@ param_volumes: param_usage_include_ports: true param_ports: - { external_port: "5000", internal_port: "5000", port_desc: "WebUI" } -param_usage_include_env: true -param_env_vars: - - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"} # optional container parameters opt_param_usage_include_env: true @@ -64,6 +58,7 @@ app_setup_block: | # changelog changelogs: + - { date: "31.05.24:", desc: "Rebase to Alpine 3.20."} - { date: "09.03.24:", desc: "Build Playwright from source because Microsoft's build and packaging process is awful."} - { date: "08.03.24:", desc: "Build Playwright-python from source, add libjpeg."} - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."} From 9333fc9938ae2b20481ed0bdb91a130c9cdc5309 Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 31 May 2024 17:13:37 +0100 Subject: [PATCH 2/5] Add setuptools --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index e85889e..72ed814 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,6 +45,7 @@ RUN \ python3 -m venv /lsiopy && \ pip install -U --no-cache-dir \ pip \ + setuptools \ wheel && \ pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r /app/changedetection/requirements.txt && \ PLAYWRIGHT_PY_RELEASE=$(curl -sX GET "https://api.github.com/repos/microsoft/playwright-python/releases/latest" \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c4abfdb..1ae70e9 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -45,6 +45,7 @@ RUN \ python3 -m venv /lsiopy && \ pip install -U --no-cache-dir \ pip \ + setuptools \ wheel && \ pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r /app/changedetection/requirements.txt && \ echo "**** install playwright ****" && \ From cd9a04485680b23eb32efbcb772dbdeb1a33434b Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 31 May 2024 17:25:56 +0100 Subject: [PATCH 3/5] Remove setuptools --- Dockerfile | 1 - Dockerfile.aarch64 | 1 - 2 files changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 72ed814..e85889e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,6 @@ RUN \ python3 -m venv /lsiopy && \ pip install -U --no-cache-dir \ pip \ - setuptools \ wheel && \ pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r /app/changedetection/requirements.txt && \ PLAYWRIGHT_PY_RELEASE=$(curl -sX GET "https://api.github.com/repos/microsoft/playwright-python/releases/latest" \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1ae70e9..c4abfdb 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -45,7 +45,6 @@ RUN \ python3 -m venv /lsiopy && \ pip install -U --no-cache-dir \ pip \ - setuptools \ wheel && \ pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r /app/changedetection/requirements.txt && \ echo "**** install playwright ****" && \ From 34329c79f2e6b9a0c68ce8a1a6f0c33b118c948c Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 17 Jun 2024 09:39:55 +0100 Subject: [PATCH 4/5] Add distutils --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index e85889e..7f80d7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,6 +44,7 @@ RUN \ rm /tmp/changedetection.tar.gz && \ python3 -m venv /lsiopy && \ pip install -U --no-cache-dir \ + distutils \ pip \ wheel && \ pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r /app/changedetection/requirements.txt && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c4abfdb..d476bad 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -44,6 +44,7 @@ RUN \ rm /tmp/changedetection.tar.gz && \ python3 -m venv /lsiopy && \ pip install -U --no-cache-dir \ + distutils \ pip \ wheel && \ pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r /app/changedetection/requirements.txt && \ From 2e57779a058e6c240c550a4e9612d8b36409be31 Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 17 Jun 2024 09:49:59 +0100 Subject: [PATCH 5/5] Add the right package --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7f80d7b..72ed814 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,8 +44,8 @@ RUN \ rm /tmp/changedetection.tar.gz && \ python3 -m venv /lsiopy && \ pip install -U --no-cache-dir \ - distutils \ pip \ + setuptools \ wheel && \ pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r /app/changedetection/requirements.txt && \ PLAYWRIGHT_PY_RELEASE=$(curl -sX GET "https://api.github.com/repos/microsoft/playwright-python/releases/latest" \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d476bad..1ae70e9 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -44,8 +44,8 @@ RUN \ rm /tmp/changedetection.tar.gz && \ python3 -m venv /lsiopy && \ pip install -U --no-cache-dir \ - distutils \ pip \ + setuptools \ wheel && \ pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r /app/changedetection/requirements.txt && \ echo "**** install playwright ****" && \