diff --git a/Dockerfile b/Dockerfile index d25a9c8..c27f5fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy +FROM ghcr.io/linuxserver/baseimage-ubuntu:noble # set version label ARG BUILD_DATE @@ -34,6 +34,7 @@ RUN \ "https://dl.ui.com/unifi/${UNIFI_VERSION}/UniFi.unix.zip" && \ unzip /tmp/unifi.zip -d /usr/lib && \ mv /usr/lib/UniFi /usr/lib/unifi && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apt-get clean && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5881280..77a4f04 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble # set version label ARG BUILD_DATE @@ -34,6 +34,7 @@ RUN \ "https://dl.ui.com/unifi/${UNIFI_VERSION}/UniFi.unix.zip" && \ unzip /tmp/unifi.zip -d /usr/lib && \ mv /usr/lib/UniFi /usr/lib/unifi && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apt-get clean && \ rm -rf \ diff --git a/Jenkinsfile b/Jenkinsfile index 5d7a4b9..6fe0d3a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,8 +31,8 @@ pipeline { CI_PORT='8443' CI_SSL='true' CI_DELAY='180' - 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 c4dafe5..0734c3b 100644 --- a/README.md +++ b/README.md @@ -422,6 +422,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **18.07.24:** - Rebase to Ubuntu Noble. * **04.03.24:** - Install from zip package instead of deb. * **17.10.23:** - Add environment variables for TLS and authSource to support Atlas and new MongoDB versions. * **05.09.23:** - Initial release. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 493da5a..a5357ae 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -22,6 +22,6 @@ repo_vars: - CI_PORT='8443' - CI_SSL='true' - CI_DELAY='180' - - 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 bc5032b..ec4dcb1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -12,9 +12,6 @@ available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} -# development version -development_versions: false - # container parameters param_container_name: "{{ project_name }}" param_usage_include_vols: true @@ -155,6 +152,7 @@ app_setup_block: | # changelog changelogs: + - { date: "18.07.24:", desc: "Rebase to Ubuntu Noble." } - { date: "04.03.24:", desc: "Install from zip package instead of deb." } - { date: "17.10.23:", desc: "Add environment variables for TLS and authSource to support Atlas and new MongoDB versions." } - { date: "05.09.23:", desc: "Initial release." }