From a3348d2055ca17d9cbe88fb038c3717d40845709 Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 30 Jun 2024 13:21:56 +0100 Subject: [PATCH] Rebase to 3.20 --- Dockerfile | 5 +++-- Dockerfile.aarch64 | 5 +++-- Jenkinsfile | 4 ++-- jenkins-vars.yml | 5 ++--- readme-vars.yml | 8 +------- root/etc/s6-overlay/s6-rc.d/init-ldap-config/run | 2 +- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index ef57a0a..ba14fcb 100644 --- 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 @@ -29,9 +29,10 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \ cryptography \ python-ldap=="${LDAP_VERSION}" && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8d6ebb3..84e0c4f 100644 --- 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 @@ -29,9 +29,10 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \ cryptography \ python-ldap=="${LDAP_VERSION}" && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Jenkinsfile b/Jenkinsfile index 88a01e2..4ea4d1d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,8 +33,8 @@ pipeline { CI_PORT='9000' CI_SSL='false' CI_DELAY='60' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='/test' } stages { diff --git a/jenkins-vars.yml b/jenkins-vars.yml index c033ca7..1afb6cd 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,7 +6,6 @@ external_type: pip_version release_type: stable release_tag: latest ls_branch: master -build_armhf: false repo_vars: - EXT_RELEASE_TYPE = 'pip_version' - EXT_PIP = 'python-ldap' @@ -24,6 +23,6 @@ repo_vars: - CI_PORT='9000' - CI_SSL='false' - CI_DELAY='60' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='/test' diff --git a/readme-vars.yml b/readme-vars.yml index 75d44a4..82a6fdf 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -13,17 +13,10 @@ available_architectures: - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} # container parameters -common_param_env_vars_enabled: false -param_container_name: "{{ project_name }}" -param_usage_include_vols: false -param_volumes: "" param_usage_include_ports: true param_ports: - { external_port: "8888", internal_port: "8888", port_desc: "the port for ldap auth daemon" } - { external_port: "9000", internal_port: "9000", port_desc: "the port for ldap login page" } -param_usage_include_env: true -param_env_vars: - - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London" } # optional container parameters opt_param_usage_include_env: true @@ -42,6 +35,7 @@ app_setup_block: | # changelog changelogs: + - { date: "30.06.24:", desc: "Rebase to Alpine 3.20."} - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."} - { date: "20.06.23:", desc: "Sync upstream changes, including the ability to disable referrals with `X-Ldap-DisableReferrals`." } - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-ldap-config/run b/root/etc/s6-overlay/s6-rc.d/init-ldap-config/run index 58ace5d..25cf1b7 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-ldap-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-ldap-config/run @@ -3,7 +3,7 @@ # generate fernet key for ldap if it doesn't exist if grep -q 'REPLACEWITHFERNETKEY' /app/ldap-backend-app.py; then - if [ -z "${FERNETKEY}" ]; then + if [[ -z "${FERNETKEY}" ]]; then KEY=$(python3 /app/fernet-key.py) echo "generated fernet key" elif ! python3 -c "from cryptography.fernet import Fernet; Fernet(b'${FERNETKEY}').encrypt(b'my deep dark secret')" 2>/dev/null; then