From 2654f2d68b6a6135e7b61028691b7e26d9704ad0 Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 18 Jul 2024 16:45:29 +0100 Subject: [PATCH] Rebase to noble --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- Jenkinsfile | 4 ++-- README.md | 1 + jenkins-vars.yml | 4 ++-- readme-vars.yml | 10 ++++------ 6 files changed, 13 insertions(+), 12 deletions(-) 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 225e4d6..efc69c9 100644 --- a/README.md +++ b/README.md @@ -428,6 +428,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 c56dcb6..b49b78b 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 @@ -64,7 +61,7 @@ app_setup_block: | Starting with version 8.1 of Unifi Network Application, mongodb 3.6 through 7.0 are supported. **Make sure you pin your database image version and do not use `latest`, as mongodb does not support automatic upgrades between major versions.** - + **MongoDB >4.4 on X86_64 Hardware needs a CPU with AVX support. Some lower end Intel CPU models like Celeron and Pentium (before Tiger-Lake) more Details: [Advanced Vector Extensions - Wikipedia](https://en.wikipedia.org/wiki/Advanced_Vector_Extensions#CPUs_with_AVX) don't support AVX, but you can still use MongoDB 4.4.** If you are using the [official mongodb container](https://hub.docker.com/_/mongo/) in Version >=6, you can create your user using an `init-mongo.js` file with the following contents: @@ -73,7 +70,7 @@ app_setup_block: | db.getSiblingDB("MONGO_DBNAME").createUser({user: "MONGO_USER", pwd: "MONGO_PASS", roles: [{role: "dbOwner", db: "MONGO_DBNAME"}]}); db.getSiblingDB("MONGO_DBNAME_stat").createUser({user: "MONGO_USER", pwd: "MONGO_PASS", roles: [{role: "dbOwner", db: "MONGO_DBNAME_stat"}]}); ``` - + If you are using mongodb < 6.0, you can create a `init-mongo.sh` file with the following contents: ```sh #!/bin/bash @@ -122,7 +119,7 @@ app_setup_block: | - /path/to/init-mongo.sh:/docker-entrypoint-initdb.d/init-mongo.sh:ro restart: unless-stopped ``` - + *Note that the init script method will only work on first run. If you start the Mongodb container without an init script it will generate test data automatically and you will have to manually create your databases, or restart with a clean `/data/db` volume and an init script mounted.* @@ -161,6 +158,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." }