Merge pull request #78 from linuxserver/3.20

Rebase to 3.20

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage
 
 # build variables
 ARG SYNCTHING_RELEASE
@@ -34,7 +34,7 @@ RUN \
     build syncthing
 
 ############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -48,7 +48,8 @@ ENV HOME="/config"
 RUN \
   echo "**** create var lib folder ****" && \
   install -d -o abc -g abc \
-    /var/lib/syncthing
+    /var/lib/syncthing && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version
 
 # copy files from build stage and local files
 COPY --from=buildstage /tmp/sync/syncthing /usr/bin/

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 as buildstage
 
 # build variables
 ARG SYNCTHING_RELEASE
@@ -34,7 +34,7 @@ RUN \
     build syncthing
 
 ############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
 
 # set version label
 ARG BUILD_DATE
@@ -48,7 +48,8 @@ ENV HOME="/config"
 RUN \
   echo "**** create var lib folder ****" && \
   install -d -o abc -g abc \
-    /var/lib/syncthing
+    /var/lib/syncthing && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version
 
 # copy files from build stage and local files
 COPY --from=buildstage /tmp/sync/syncthing /usr/bin/

Jenkinsfile

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

README.md

@@ -289,6 +289,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **06.06.24:** - Rebase to Alpine 3.20.
 * **05.03.24:** - Rebase to Alpine 3.19.
 * **05.09.23:** - Rebase to Alpine 3.18.
 * **01.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)

jenkins-vars.yml

@@ -24,6 +24,6 @@ repo_vars:
   - CI_PORT='8384'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH=''

readme-vars.yml

@@ -16,9 +16,6 @@ param_container_name: "{{ project_name }}"
 param_usage_include_hostname: 'optional' #you can set it to 'optional'
 param_hostname: "{{ project_name }}"
 param_hostname_desc: "Optionally the hostname can be defined."
-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: "Configuration files."}
@@ -35,6 +32,7 @@ app_setup_block_enabled: true
 app_setup_block: "**Note: ** The Syncthing devs highly suggest setting a password for this container as it listens on 0.0.0.0. To do this go to `Actions -> Settings -> set user/password` for the webUI."
 # changelog
 changelogs:
+  - {date: "06.06.24:", desc: "Rebase to Alpine 3.20."}
   - {date: "05.03.24:", desc: "Rebase to Alpine 3.19."}
   - {date: "05.09.23:", desc: "Rebase to Alpine 3.18."}
   - {date: "01.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}