Rebase to 3.20

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -40,7 +40,8 @@ RUN \
   echo "**** install composer dependencies ****" && \
   COMPOSER_MEMORY_LIMIT=-1 php -d memory_limit=-1 /usr/bin/composer install -d /app/www/ --optimize-autoloader --no-interaction && \
   COMPOSER_MEMORY_LIMIT=-1 php -d memory_limit=-1 /usr/bin/composer require -d /app/www/ laminas/laminas-ldap && \
-  /usr/bin/composer clearcache -d /app/www/ && \ 
+  /usr/bin/composer clearcache -d /app/www/ && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/* \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20
 
 # set version label
 ARG BUILD_DATE
@@ -40,7 +40,8 @@ RUN \
   echo "**** install composer dependencies ****" && \
   COMPOSER_MEMORY_LIMIT=-1 php -d memory_limit=-1 /usr/bin/composer install -d /app/www/ --optimize-autoloader --no-interaction && \
   COMPOSER_MEMORY_LIMIT=-1 php -d memory_limit=-1 /usr/bin/composer require -d /app/www/ laminas/laminas-ldap && \
-  /usr/bin/composer clearcache -d /app/www/ && \ 
+  /usr/bin/composer clearcache -d /app/www/ && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/* \

Jenkinsfile

@@ -34,8 +34,8 @@ pipeline {
     CI_PORT='80'
     CI_SSL='false'
     CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
-    CI_AUTH='user:password'
+    CI_DOCKERENV=''
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {

README.md

@@ -343,6 +343,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **30.06.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings.
 * **24.03.24:** - Added LDAP module to composer
 * **06.03.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf.
 * **23.01.24:** - Rebase to Alpine 3.19 with php 8.3.

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 = '2.x'
   - EXT_USER = 'kimai'
@@ -25,8 +24,8 @@ repo_vars:
   - CI_PORT='80'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH=''
 sponsor_links:
   - { name: "Kimai", url: "https://www.kimai.org/donate/" }

readme-vars.yml

@@ -17,11 +17,6 @@ available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
 
-# development version
-development_versions: false
-development_versions_items:
-  - { tag: "latest", desc: "Stable Kimai releases." }
-
 # container parameters
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
@@ -70,7 +65,7 @@ app_setup_block: |
   ```
 
   ### Initial setup
-  
+
   Access the web gui at `http://<your-ip>:80`, for more information check out [Kimai Initial setup](https://www.kimai.org/documentation/initial-setup.html).
 
 # application setup snippets
@@ -113,6 +108,7 @@ external_application_unraid_block: "We recommend using our [MariaDB](https://git
 
 # changelog
 changelogs:
+  - { date: "30.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
   - { date: "24.03.24:", desc: "Added LDAP module to composer" }
   - { date: "06.03.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." }
   - { date: "23.01.24:", desc: "Rebase to Alpine 3.19 with php 8.3."}

root/defaults/nginx/site-confs/default.conf.sample

@@ -1,11 +1,8 @@
-## Version 2024/03/06 - Changelog: https://github.com/linuxserver/docker-kimai/commits/main/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2024/06/30 - Changelog: https://github.com/linuxserver/docker-kimai/commits/main/root/defaults/nginx/site-confs/default.conf.sample
 
 server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
-
-    listen 443 ssl http2 default_server;
-    listen [::]:443 ssl http2 default_server;
+    listen *:80 default_server;
+    listen *:443 ssl default_server;
 
     server_name _;
 

root/etc/s6-overlay/s6-rc.d/init-kimai-config/run

@@ -29,10 +29,10 @@ mkdir -p \
 rm -rf /app/www/var
 ln -s /config/www/var /app/www/var
 cp /app/www/config/packages/kimai.yaml /config/kimai.yaml.sample
-if [ ! -f /config/local.yaml ]; then
+if [[ ! -f /config/local.yaml ]]; then
     echo '# See https://www.kimai.org/documentation/local-yaml.html' > /config/local.yaml
 fi
-if [ ! -L /app/www/config/packages/local.yaml ]; then
+if [[ ! -L /app/www/config/packages/local.yaml ]]; then
     ln -s /config/local.yaml /app/www/config/packages/local.yaml
 fi