From 204f5f74e101de1419445937250e89a7766af3b8 Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 6 Jun 2024 14:36:13 +0100 Subject: [PATCH] Rebase to 3.20 --- Dockerfile | 7 ++++--- Dockerfile.aarch64 | 7 ++++--- Jenkinsfile | 4 ++-- README.md | 1 + jenkins-vars.yml | 4 ++-- readme-vars.yml | 4 +--- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index b2c2374..d60b137 100644 --- a/Dockerfile +++ b/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/ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 265fe4f..98985e2 100644 --- a/Dockerfile.aarch64 +++ b/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/ diff --git a/Jenkinsfile b/Jenkinsfile index 4b3dfb9..0a75fe7 100644 --- a/Jenkinsfile +++ b/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 { diff --git a/README.md b/README.md index be87d1d..246d9e7 100644 --- a/README.md +++ b/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) diff --git a/jenkins-vars.yml b/jenkins-vars.yml index b3e89f9..cb630f9 100644 --- a/jenkins-vars.yml +++ b/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='' diff --git a/readme-vars.yml b/readme-vars.yml index fef64bf..80ab23d 100755 --- a/readme-vars.yml +++ b/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)"}