Merge pull request #14 from linuxserver/3.20

Rebase to 3.20
linuxserver · Jun 4, 2024 · 0f16e30 · 0f16e30
2 parents e93b574 + dc6fc28
commit 0f16e30
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 15 deletions.
diff --git a/Dockerfile b/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
@@ -27,6 +27,7 @@ RUN \
   curl -o \
     /app/fleet/fleet.jar -L \
     "https://github.com/linuxserver/fleet/releases/download/${FLEET_RELEASE}/fleet-${FLEET_RELEASE}.jar" && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** clean up ****" && \
   rm -rf \
     /tmp/*

diff --git a/Dockerfile.aarch64 b/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
@@ -27,6 +27,7 @@ RUN \
   curl -o \
     /app/fleet/fleet.jar -L \
     "https://github.com/linuxserver/fleet/releases/download/${FLEET_RELEASE}/fleet-${FLEET_RELEASE}.jar" && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** clean up ****" && \
   rm -rf \
     /tmp/*

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -34,8 +34,8 @@ pipeline {
     CI_PORT='8080'
     CI_SSL='false'
     CI_DELAY='30'
-    CI_DOCKERENV='TZ=US/Pacific'
-    CI_AUTH='user:password'
+    CI_DOCKERENV=''
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {

diff --git a/README.md b/README.md
@@ -287,6 +287,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **04.06.24:** - Rebase to Alpine 3.20.
 * **20.03.24:** - Rebase to Alpine 3.19.
 * **12.07.23:** - Rebase to Alpine 3.18.
 * **13.02.23:** - Rebase to Alpine 3.17, migrate to s6v3.

diff --git a/jenkins-vars.yml b/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 = 'linuxserver'
@@ -25,6 +24,6 @@ repo_vars:
   - CI_PORT='8080'
   - CI_SSL='false'
   - CI_DELAY='30'
-  - 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
@@ -12,16 +12,10 @@ available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
 
-# development version
-development_versions: false
-development_versions_items:
-
 # 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: "fleet_admin_authentication_type", env_value: "DATABASE", desc: "A switch to define how Fleet manages user logins. If set to DATABASE, see the related optional params. Can be set to either DATABASE or PROPERTIES." }
@@ -49,6 +43,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "04.06.24:", desc: "Rebase to Alpine 3.20."}
   - { date: "20.03.24:", desc: "Rebase to Alpine 3.19."}
   - { date: "12.07.23:", desc: "Rebase to Alpine 3.18."}
   - { date: "13.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3."}

diff --git a/root/etc/s6-overlay/s6-rc.d/init-fleet-config/run b/root/etc/s6-overlay/s6-rc.d/init-fleet-config/run
@@ -1,8 +1,6 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-#!/usr/bin/with-contenv bash
-
 # permissions
 lsiown -R abc:abc \
     /config