Merge pull request #59 from linuxserver/master-3.20

Rebase to 3.20 (master)

Author: thespad

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
 
 # set version label
 ARG BUILD_DATE
@@ -41,6 +41,7 @@ RUN \
   NODE_ENV=production yarn build && \
   yarn link && \
   yarn --non-interactive cache clean && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

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
 
 # set version label
 ARG BUILD_DATE
@@ -41,6 +41,7 @@ RUN \
   NODE_ENV=production yarn build && \
   yarn link && \
   yarn --non-interactive cache clean && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

Jenkinsfile

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

README.md

@@ -91,7 +91,7 @@ This image provides various versions that are available via tags. Please read th
 
 * To log in to the application, browse to `http://<hostip>:9000`
 
-* You should now be prompted for a username and password on the webinterface.
+* You should now be prompted for a username and password on the web interface.
 
 * Once logged in, you can add an IRC network. Some defaults are preset for Freenode
 
@@ -305,6 +305,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **06.06.24:** - Rebase to Alpine 3.20.
 * **23.12.23:** - Rebase to Alpine 3.19.
 * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
 * **18.12.22:** - Rebasing master to alpine 3.17.

jenkins-vars.yml

@@ -6,7 +6,6 @@ external_type: github_stable
 release_type: stable
 release_tag: latest
 ls_branch: master
-build_armhf: false
 repo_vars:
   - EXT_GIT_BRANCH = 'master'
   - EXT_USER = 'thelounge'
@@ -25,6 +24,6 @@ repo_vars:
   - CI_PORT='9000'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH=''

readme-vars.yml

@@ -22,9 +22,6 @@ development_versions_items:
 # container parameters
 common_param_env_vars_enabled: true #PGID, PUID, etc, you can set it to 'optional'
 param_container_name: "{{ project_name }}"
-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/{{ project_name }}/config", desc: "Persistent config files" }
@@ -36,7 +33,7 @@ param_ports:
 app_setup_block_enabled: true
 app_setup_block: |
   * When the application first runs, it will populate its /config
-  
+
   * Stop the container
 
   * Now from the host, edit `/config/config.js`, wherever you've mapped it
@@ -50,20 +47,21 @@ app_setup_block: |
   * For each user, run the command
 
   * `docker exec -it thelounge s6-setuidgid abc thelounge add <user>`
-  
+
   * You will be prompted to enter a password that will not be echoed.
-  
+
   * Saving logs to disk is the default, this consumes more space but allows scrollback.
 
   * To log in to the application, browse to `http://<hostip>:9000`
 
-  * You should now be prompted for a username and password on the webinterface.
+  * You should now be prompted for a username and password on the web interface.
 
   * Once logged in, you can add an IRC network. Some defaults are preset for Freenode
 
 # changelog
 
 changelogs:
+  - { date: "06.06.24:", desc: "Rebase to Alpine 3.20."}
   - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
   - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
   - { date: "18.12.22:", desc: "Rebasing master to alpine 3.17." }