From cc510c3f0ee5890321ab64c180d07f26a736c20b Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 23 Dec 2023 18:12:40 -0600 Subject: [PATCH 1/2] Rebase to Alpine 3.19 Signed-off-by: Eric Nemchik --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- readme-vars.yml | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1fb8143..af31089 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.18 +FROM ghcr.io/linuxserver/baseimage-alpine:3.19 # set version label ARG BUILD_DATE @@ -53,7 +53,7 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ -r /app/htpcmanager/requirements.txt && \ + pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ -r /app/htpcmanager/requirements.txt && \ echo ${HTPCMANAGER_COMMIT} > /app/htpcmanager/VERSION.txt && \ echo "**** cleanup ****" && \ apk del --purge \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index db04e5f..2c8b6f7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 # set version label ARG BUILD_DATE @@ -53,7 +53,7 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ -r /app/htpcmanager/requirements.txt && \ + pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ -r /app/htpcmanager/requirements.txt && \ echo ${HTPCMANAGER_COMMIT} > /app/htpcmanager/VERSION.txt && \ echo "**** cleanup ****" && \ apk del --purge \ diff --git a/readme-vars.yml b/readme-vars.yml index d9fe062..f83f24e 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -23,7 +23,7 @@ param_env_vars: - {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London."} param_usage_include_vols: true param_volumes: - - {vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Configuration files."} + - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } param_usage_include_ports: true param_ports: - {external_port: "8085", internal_port: "8085", port_desc: "Application WebUI"} @@ -32,6 +32,7 @@ app_setup_block_enabled: true app_setup_block: "The webui is found at port 8085. Smartmontools and psutil have not been included, you can safely ignore the warning error in the log." # changelog changelogs: + - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."} - {date: "25.08.23:", desc: "Rebase to Alpine 3.18."} - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "13.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3."} From 95d3c2b9973e9acc9e809666314272d401820242 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Mon, 8 Jan 2024 10:02:47 -0500 Subject: [PATCH 2/2] Update readme-vars.yml --- readme-vars.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index f83f24e..c34e314 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -23,7 +23,7 @@ param_env_vars: - {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London."} param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } + - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } param_usage_include_ports: true param_ports: - {external_port: "8085", internal_port: "8085", port_desc: "Application WebUI"} @@ -32,7 +32,7 @@ app_setup_block_enabled: true app_setup_block: "The webui is found at port 8085. Smartmontools and psutil have not been included, you can safely ignore the warning error in the log." # changelog changelogs: - - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."} + - {date: "08.01.24:", desc: "Rebase to Alpine 3.19."} - {date: "25.08.23:", desc: "Rebase to Alpine 3.18."} - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "13.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3."}