From 38ae023a82e821b85dbe3d072d9846ecf2ea2339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Fri, 17 Jan 2025 12:30:13 +0100 Subject: [PATCH 1/3] FIX upgrade debian to 12.9 --- CHANGES_NEXT_RELEASE | 2 +- ci/deb/Dockerfile | 2 +- doc/manuals.jp/admin/build_source.md | 2 +- doc/manuals/admin/build_source.md | 2 +- doc/manuals/admin/install.md | 2 +- docker/Dockerfile | 2 +- docker/docker-compose.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 6178729c57..241c815fcb 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -2,4 +2,4 @@ - Hardening: upgrade microhttpd dependency from 0.9.76 to 1.0.1 - Hardening: upgrade libmosquitto dependency from 2.0.15 to 2.0.20 - Hardening: upgrade libmongoc dependency from 1.24.3 to 1.29.0 -- Upgrade Debian version from 12.6 to 12.7 in Dockerfile +- Upgrade Debian version from 12.6 to 12.9 in Dockerfile diff --git a/ci/deb/Dockerfile b/ci/deb/Dockerfile index 0c1c27c4b3..d31bc14649 100644 --- a/ci/deb/Dockerfile +++ b/ci/deb/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:12.7-slim +FROM debian:12.9-slim ADD build.sh /opt/bin/ ADD build-dep.sh /opt/bin/ diff --git a/doc/manuals.jp/admin/build_source.md b/doc/manuals.jp/admin/build_source.md index 6d50b64ccd..5c77ae32d4 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: 1.0.1 (ソースから) * libcurl: 7.88.1 -* openssl: 3.0.14 +* openssl: 3.0.15 * libuuid: 2.38.1 * libmosquitto: 2.0.20 (ソースから) * Mongo C driver: 1.29.0 (ソースから) diff --git a/doc/manuals/admin/build_source.md b/doc/manuals/admin/build_source.md index 8d675098ca..74f79e4ecf 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: 1.0.1 (from source) * libcurl: 7.88.1 -* openssl: 3.0.14 +* openssl: 3.0.15 * libuuid: 2.38.1 * libmosquitto: 2.0.20 (from source) * Mongo C driver: 1.29.0 (from source) diff --git a/doc/manuals/admin/install.md b/doc/manuals/admin/install.md index 297807a0a1..4ce61cbe6e 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.7 +* Operating system: Debian. The reference operating system is Debian 12.9 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 35a7399d24..66e6bc2f52 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,7 +20,7 @@ # ARG IMAGE_NAME=debian -ARG IMAGE_TAG=12.7-slim +ARG IMAGE_TAG=12.9-slim FROM ${IMAGE_NAME}:${IMAGE_TAG} ARG GITHUB_ACCOUNT=telefonicaid diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index ccfbda083b..ffb5e77b23 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: orion: - image: telefonicaiot/fiware-orion + image: orionnewdeb ports: - "1026:1026" depends_on: From 3a24623f71998e5336138fb0b4944b8e0a909e16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Fri, 17 Jan 2025 13:16:43 +0100 Subject: [PATCH 2/3] FIX missing modification in doc --- doc/manuals.jp/admin/install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/manuals.jp/admin/install.md b/doc/manuals.jp/admin/install.md index e39b650349..606f0663cd 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.7 ですが、それ以降の +* オペレーティングシステム: Debian。リファレンス・オペレーティングシステムは Debian 12.9 ですが、それ以降の Debian 12 バージョンでも動作するはずです * データベース: MongoDB は、Orion Context Broker がインストールされるのと同じホストで実行するか、ネットワーク経由で アクセスできる別のホストで実行する必要があります。推奨される MongoDB バージョンは 6.0 です (Orion は古いバージョンで From d2918869dd7461eafacf0555cf821a81c09e92d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Fri, 17 Jan 2025 13:18:13 +0100 Subject: [PATCH 3/3] FIX rollback unintentional change --- docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index ffb5e77b23..ccfbda083b 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: orion: - image: orionnewdeb + image: telefonicaiot/fiware-orion ports: - "1026:1026" depends_on: