Merge pull request #386 from fisuda/update/docker_images

Update Orion to 4.0.0
lets-fiware · Jun 8, 2024 · 664c509 · 664c509
2 parents 0365bb3 + c04cc2c
commit 664c509
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 67 deletions.
diff --git a/.config.sh b/.config.sh
@@ -49,7 +49,7 @@ ORION=orion
 ORION_EXPOSE_PORT=
 
 # Docker image for Orion
-IMAGE_ORION=telefonicaiot/fiware-orion:3.12.0
+IMAGE_ORION=telefonicaiot/fiware-orion:4.0.0
 
 #
 # Orion-LD

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## FIWARE Big Bang v0.38.0-next
 
+-   Update Orion to 4.0.0 (#386)
 -   Clarifies instance number variable for Node-RED (#385)
 
 ## FIWARE Big Bang v0.38.0 - 01 June, 2024

diff --git a/config.sh b/config.sh
@@ -49,7 +49,7 @@ ORION=orion
 ORION_EXPOSE_PORT=
 
 # Docker image for Orion
-IMAGE_ORION=telefonicaiot/fiware-orion:3.12.0
+IMAGE_ORION=telefonicaiot/fiware-orion:4.0.0
 
 #
 # Orion-LD

diff --git a/docs/en/after-installation.md b/docs/en/after-installation.md
@@ -98,25 +98,15 @@ ngsi version --host orion.example.com
 ```json
 {
 "orion" : {
-  "version" : "3.7.0",
+  "version" : "4.0.0",
   "uptime" : "0 d, 0 h, 0 m, 1 s",
-  "git_hash" : "8b19705a8ec645ba1452cb97847a5615f0b2d3ca",
-  "compile_time" : "Thu May 26 11:45:49 UTC 2022",
+  "git_hash" : "4f9f34df07395c54387a53074f98bef00b1130a3",
+  "compile_time" : "Thu Jun 6 07:35:47 UTC 2024",
   "compiled_by" : "root",
-  "compiled_in" : "025d96e1419a",
-  "release_date" : "Thu May 26 11:45:49 UTC 2022",
+  "compiled_in" : "buildkitsandbox",
+  "release_date" : "Thu Jun 6 07:35:47 UTC 2024",
   "machine" : "x86_64",
-  "doc" : "https://fiware-orion.rtfd.io/en/3.7.0/",
-  "libversions": {
-     "boost": "1_74",
-     "libcurl": "libcurl/7.74.0 OpenSSL/1.1.1n zlib/1.2.11 brotli/1.0.9 libidn2/2.3.0 libpsl/0.21.0 (+libidn2/2.3.0) libssh2/1.9.0 nghttp2/1.43.0 librtmp/2.3",
-     "libmosquitto": "2.0.12",
-     "libmicrohttpd": "0.9.70",
-     "openssl": "1.1",
-     "rapidjson": "1.1.0",
-     "mongoc": "1.17.4",
-     "bson": "1.17.4"
-  }
+  "doc" : "https://fiware-orion.rtfd.io/en/4.0.0/"
 }
 }
 ```

diff --git a/docs/en/examples/orion.md b/docs/en/examples/orion.md
@@ -26,25 +26,15 @@ ngsi version --host orion.example.com
 ```json
 {
 "orion" : {
-  "version" : "3.7.0",
+  "version" : "4.0.0",
   "uptime" : "0 d, 0 h, 0 m, 1 s",
-  "git_hash" : "8b19705a8ec645ba1452cb97847a5615f0b2d3ca",
-  "compile_time" : "Thu May 26 11:45:49 UTC 2022",
+  "git_hash" : "4f9f34df07395c54387a53074f98bef00b1130a3",
+  "compile_time" : "Thu Jun 6 07:35:47 UTC 2024",
   "compiled_by" : "root",
-  "compiled_in" : "025d96e1419a",
-  "release_date" : "Thu May 26 11:45:49 UTC 2022",
+  "compiled_in" : "buildkitsandbox",
+  "release_date" : "Thu Jun 6 07:35:47 UTC 2024",
   "machine" : "x86_64",
-  "doc" : "https://fiware-orion.rtfd.io/en/3.7.0/",
-  "libversions": {
-     "boost": "1_74",
-     "libcurl": "libcurl/7.74.0 OpenSSL/1.1.1n zlib/1.2.11 brotli/1.0.9 libidn2/2.3.0 libpsl/0.21.0 (+libidn2/2.3.0) libssh2/1.9.0 nghttp2/1.43.0 librtmp/2.3",
-     "libmosquitto": "2.0.12",
-     "libmicrohttpd": "0.9.70",
-     "openssl": "1.1",
-     "rapidjson": "1.1.0",
-     "mongoc": "1.17.4",
-     "bson": "1.17.4"
-  }
+  "doc" : "https://fiware-orion.rtfd.io/en/4.0.0/"
 }
 }
 ```

diff --git a/docs/ja/after-installation.md b/docs/ja/after-installation.md
@@ -108,25 +108,15 @@ ngsi version --host orion.example.com
 ```json
 {
 "orion" : {
-  "version" : "3.7.0",
+  "version" : "4.0.0",
   "uptime" : "0 d, 0 h, 0 m, 1 s",
-  "git_hash" : "8b19705a8ec645ba1452cb97847a5615f0b2d3ca",
-  "compile_time" : "Thu May 26 11:45:49 UTC 2022",
+  "git_hash" : "4f9f34df07395c54387a53074f98bef00b1130a3",
+  "compile_time" : "Thu Jun 6 07:35:47 UTC 2024",
   "compiled_by" : "root",
-  "compiled_in" : "025d96e1419a",
-  "release_date" : "Thu May 26 11:45:49 UTC 2022",
+  "compiled_in" : "buildkitsandbox",
+  "release_date" : "Thu Jun 6 07:35:47 UTC 2024",
   "machine" : "x86_64",
-  "doc" : "https://fiware-orion.rtfd.io/en/3.7.0/",
-  "libversions": {
-     "boost": "1_74",
-     "libcurl": "libcurl/7.74.0 OpenSSL/1.1.1n zlib/1.2.11 brotli/1.0.9 libidn2/2.3.0 libpsl/0.21.0 (+libidn2/2.3.0) libssh2/1.9.0 nghttp2/1.43.0 librtmp/2.3",
-     "libmosquitto": "2.0.12",
-     "libmicrohttpd": "0.9.70",
-     "openssl": "1.1",
-     "rapidjson": "1.1.0",
-     "mongoc": "1.17.4",
-     "bson": "1.17.4"
-  }
+  "doc" : "https://fiware-orion.rtfd.io/en/4.0.0/"
 }
 }
 ```

diff --git a/docs/ja/examples/orion.md b/docs/ja/examples/orion.md
@@ -28,25 +28,15 @@ ngsi version --host orion.example.com
 ```json
 {
 "orion" : {
-  "version" : "3.7.0",
+  "version" : "4.0.0",
   "uptime" : "0 d, 0 h, 0 m, 1 s",
-  "git_hash" : "8b19705a8ec645ba1452cb97847a5615f0b2d3ca",
-  "compile_time" : "Thu May 26 11:45:49 UTC 2022",
+  "git_hash" : "4f9f34df07395c54387a53074f98bef00b1130a3",
+  "compile_time" : "Thu Jun 6 07:35:47 UTC 2024",
   "compiled_by" : "root",
-  "compiled_in" : "025d96e1419a",
-  "release_date" : "Thu May 26 11:45:49 UTC 2022",
+  "compiled_in" : "buildkitsandbox",
+  "release_date" : "Thu Jun 6 07:35:47 UTC 2024",
   "machine" : "x86_64",
-  "doc" : "https://fiware-orion.rtfd.io/en/3.7.0/",
-  "libversions": {
-     "boost": "1_74",
-     "libcurl": "libcurl/7.74.0 OpenSSL/1.1.1n zlib/1.2.11 brotli/1.0.9 libidn2/2.3.0 libpsl/0.21.0 (+libidn2/2.3.0) libssh2/1.9.0 nghttp2/1.43.0 librtmp/2.3",
-     "libmosquitto": "2.0.12",
-     "libmicrohttpd": "0.9.70",
-     "openssl": "1.1",
-     "rapidjson": "1.1.0",
-     "mongoc": "1.17.4",
-     "bson": "1.17.4"
-  }
+  "doc" : "https://fiware-orion.rtfd.io/en/4.0.0/"
 }
 }
 ```

diff --git a/setup/template/docker/docker-orion.yml b/setup/template/docker/docker-orion.yml
@@ -5,7 +5,7 @@ services:
     depends_on:
       - mongo
     # __ORION_DEPENDS_ON__
-    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
     logging:
       driver: syslog