From 351d954e474b8dfeee12a8672962ad7135e19e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Thu, 31 Oct 2024 16:49:50 +0100 Subject: [PATCH 1/2] FIX upgrade debian to 12.7 --- CHANGES_NEXT_RELEASE | 1 + ci/deb/Dockerfile | 2 +- doc/manuals.jp/admin/install.md | 2 +- doc/manuals/admin/install.md | 2 +- docker/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index b5b80eeb36..dc287a0328 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1 +1,2 @@ - Fix: improve attribute and metadata invalid format dates for DateTime types in logs (#4616) +- Upgrade Debian version from 12.6 to 12.7 in Dockerfile diff --git a/ci/deb/Dockerfile b/ci/deb/Dockerfile index afe1fbe778..0c1c27c4b3 100644 --- a/ci/deb/Dockerfile +++ b/ci/deb/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:12.6-slim +FROM debian:12.7-slim ADD build.sh /opt/bin/ ADD build-dep.sh /opt/bin/ diff --git a/doc/manuals.jp/admin/install.md b/doc/manuals.jp/admin/install.md index 06a4c2a5c7..e39b650349 100644 --- a/doc/manuals.jp/admin/install.md +++ b/doc/manuals.jp/admin/install.md @@ -26,7 +26,7 @@ Docker hub で公式の Orion docker コンテナを使用してインストー 必要なソースから ビルドした Orion をインストールする場合： -* オペレーティングシステム: Debian。リファレンス・オペレーティングシステムは Debian 12.6 ですが、それ以降の +* オペレーティングシステム: Debian。リファレンス・オペレーティングシステムは Debian 12.7 ですが、それ以降の Debian 12 バージョンでも動作するはずです * データベース: MongoDB は、Orion Context Broker がインストールされるのと同じホストで実行するか、ネットワーク経由で アクセスできる別のホストで実行する必要があります。推奨される MongoDB バージョンは 6.0 です (Orion は古いバージョンで diff --git a/doc/manuals/admin/install.md b/doc/manuals/admin/install.md index f8ef9489f5..297807a0a1 100644 --- a/doc/manuals/admin/install.md +++ b/doc/manuals/admin/install.md @@ -23,7 +23,7 @@ In the case you install using the official Orion docker container at Dockerhub, In the case you are installing Orion building from sources you need: -* Operating system: Debian. The reference operating system is Debian 12.6 +* Operating system: Debian. The reference operating system is Debian 12.7 but it should work also in any later Debian 12 version. * Database: MongoDB is required to run either in the same host where Orion Context Broker is to be installed or in a different host accessible through the network. The recommended MongoDB version is 6.0 (Orion may work with older versions but we don't recommend it at all!). diff --git a/docker/Dockerfile b/docker/Dockerfile index aac4d0b52f..63ea06b81b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,7 +20,7 @@ # ARG IMAGE_NAME=debian -ARG IMAGE_TAG=12.6-slim +ARG IMAGE_TAG=12.7-slim FROM ${IMAGE_NAME}:${IMAGE_TAG} ARG GITHUB_ACCOUNT=telefonicaid From 2d06e717abfb0a0a78357ce47f3c93dfcb74a9aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Thu, 7 Nov 2024 10:19:53 +0100 Subject: [PATCH 2/2] ADD fix openssl reference version due to upgrade to Debian 12.7 --- doc/manuals.jp/admin/build_source.md | 2 +- doc/manuals/admin/build_source.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/manuals.jp/admin/build_source.md b/doc/manuals.jp/admin/build_source.md index ca4e113d3d..5943b978e9 100644 --- a/doc/manuals.jp/admin/build_source.md +++ b/doc/manuals.jp/admin/build_source.md @@ -13,7 +13,7 @@ Orion Context Broker は、以下のライブラリをビルドの依存関係 * boost: 1.74 * libmicrohttpd: 0.9.76 (ソースから) * libcurl: 7.88.1 -* openssl: 3.0.13 +* openssl: 3.0.14 * libuuid: 2.38.1 * libmosquitto: 2.0.15 (ソースから) * Mongo C driver: 1.24.3 (ソースから) diff --git a/doc/manuals/admin/build_source.md b/doc/manuals/admin/build_source.md index 8d35154db3..1ccba4365c 100644 --- a/doc/manuals/admin/build_source.md +++ b/doc/manuals/admin/build_source.md @@ -13,7 +13,7 @@ The Orion Context Broker uses the following libraries as build dependencies: * boost: 1.74 * libmicrohttpd: 0.9.76 (from source) * libcurl: 7.88.1 -* openssl: 3.0.13 +* openssl: 3.0.14 * libuuid: 2.38.1 * libmosquitto: 2.0.15 (from source) * Mongo C driver: 1.24.3 (from source)