From 6f44dffc5e960d483ed4e72a76c16958dc5bfa9c Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 26 Aug 2024 18:58:39 +0100 Subject: [PATCH 1/3] Rebase to 3.20 --- Dockerfile | 12 ++++++------ Dockerfile.aarch64 | 10 +++++----- Jenkinsfile | 4 ++-- README.md | 5 +++-- jenkins-vars.yml | 4 ++-- readme-vars.yml | 16 ++-------------- 6 files changed, 20 insertions(+), 31 deletions(-) diff --git a/Dockerfile b/Dockerfile index be9b05f..95bf98e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.18 as build-stage +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 AS build-stage # build time arguements ARG CXXFLAGS="\ @@ -36,10 +36,10 @@ RUN \ | jq -r .tag_name); \ fi && \ curl -o \ - /tmp/quassel.tar.gz -L \ + /tmp/quassel.tar.gz -L \ "https://github.com/quassel/quassel/archive/${QUASSEL_RELEASE}.tar.gz" && \ tar xf \ - /tmp/quassel.tar.gz -C \ + /tmp/quassel.tar.gz -C \ /tmp/quassel-src --strip-components=1 # build package @@ -56,7 +56,7 @@ RUN \ make -j2 && \ make DESTDIR=/build/quassel install -FROM ghcr.io/linuxserver/baseimage-alpine:3.18 +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 # set version label ARG BUILD_DATE @@ -66,7 +66,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="chbmb" # set environment variables -ENV HOME /config +ENV HOME=/config # install runtime packages RUN \ @@ -77,7 +77,7 @@ RUN \ qt5-qtbase-postgresql \ qt5-qtbase-sqlite \ qt5-qtscript \ - libqca \ + libqca-qt5 \ openldap # copy artifacts build stage diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a54d024..1349536 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 as build-stage +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 as build-stage # build time arguements ARG CXXFLAGS="\ @@ -36,10 +36,10 @@ RUN \ | jq -r .tag_name); \ fi && \ curl -o \ - /tmp/quassel.tar.gz -L \ + /tmp/quassel.tar.gz -L \ "https://github.com/quassel/quassel/archive/${QUASSEL_RELEASE}.tar.gz" && \ tar xf \ - /tmp/quassel.tar.gz -C \ + /tmp/quassel.tar.gz -C \ /tmp/quassel-src --strip-components=1 # build package @@ -56,7 +56,7 @@ RUN \ make -j2 && \ make DESTDIR=/build/quassel install -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -77,7 +77,7 @@ RUN \ qt5-qtbase-postgresql \ qt5-qtbase-sqlite \ qt5-qtscript \ - libqca \ + libqca-qt5 \ openldap # copy artifacts build stage diff --git a/Jenkinsfile b/Jenkinsfile index 5b432c1..c9c8ac5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,8 +36,8 @@ pipeline { CI_PORT='4242' CI_SSL='false' CI_DELAY='30' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index a68ea5f..a325bbe 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ services: - TZ=Etc/UTC - RUN_OPTS=--config-from-environment #optional volumes: - - /path/to/data:/config + - /path/to/quassel-core/data:/config ports: - 4242:4242 - 113:10113 #optional @@ -154,7 +154,7 @@ docker run -d \ -e RUN_OPTS=--config-from-environment `#optional` \ -p 4242:4242 \ -p 113:10113 `#optional` \ - -v /path/to/data:/config \ + -v /path/to/quassel-core/data:/config \ --restart unless-stopped \ lscr.io/linuxserver/quassel-core:latest ``` @@ -334,6 +334,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **26.08.23:** - Rebase to Alpine 3.20. * **10.11.23:** - Rebase to Alpine 3.18. * **03.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **13.02.23:** - Rebase to Alpine 3.17, migrate to s6v3. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index de6bc32..1c9b6bb 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -24,6 +24,6 @@ repo_vars: - CI_PORT='4242' - CI_SSL='false' - CI_DELAY='30' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' diff --git a/readme-vars.yml b/readme-vars.yml index 428a6c4..f054631 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -9,39 +9,26 @@ project_blurb: | This container handles the IRC connection (quasselcore) and requires a desktop client (quasselclient) to be used and configured. It is designed to be always on and will keep your identity present in IRC even when your clients cannot be online. Backlog (history) is downloaded by your client upon reconnection allowing infinite scrollback through time. project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" -project_blurb_optional_extras_enabled: false # supported architectures 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 }}" -param_usage_include_net: false -param_usage_include_env: true -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/data", desc: "Database and quassel-core configuration storage."} + - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Database and quassel-core configuration storage."} param_usage_include_ports: true param_ports: - {external_port: "4242", internal_port: "4242", port_desc: "The port quassel-core listens for connections on."} -param_device_map: false -cap_add_param: false # optional container parameters opt_param_usage_include_env: true opt_param_env_vars: - {env_var: "RUN_OPTS", env_value: "--config-from-environment", desc: "Custom CLI options for Quassel"} -opt_param_usage_include_vols: false opt_param_usage_include_ports: true opt_param_ports: - {external_port: "113", internal_port: "10113", port_desc: "Optional Ident Port"} -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: | @@ -103,6 +90,7 @@ app_setup_block: | ``` # changelog changelogs: + - {date: "26.08.23:", desc: "Rebase to Alpine 3.20."} - {date: "10.11.23:", desc: "Rebase to Alpine 3.18."} - {date: "03.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 b6556ba387b4394fb01c376d16287314b2245f30 Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 26 Aug 2024 18:59:21 +0100 Subject: [PATCH 2/3] Fix as and env in arm --- Dockerfile.aarch64 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1349536..2452300 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 as build-stage +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 AS build-stage # build time arguements ARG CXXFLAGS="\ @@ -66,7 +66,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="chbmb" # set environment variables -ENV HOME /config +ENV HOME=/config # install runtime packages RUN \ From 9fb10d07146b217176a766e0349d72d6354f41e4 Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 26 Aug 2024 19:00:07 +0100 Subject: [PATCH 3/3] Add version print --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 95bf98e..ba49f1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,7 +78,8 @@ RUN \ qt5-qtbase-sqlite \ qt5-qtscript \ libqca-qt5 \ - openldap + openldap && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version # copy artifacts build stage COPY --from=build-stage /build/quassel/usr/ /usr/ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2452300..0eee7b5 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -78,7 +78,8 @@ RUN \ qt5-qtbase-sqlite \ qt5-qtscript \ libqca-qt5 \ - openldap + openldap && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version # copy artifacts build stage COPY --from=build-stage /build/quassel/usr/ /usr/