From de79c167595bafacac89614249851668a09805a7 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Tue, 27 Feb 2024 14:43:26 +0100 Subject: [PATCH] Update base image to 9.0.3 This switches the base image to ubuntu-base:9.0.3, ie ubuntu 22.04. The base deps versions need to be updated. libcap2 is already installed in the base image, so it's removed from the list of packages to install Only the 6.0 and 7.0 repositories contain 'mongodb-org-server' packages for ubuntu 22.04, so we are forced to use one of these versions. However, the unifi package requires a mongodb-org-server version << 5.0.0 so we need to ignore the mongodb-org-server dependency when installing the unifi package. Signed-off-by: Christophe Fergeau --- unifi/Dockerfile | 15 +++++++-------- unifi/build.yaml | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/unifi/Dockerfile b/unifi/Dockerfile index fdb59d5..0d58338 100755 --- a/unifi/Dockerfile +++ b/unifi/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/ubuntu-base:8.2.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/ubuntu-base:9.0.3 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -10,19 +10,18 @@ RUN \ apt-get update \ && apt-get upgrade -y \ && apt-get install -y --no-install-recommends \ - binutils=2.34-6ubuntu1.9 \ - libcap2=1:2.32-1ubuntu0.1 \ - logrotate=3.14.0-4ubuntu3 \ + binutils=2.38-4ubuntu2.6 \ + logrotate=3.19.0-1ubuntu1.1 \ openjdk-17-jre-headless=17* \ \ - && curl -J -L -o /usr/share/keyrings/mongodb-server-4.4.gpg https://pgp.mongodb.com/server-4.4.pub \ - && echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-4.4.gpg ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" >/etc/apt/sources.list.d/mongodb-org-4.4.list \ + && curl -J -L -o /usr/share/keyrings/mongodb-server-7.0.gpg https://pgp.mongodb.com/server-7.0.pub \ + && echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/7.0 multiverse" >/etc/apt/sources.list.d/mongodb-org-7.0.list \ && apt-get update \ - && apt-get install -y --no-install-recommends mongodb-org-server=4.4.29 \ + && apt-get install -y --no-install-recommends mongodb-org-server=7.0.7 \ && curl -J -L -o /tmp/unifi.deb \ "https://dl.ui.com/unifi/8.0.28/unifi_sysvinit_all.deb" \ \ - && dpkg --install /tmp/unifi.deb \ + && dpkg --install --ignore-depends=mongodb-org-server /tmp/unifi.deb \ && apt-get clean \ && rm -fr \ /tmp/* \ diff --git a/unifi/build.yaml b/unifi/build.yaml index 0a61814..565768e 100644 --- a/unifi/build.yaml +++ b/unifi/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/ubuntu-base:8.2.0 - amd64: ghcr.io/hassio-addons/ubuntu-base:8.2.0 + aarch64: ghcr.io/hassio-addons/ubuntu-base:9.0.3 + amd64: ghcr.io/hassio-addons/ubuntu-base:9.0.3 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev