Merge pull request #55 from linuxserver/3.20

Author: thespad

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,8 +77,9 @@ RUN \
     qt5-qtbase-postgresql \
     qt5-qtbase-sqlite \
     qt5-qtscript \
-    libqca \
-    openldap
+    libqca-qt5 \
+    openldap && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version
 
 # copy artifacts build stage
 COPY --from=build-stage /build/quassel/usr/ /usr/

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
@@ -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,8 +77,9 @@ RUN \
     qt5-qtbase-postgresql \
     qt5-qtbase-sqlite \
     qt5-qtscript \
-    libqca \
-    openldap
+    libqca-qt5 \
+    openldap && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version
 
 # copy artifacts build stage
 COPY --from=build-stage /build/quassel/usr/ /usr/

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 {

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.

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=''

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."}