From 013b840fb9ba266ab94c9219748a8bca0580695e Mon Sep 17 00:00:00 2001 From: Kazuhito Suda Date: Sat, 8 Jun 2024 15:16:23 +0900 Subject: [PATCH] Update Orion to 4.0.0 --- docs/en/after-installation.md | 24 +++++++----------------- docs/en/examples/orion.md | 24 +++++++----------------- docs/ja/after-installation.md | 24 +++++++----------------- docs/ja/examples/orion.md | 24 +++++++----------------- setup-fiware.sh | 6 +++--- 5 files changed, 31 insertions(+), 71 deletions(-) diff --git a/docs/en/after-installation.md b/docs/en/after-installation.md index a34c488..2d5053d 100644 --- a/docs/en/after-installation.md +++ b/docs/en/after-installation.md @@ -90,25 +90,15 @@ ngsi version --host orion.local ```json { "orion" : { - "version" : "3.12.0", - "uptime" : "0 d, 0 h, 0 m, 3 s", - "git_hash" : "7ebe97f8ddc13436c66ead53460fd4776e923e34", - "compile_time" : "Sun Jun 2 04:51:55 UTC 2024", + "version" : "4.0.0", + "uptime" : "0 d, 0 h, 0 m, 4 s", + "git_hash" : "4f9f34df07395c54387a53074f98bef00b1130a3", + "compile_time" : "Thu Jun 6 07:35:47 UTC 2024", "compiled_by" : "root", "compiled_in" : "buildkitsandbox", - "release_date" : "Sun Jun 2 04:51:55 UTC 2024", - "machine" : "aarch64", - "doc" : "https://fiware-orion.rtfd.io/en/3.12.0/", - "libversions": { - "boost": "1_74", - "libcurl": "libcurl/7.88.1 OpenSSL/3.0.11 zlib/1.2.13 brotli/1.0.9 zstd/1.5.4 libidn2/2.3.3 libpsl/0.21.2 (+libidn2/2.3.3) libssh2/1.10.0 nghttp2/1.52.0 librtmp/2.3 OpenLDAP/2.5.13", - "libmosquitto": "2.0.15", - "libmicrohttpd": "0.9.76", - "openssl": "3.0.11", - "rapidjson": "1.1.0", - "mongoc": "1.24.3", - "bson": "1.24.3" - } + "release_date" : "Thu Jun 6 07:35:47 UTC 2024", + "machine" : "x86_64", + "doc" : "https://fiware-orion.rtfd.io/en/4.0.0/" } } ``` diff --git a/docs/en/examples/orion.md b/docs/en/examples/orion.md index 678372d..9f53588 100644 --- a/docs/en/examples/orion.md +++ b/docs/en/examples/orion.md @@ -26,25 +26,15 @@ ngsi version --host orion.local ```json { "orion" : { - "version" : "3.12.0", - "uptime" : "0 d, 0 h, 0 m, 3 s", - "git_hash" : "7ebe97f8ddc13436c66ead53460fd4776e923e34", - "compile_time" : "Sun Jun 2 04:51:55 UTC 2024", + "version" : "4.0.0", + "uptime" : "0 d, 0 h, 0 m, 4 s", + "git_hash" : "4f9f34df07395c54387a53074f98bef00b1130a3", + "compile_time" : "Thu Jun 6 07:35:47 UTC 2024", "compiled_by" : "root", "compiled_in" : "buildkitsandbox", - "release_date" : "Sun Jun 2 04:51:55 UTC 2024", - "machine" : "aarch64", - "doc" : "https://fiware-orion.rtfd.io/en/3.12.0/", - "libversions": { - "boost": "1_74", - "libcurl": "libcurl/7.88.1 OpenSSL/3.0.11 zlib/1.2.13 brotli/1.0.9 zstd/1.5.4 libidn2/2.3.3 libpsl/0.21.2 (+libidn2/2.3.3) libssh2/1.10.0 nghttp2/1.52.0 librtmp/2.3 OpenLDAP/2.5.13", - "libmosquitto": "2.0.15", - "libmicrohttpd": "0.9.76", - "openssl": "3.0.11", - "rapidjson": "1.1.0", - "mongoc": "1.24.3", - "bson": "1.24.3" - } + "release_date" : "Thu Jun 6 07:35:47 UTC 2024", + "machine" : "x86_64", + "doc" : "https://fiware-orion.rtfd.io/en/4.0.0/" } } ``` diff --git a/docs/ja/after-installation.md b/docs/ja/after-installation.md index 523d7f2..ccddb65 100644 --- a/docs/ja/after-installation.md +++ b/docs/ja/after-installation.md @@ -98,25 +98,15 @@ ngsi version --host orion.local ```json { "orion" : { - "version" : "3.12.0", - "uptime" : "0 d, 0 h, 0 m, 3 s", - "git_hash" : "7ebe97f8ddc13436c66ead53460fd4776e923e34", - "compile_time" : "Sun Jun 2 04:51:55 UTC 2024", + "version" : "4.0.0", + "uptime" : "0 d, 0 h, 0 m, 4 s", + "git_hash" : "4f9f34df07395c54387a53074f98bef00b1130a3", + "compile_time" : "Thu Jun 6 07:35:47 UTC 2024", "compiled_by" : "root", "compiled_in" : "buildkitsandbox", - "release_date" : "Sun Jun 2 04:51:55 UTC 2024", - "machine" : "aarch64", - "doc" : "https://fiware-orion.rtfd.io/en/3.12.0/", - "libversions": { - "boost": "1_74", - "libcurl": "libcurl/7.88.1 OpenSSL/3.0.11 zlib/1.2.13 brotli/1.0.9 zstd/1.5.4 libidn2/2.3.3 libpsl/0.21.2 (+libidn2/2.3.3) libssh2/1.10.0 nghttp2/1.52.0 librtmp/2.3 OpenLDAP/2.5.13", - "libmosquitto": "2.0.15", - "libmicrohttpd": "0.9.76", - "openssl": "3.0.11", - "rapidjson": "1.1.0", - "mongoc": "1.24.3", - "bson": "1.24.3" - } + "release_date" : "Thu Jun 6 07:35:47 UTC 2024", + "machine" : "x86_64", + "doc" : "https://fiware-orion.rtfd.io/en/4.0.0/" } } ``` diff --git a/docs/ja/examples/orion.md b/docs/ja/examples/orion.md index 4334893..f12bd73 100644 --- a/docs/ja/examples/orion.md +++ b/docs/ja/examples/orion.md @@ -28,25 +28,15 @@ ngsi version --host orion.local ```json { "orion" : { - "version" : "3.12.0", - "uptime" : "0 d, 0 h, 0 m, 3 s", - "git_hash" : "7ebe97f8ddc13436c66ead53460fd4776e923e34", - "compile_time" : "Sun Jun 2 04:51:55 UTC 2024", + "version" : "4.0.0", + "uptime" : "0 d, 0 h, 0 m, 4 s", + "git_hash" : "4f9f34df07395c54387a53074f98bef00b1130a3", + "compile_time" : "Thu Jun 6 07:35:47 UTC 2024", "compiled_by" : "root", "compiled_in" : "buildkitsandbox", - "release_date" : "Sun Jun 2 04:51:55 UTC 2024", - "machine" : "aarch64", - "doc" : "https://fiware-orion.rtfd.io/en/3.12.0/", - "libversions": { - "boost": "1_74", - "libcurl": "libcurl/7.88.1 OpenSSL/3.0.11 zlib/1.2.13 brotli/1.0.9 zstd/1.5.4 libidn2/2.3.3 libpsl/0.21.2 (+libidn2/2.3.3) libssh2/1.10.0 nghttp2/1.52.0 librtmp/2.3 OpenLDAP/2.5.13", - "libmosquitto": "2.0.15", - "libmicrohttpd": "0.9.76", - "openssl": "3.0.11", - "rapidjson": "1.1.0", - "mongoc": "1.24.3", - "bson": "1.24.3" - } + "release_date" : "Thu Jun 6 07:35:47 UTC 2024", + "machine" : "x86_64", + "doc" : "https://fiware-orion.rtfd.io/en/4.0.0/" } } ``` diff --git a/setup-fiware.sh b/setup-fiware.sh index 9c12c38..5125825 100755 --- a/setup-fiware.sh +++ b/setup-fiware.sh @@ -309,7 +309,7 @@ get_config_sh() { # Set amd64(x86_64) images # set_amd64_images() { - IMAGE_ORION=telefonicaiot/fiware-orion:3.12.0 + IMAGE_ORION=telefonicaiot/fiware-orion:4.0.0 IMAGE_WIRECLOUD=quay.io/fiware/wirecloud:1.3.1 IMAGE_NGSIPROXY=quay.io/fiware/ngsiproxy:1.2.2 IMAGE_COMET=telefonicaiot/fiware-sth-comet:2.11.0 @@ -326,7 +326,7 @@ set_amd64_images() { # Set arm64 images # set_arm64_images() { - IMAGE_ORION=letsfiware/orion:3.12.0 + IMAGE_ORION=letsfiware/orion:4.0.0 IMAGE_WIRECLOUD=letsfiware/wirecloud:1.3.1 IMAGE_NGSIPROXY=letsfiware/ngsiproxy:1.2.2 IMAGE_COMET=letsfiware/sth-comet:2.11.0 @@ -737,7 +737,7 @@ setup_orion() { image: ${IMAGE_ORION} depends_on: - mongo - entrypoint: ["sh", "-c", "rm /tmp/contextBroker.pid; /usr/bin/contextBroker -fg -multiservice -dbhost mongo"] + entrypoint: ["sh", "-c", "if [ -e /tmp/contextBroker.pid ]; then rm /tmp/contextBroker.pid; fi; /usr/bin/contextBroker -fg -multiservice -ngsiv1Autocast -disableFileLog -dbURI mongodb://mongo"] restart: always ports: - 1026:1026