diff --git a/.config.sh b/.config.sh new file mode 100644 index 0000000..50cae3c --- /dev/null +++ b/.config.sh @@ -0,0 +1,43 @@ +#!/bin/bash + +# Use Cygnus sink (true or false) Default: false +CYGNUS_MONGO= +CYGNUS_MYSQL= +CYGNUS_POSTGRES= +CYGNUS_ELASTICSEARCH= + +# Set passowrd for database systems +MYSQL_ROOT_PASSWORD= +POSTGRES_PASSWORD= +ELASTICSEARCH_PASSWORD= + +# Use STH-Comet (true or false) Default: false +COMET= + +# Use Quantumleap (true or false) Default: false +QUANTUMLEAP= + +# Use Perseo (true or false) Default: false +PERSEO= + +# Use WireCloud (true or false) Default: false +WIRECLOUD= + +# Use IoT Agent for UltraLight 2.0 (true or false) Default: false +IOTAGENT_UL= + +# Use IoT Agent for JSON (true or false) Default: false +IOTAGENT_JSON= + +# Specify transport protocol for IoT Agent (HTTP and/or MQTT) +# Use HTTP (true or false) Default: true +IOTAGENT_HTTP= + +# Use MQTT (true or false) Default: false +IOTAGENT_MQTT= + +# Use node-red (true or false) Default: false +NODE_RED= + +# Start containers (true or false) Default: true +START_CONTAINER= diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 13bea5a..6ea2e17 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,7 +2,7 @@ Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue. Please send a pull request to -the `v0.4.0-next` branch. +the `v0.5.0-next` branch. ## Types of changes @@ -23,7 +23,7 @@ merging your code._ - [ ] I have read the [CONTRIBUTING](https://github.com/lets-fiware/FIWARE-Small-Bang/blob/main/CONTRIBUTING.md) doc - [ ] I have signed the [CLA](https://github.com/lets-fiware/FIWARE-Small-Bang/blob/main/FIWARE-Small-Bang-individual-cla.pdf) - [ ] I have updated the change log (CHANGELOG.md) -- [ ] I send this pull request to the `v0.4.0-next` branch. +- [ ] I send this pull request to the `v0.5.0-next` branch. - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] I have added necessary documentation (if appropriate) - [ ] Any dependent changes have been merged and published in downstream modules diff --git a/.github/workflows/ubuntu-24.04.yml b/.github/workflows/ubuntu-24.04.yml new file mode 100644 index 0000000..640d42c --- /dev/null +++ b/.github/workflows/ubuntu-24.04.yml @@ -0,0 +1,23 @@ +name: Ubuntu 24.04 +on: + push: + branches: + - main + - "*-next" + pull_request: + branches: + - main + - "*-next" + +jobs: + setup-test: + name: setup test + + runs-on: ubuntu-24.04 + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Run setup test + run: ./tests/script/setup_test.sh diff --git a/.github/workflows/ubuntu-latest.yml b/.github/workflows/ubuntu-latest.yml index e432ef8..27062e5 100644 --- a/.github/workflows/ubuntu-latest.yml +++ b/.github/workflows/ubuntu-latest.yml @@ -23,7 +23,7 @@ jobs: run: ./tests/script/coverage.sh - name: Run codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} directory: coverage diff --git a/CHANGELOG.md b/CHANGELOG.md index e197cc9..52e1148 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ +## FIWARE Small Bang v0.5.0 - 03 June, 2024 + +- Improve maintenance script (#42) +- Update Perseo FE to 1.30.0 (#41) +- Update IoT Agent for JSON to 3.4.0 (#40) +- Update IoT Agent for UltraLight to 3.4.0 (#39) +- Update Quantumleap 1.0.0 (#38) +- Remove version property from docker compose files (#37) +- Support Ubuntu 24.04 (#36) +- Bump codecov/codecov-action from 1 to 4 (#35) +- Update STH-Comet 2.11.0 (#34) +- Update Cygnus to 3.8.0 (#33) +- Update Orion to 3.12.0 (#32) +- Update node-red 3.1.9 (#31) +- Update copyright date (#30) +- ADD node-red 3.1.3 (#29) + ## FIWARE Small Bang v0.4.0 - 06 October, 2023 - ADD IoT Agent for JSON 2.4.2 (#26) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c7e0499..8396526 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,7 +31,7 @@ If you don't see your idea listed, and you think it fits into the goals of this - **If your contribution is minor,** such as a typo fix, open a pull request. - **If your contribution is major,** such as a new guide, start by opening an issue first. That way, other people can weigh in on the discussion before you do any work. -- Send a pull request to the `v0.4.0-next` branch (not main branch). +- Send a pull request to the `v0.5.0-next` branch (not main branch). ## Community diff --git a/LICENSE b/LICENSE index 9351e9a..67304f4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 Kazuhito Suda +Copyright (c) 2023-2024 Kazuhito Suda Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 472ae66..99dc392 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@
[![Ubuntu 20.04](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-20.04.yml/badge.svg)](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-20.04.yml) [![Ubuntu 22.04](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-22.04.yml/badge.svg)](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-22.04.yml) +[![Ubuntu 24.04](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-24.04.yml/badge.svg)](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-24.04.yml)
The FIWARE Small Bang is a turnkey solution for setting up a FIWARE instance on your local machine. @@ -49,6 +50,7 @@ FI-SB stands for FIWARE Small Bang. ## Requirements - Supported Linux distribution + - Ubuntu 24.04 LTS (x86_64, aarch64) - Ubuntu 22.04 LTS (x86_64, aarch64) - Ubuntu 20.04 LTS - Raspberry Pi OS (aarc64) @@ -70,13 +72,13 @@ Before running the setup script, you need to install docker and docker compose p Download a tar.gz file for the FIWARE Small Bang. ```bash -curl -sL https://github.com/lets-fiware/FIWARE-Small-Bang/releases/download/v0.4.0/FIWARE-Small-Bang-0.4.0.tar.gz | tar zxf - +curl -sL https://github.com/lets-fiware/FIWARE-Small-Bang/releases/download/v0.5.0/FIWARE-Small-Bang-0.5.0.tar.gz | tar zxf - ``` -Move to the `FIWARE-Small-Bang-0.4.0` directory. +Move to the `FIWARE-Small-Bang-0.5.0` directory. ```bash -cd FIWARE-Small-Bang-0.4.0/ +cd FIWARE-Small-Bang-0.5.0/ ``` Run the `setup-fiware.sh` script. @@ -95,5 +97,5 @@ Run the `setup-fiware.sh` script. ## Copyright and License -Copyright (c) 2023 Kazuhito Suda
+Copyright (c) 2023-2024 Kazuhito Suda
Licensed under the [MIT License](./LICENSE). diff --git a/README_ja.md b/README_ja.md index dc058ed..8f902d3 100644 --- a/README_ja.md +++ b/README_ja.md @@ -12,6 +12,7 @@
[![Ubuntu 20.04](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-20.04.yml/badge.svg)](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-20.04.yml) [![Ubuntu 22.04](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-22.04.yml/badge.svg)](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-22.04.yml) +[![Ubuntu 24.04](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-24.04.yml/badge.svg)](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-24.04.yml)
FIWARE Small Bang は、ローカル・マシンに FIWARE インスタンスをセットアップするためのターンキー・ソリューションです。 @@ -47,6 +48,7 @@ FI-SB は FIWARE Small Bang の略称です。 ## 要件 - サポートしている Linux ディストリビューション + - Ubuntu 24.04 LTS (x86_64, aarch64) - Ubuntu 22.04 LTS (x86_64, aarch64) - Ubuntu 20.04 LTS - Raspberry Pi OS (aarc64) @@ -68,13 +70,13 @@ FI-SB は FIWARE Small Bang の略称です。 FIWARE Small Bang の tar.gz ファイルをダウンロードします。 ```bash -curl -sL https://github.com/lets-fiware/FIWARE-Small-Bang/releases/download/v0.4.0/FIWARE-Small-Bang-0.4.0.tar.gz | tar zxf - +curl -sL https://github.com/lets-fiware/FIWARE-Small-Bang/releases/download/v0.5.0/FIWARE-Small-Bang-0.5.0.tar.gz | tar zxf - ``` -`FIWARE-Small-Bang-0.4.0` ディレクトリに移動します。 +`FIWARE-Small-Bang-0.5.0` ディレクトリに移動します。 ```bash -cd FIWARE-Small-Bang-0.4.0/ +cd FIWARE-Small-Bang-0.5.0/ ``` `setup-fiware.sh` スクリプトを実行します。 @@ -93,5 +95,5 @@ cd FIWARE-Small-Bang-0.4.0/ ## Copyright and License -Copyright (c) 2023 Kazuhito Suda
+Copyright (c) 2023-2024 Kazuhito Suda
Licensed under the [MIT License](./LICENSE). diff --git a/SECURITY.md b/SECURITY.md index fb09e4a..7cbf8b2 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,8 +4,8 @@ | Version | Supported | | -------- | ------------------ | -| 0.4.0 | :white_check_mark: | -| < 0.4.0 | :x: | +| 0.5.0 | :white_check_mark: | +| < 0.5.0 | :x: | ## Reporting a Vulnerability diff --git a/VERSION b/VERSION index 48a7f10..8011450 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION=0.4.0 +VERSION=0.5.0 diff --git a/docs/en/after-installation.md b/docs/en/after-installation.md index 98c4c8e..a34c488 100644 --- a/docs/en/after-installation.md +++ b/docs/en/after-installation.md @@ -90,24 +90,24 @@ ngsi version --host orion.local ```json { "orion" : { - "version" : "3.10.1", - "uptime" : "0 d, 0 h, 0 m, 26 s", - "git_hash" : "9a80e06abe7f690901cf1586377acec02d40e303", - "compile_time" : "Mon Jun 12 16:55:20 UTC 2023", + "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", "compiled_by" : "root", "compiled_in" : "buildkitsandbox", - "release_date" : "Mon Jun 12 16:55:20 UTC 2023", - "machine" : "x86_64", - "doc" : "https://fiware-orion.rtfd.io/en/3.10.1/", + "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.74.0 OpenSSL/1.1.1n zlib/1.2.12 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", + "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": "1.1", + "openssl": "3.0.11", "rapidjson": "1.1.0", - "mongoc": "1.23.1", - "bson": "1.23.1" + "mongoc": "1.24.3", + "bson": "1.24.3" } } } @@ -128,7 +128,7 @@ ngsi version --host cygnus.local --pretty ```json { "success": "true", - "version": "3.2.0.9b21eae9095e3250ba8799e61411905d1c756191" + "version": "3.8.0.f62eff701c01df1f708e0c9484e48e7b9bd9b1ed" } ``` @@ -145,7 +145,7 @@ ngsi version --host comet.local #### Response: ```json -{"version":"2.10.0"} +{"version":"2.11.0"} ``` ### Sanity check for Perseo @@ -166,7 +166,7 @@ ngsi version --host perseo.local --pretty "data": { "name": "perseo", "description": "IOT CEP front End", - "version": "1.27.0" + "version": "1.30.0" } } ``` @@ -185,7 +185,7 @@ ngsi version --host quantumleap.local ```json { - "version": "0.8.3-dev" + "version": "1.0.0" } ``` @@ -221,10 +221,10 @@ ngsi version --host iotagent.local --pretty ```json { - "libVersion": "3.2.0", + "libVersion": "4.4.0", "port": "4041", "baseRoot": "/", - "version": "2.2.0" + "version": "3.4.0" } ``` @@ -242,10 +242,10 @@ ngsi version --host iotagent.local --pretty ```json { - "libVersion": "3.2.0", + "libVersion": "4.4.0", "port": "4041", "baseRoot": "/", - "version": "2.2.0" + "version": "3.4.0" } ``` diff --git a/docs/en/examples/comet.md b/docs/en/examples/comet.md index 1785063..1dcf238 100644 --- a/docs/en/examples/comet.md +++ b/docs/en/examples/comet.md @@ -42,7 +42,7 @@ ngsi version --host comet.local #### Response: ```json -{"version":"2.10.0"} +{"version":"2.11.0"} ``` ### Subscribing to Context Changes @@ -246,7 +246,7 @@ ngsi version --host cygnus.local --pretty ```json { "success": "true", - "version": "2.10.0.5bb41dfcca1e25db664850e6b7806e3cf6a2aa7b" + "version": "3.8.0.f62eff701c01df1f708e0c9484e48e7b9bd9b1ed" } ``` diff --git a/docs/en/examples/cygnus.md b/docs/en/examples/cygnus.md index d88a15d..954c05b 100644 --- a/docs/en/examples/cygnus.md +++ b/docs/en/examples/cygnus.md @@ -29,7 +29,7 @@ ngsi version --host cygnus.local --pretty ```json { "success": "true", - "version": "3.2.0.9b21eae9095e3250ba8799e61411905d1c756191" + "version": "3.8.0.f62eff701c01df1f708e0c9484e48e7b9bd9b1ed" } ``` diff --git a/docs/en/examples/iotagent-json.md b/docs/en/examples/iotagent-json.md index 291dbc6..0f14856 100644 --- a/docs/en/examples/iotagent-json.md +++ b/docs/en/examples/iotagent-json.md @@ -40,10 +40,10 @@ ngsi version --host iotagent-json.local --pretty ```json { - "libVersion": "3.2.0", + "libVersion": "4.4.0", "port": "4041", "baseRoot": "/", - "version": "2.2.0" + "version": "3.4.0" } ``` diff --git a/docs/en/examples/iotagent-ul.md b/docs/en/examples/iotagent-ul.md index 2e4c124..a06d9d2 100644 --- a/docs/en/examples/iotagent-ul.md +++ b/docs/en/examples/iotagent-ul.md @@ -40,10 +40,10 @@ ngsi version --host iotagent-ul.local --pretty ```json { - "libVersion": "3.2.0", + "libVersion": "4.4.0", "port": "4041", "baseRoot": "/", - "version": "2.2.0" + "version": "3.4.0" } ``` diff --git a/docs/en/examples/orion.md b/docs/en/examples/orion.md index 3670c93..678372d 100644 --- a/docs/en/examples/orion.md +++ b/docs/en/examples/orion.md @@ -26,24 +26,24 @@ ngsi version --host orion.local ```json { "orion" : { - "version" : "3.10.1", - "uptime" : "0 d, 0 h, 0 m, 26 s", - "git_hash" : "9a80e06abe7f690901cf1586377acec02d40e303", - "compile_time" : "Mon Jun 12 16:55:20 UTC 2023", + "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", "compiled_by" : "root", "compiled_in" : "buildkitsandbox", - "release_date" : "Mon Jun 12 16:55:20 UTC 2023", - "machine" : "x86_64", - "doc" : "https://fiware-orion.rtfd.io/en/3.10.1/", + "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.74.0 OpenSSL/1.1.1n zlib/1.2.12 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", + "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": "1.1", + "openssl": "3.0.11", "rapidjson": "1.1.0", - "mongoc": "1.23.1", - "bson": "1.23.1" + "mongoc": "1.24.3", + "bson": "1.24.3" } } } diff --git a/docs/en/examples/perseo.md b/docs/en/examples/perseo.md index fd15207..bf3effd 100644 --- a/docs/en/examples/perseo.md +++ b/docs/en/examples/perseo.md @@ -28,7 +28,7 @@ ngsi version --host perseo.local --pretty "data": { "name": "perseo", "description": "IOT CEP front End", - "version": "1.27.0" + "version": "1.30.0" } } ``` diff --git a/docs/en/examples/quantumleap.md b/docs/en/examples/quantumleap.md index 07efa11..e29d817 100644 --- a/docs/en/examples/quantumleap.md +++ b/docs/en/examples/quantumleap.md @@ -27,7 +27,7 @@ ngsi version --host quantumleap.local ```json { - "version": "0.8.3-dev" + "version": "1.0.0" } ``` diff --git a/docs/en/index.md b/docs/en/index.md index bd9fe8c..709bfb2 100644 --- a/docs/en/index.md +++ b/docs/en/index.md @@ -12,6 +12,7 @@
[![Ubuntu 20.04](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-20.04.yml/badge.svg)](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-20.04.yml) [![Ubuntu 22.04](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-22.04.yml/badge.svg)](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-22.04.yml) +[![Ubuntu 24.04](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-24.04.yml/badge.svg)](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-24.04.yml)
The FIWARE Small Bang is a turnkey solution for setting up a FIWARE instance on your local machine. @@ -44,6 +45,7 @@ FI-SB stands for FIWARE Small Bang. ## Requirements - Supported Linux distribution + - Ubuntu 24.04 LTS (x86_64, aarch64) - Ubuntu 22.04 LTS (x86_64, aarch64) - Ubuntu 20.04 LTS - Raspberry Pi OS (aarc64) @@ -65,13 +67,13 @@ Before running the setup script, you need to install docker and docker compose p Download a tar.gz file for the FIWARE Small Bang. ```bash -curl -sL https://github.com/lets-fiware/FIWARE-Small-Bang/releases/download/v0.4.0/FIWARE-Small-Bang-0.4.0.tar.gz | tar zxf - +curl -sL https://github.com/lets-fiware/FIWARE-Small-Bang/releases/download/v0.5.0/FIWARE-Small-Bang-0.5.0.tar.gz | tar zxf - ``` -Move to the `FIWARE-Small-Bang-0.4.0` directory. +Move to the `FIWARE-Small-Bang-0.5.0` directory. ```bash -cd FIWARE-Small-Bang-0.4.0/ +cd FIWARE-Small-Bang-0.5.0/ ``` Run the `setup-fiware.sh` script. @@ -90,5 +92,5 @@ Run the `setup-fiware.sh` script. ## Copyright and License -Copyright (c) 2023 Kazuhito Suda
+Copyright (c) 2023-2024 Kazuhito Suda
Licensed under the [MIT License](./LICENSE). diff --git a/docs/en/installation.md b/docs/en/installation.md index 5cc27c3..c3efe23 100644 --- a/docs/en/installation.md +++ b/docs/en/installation.md @@ -21,13 +21,13 @@ Before running the setup script, you need to install docker and docker compose p Download a tar.gz file for the FIWARE Small Bang. ```bash -curl -sL https://github.com/lets-fiware/FIWARE-Small-Bang/releases/download/v0.4.0/FIWARE-Small-Bang-0.4.0.tar.gz | tar zxf - +curl -sL https://github.com/lets-fiware/FIWARE-Small-Bang/releases/download/v0.5.0/FIWARE-Small-Bang-0.5.0.tar.gz | tar zxf - ``` -Move to the `FIWARE-Small-Bang-0.4.0` directory. +Move to the `FIWARE-Small-Bang-0.5.0` directory. ```bash -cd FIWARE-Small-Bang-0.4.0/ +cd FIWARE-Small-Bang-0.5.0/ ``` Run the `setup-fiware.sh` script. diff --git a/docs/ja/after-installation.md b/docs/ja/after-installation.md index aefbca8..523d7f2 100644 --- a/docs/ja/after-installation.md +++ b/docs/ja/after-installation.md @@ -98,24 +98,24 @@ ngsi version --host orion.local ```json { "orion" : { - "version" : "3.10.1", - "uptime" : "0 d, 0 h, 0 m, 26 s", - "git_hash" : "9a80e06abe7f690901cf1586377acec02d40e303", - "compile_time" : "Mon Jun 12 16:55:20 UTC 2023", + "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", "compiled_by" : "root", "compiled_in" : "buildkitsandbox", - "release_date" : "Mon Jun 12 16:55:20 UTC 2023", - "machine" : "x86_64", - "doc" : "https://fiware-orion.rtfd.io/en/3.10.1/", + "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.74.0 OpenSSL/1.1.1n zlib/1.2.12 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", + "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": "1.1", + "openssl": "3.0.11", "rapidjson": "1.1.0", - "mongoc": "1.23.1", - "bson": "1.23.1" + "mongoc": "1.24.3", + "bson": "1.24.3" } } } @@ -136,7 +136,7 @@ ngsi version --host cygnus.local --pretty ```json { "success": "true", - "version": "3.2.0.9b21eae9095e3250ba8799e61411905d1c756191" + "version": "3.8.0.f62eff701c01df1f708e0c9484e48e7b9bd9b1ed" } ``` @@ -155,7 +155,7 @@ ngsi version --host comet.local #### レスポンス: ```json -{"version":"2.10.0"} +{"version":"2.11.0"} ``` @@ -178,7 +178,7 @@ ngsi version --host perseo.local --pretty "data": { "name": "perseo", "description": "IOT CEP front End", - "version": "1.27.0" + "version": "1.30.0" } } ``` @@ -199,7 +199,7 @@ ngsi version --host quantumleap.local ```json { - "version": "0.8.3-dev" + "version": "1.0.0" } ``` @@ -239,10 +239,10 @@ ngsi version --host iotagent-ul.local --pretty ```json { - "libVersion": "3.2.0", + "libVersion": "4.4.0", "port": "4041", "baseRoot": "/", - "version": "2.2.0" + "version": "3.4.0" } ``` @@ -262,10 +262,10 @@ ngsi version --host iotagent-json.local --pretty ```json { - "libVersion": "3.2.0", + "libVersion": "4.4.0", "port": "4041", "baseRoot": "/", - "version": "2.2.0" + "version": "3.4.0" } ``` diff --git a/docs/ja/examples/comet.md b/docs/ja/examples/comet.md index ca5ad69..a0e1580 100644 --- a/docs/ja/examples/comet.md +++ b/docs/ja/examples/comet.md @@ -46,7 +46,7 @@ ngsi version --host comet.local #### レスポンス: ```json -{"version":"2.10.0"} +{"version":"2.11.0"} ``` @@ -266,7 +266,7 @@ ngsi version --host cygnus.local --pretty ```json { "success": "true", - "version": "2.10.0.5bb41dfcca1e25db664850e6b7806e3cf6a2aa7b" + "version": "3.8.0.f62eff701c01df1f708e0c9484e48e7b9bd9b1ed" } ``` diff --git a/docs/ja/examples/cygnus.md b/docs/ja/examples/cygnus.md index d792681..dad317d 100644 --- a/docs/ja/examples/cygnus.md +++ b/docs/ja/examples/cygnus.md @@ -32,7 +32,7 @@ ngsi version --host cygnus.local --pretty ```json { "success": "true", - "version": "3.2.0.9b21eae9095e3250ba8799e61411905d1c756191" + "version": "3.8.0.f62eff701c01df1f708e0c9484e48e7b9bd9b1ed" } ``` diff --git a/docs/ja/examples/iotagent-json.md b/docs/ja/examples/iotagent-json.md index 129e5e8..5177e29 100644 --- a/docs/ja/examples/iotagent-json.md +++ b/docs/ja/examples/iotagent-json.md @@ -42,10 +42,10 @@ ngsi version --host iotagent-json.local --pretty ```json { - "libVersion": "3.2.0", + "libVersion": "4.4.0", "port": "4041", "baseRoot": "/", - "version": "2.2.0" + "version": "3.4.0" } ``` diff --git a/docs/ja/examples/iotagent-ul.md b/docs/ja/examples/iotagent-ul.md index 4c02300..022d8b0 100644 --- a/docs/ja/examples/iotagent-ul.md +++ b/docs/ja/examples/iotagent-ul.md @@ -42,10 +42,10 @@ ngsi version --host iotagent-ul.local --pretty ```json { - "libVersion": "3.2.0", + "libVersion": "4.4.0", "port": "4041", "baseRoot": "/", - "version": "2.2.0" + "version": "3.4.0" } ``` diff --git a/docs/ja/examples/orion.md b/docs/ja/examples/orion.md index 4312dd6..4334893 100644 --- a/docs/ja/examples/orion.md +++ b/docs/ja/examples/orion.md @@ -28,24 +28,24 @@ ngsi version --host orion.local ```json { "orion" : { - "version" : "3.10.1", - "uptime" : "0 d, 0 h, 0 m, 26 s", - "git_hash" : "9a80e06abe7f690901cf1586377acec02d40e303", - "compile_time" : "Mon Jun 12 16:55:20 UTC 2023", + "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", "compiled_by" : "root", "compiled_in" : "buildkitsandbox", - "release_date" : "Mon Jun 12 16:55:20 UTC 2023", - "machine" : "x86_64", - "doc" : "https://fiware-orion.rtfd.io/en/3.10.1/", + "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.74.0 OpenSSL/1.1.1n zlib/1.2.12 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", + "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": "1.1", + "openssl": "3.0.11", "rapidjson": "1.1.0", - "mongoc": "1.23.1", - "bson": "1.23.1" + "mongoc": "1.24.3", + "bson": "1.24.3" } } } diff --git a/docs/ja/examples/perseo.md b/docs/ja/examples/perseo.md index ff944f1..743e5a5 100644 --- a/docs/ja/examples/perseo.md +++ b/docs/ja/examples/perseo.md @@ -30,7 +30,7 @@ ngsi version --host perseo.local --pretty "data": { "name": "perseo", "description": "IOT CEP front End", - "version": "1.27.0" + "version": "1.30.0" } } ``` diff --git a/docs/ja/examples/quantumleap.md b/docs/ja/examples/quantumleap.md index 6010c89..ff9c90c 100644 --- a/docs/ja/examples/quantumleap.md +++ b/docs/ja/examples/quantumleap.md @@ -29,7 +29,7 @@ ngsi version --host quantumleap.local ```json { - "version": "0.8.3-dev" + "version": "1.0.0" } ``` diff --git a/docs/ja/index.md b/docs/ja/index.md index 8c6f731..b57e683 100644 --- a/docs/ja/index.md +++ b/docs/ja/index.md @@ -12,6 +12,7 @@
[![Ubuntu 20.04](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-20.04.yml/badge.svg)](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-20.04.yml) [![Ubuntu 22.04](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-22.04.yml/badge.svg)](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-22.04.yml) +[![Ubuntu 24.04](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-24.04.yml/badge.svg)](https://github.com/lets-fiware/FIWARE-Small-Bang/actions/workflows/ubuntu-24.04.yml)
FIWARE Small Bang は、ローカル・マシンに FIWARE インスタンスをセットアップするためのターンキー・ソリューションです。 @@ -44,6 +45,7 @@ FI-SB は FIWARE Small Bang の略称です。 ## 要件 - サポートしている Linux ディストリビューション + - Ubuntu 24.04 LTS (x86_64, aarch64) - Ubuntu 22.04 LTS (x86_64, aarch64) - Ubuntu 20.04 LTS - Raspberry Pi OS (aarc64) @@ -65,13 +67,13 @@ FI-SB は FIWARE Small Bang の略称です。 FIWARE Small Bang の tar.gz ファイルをダウンロードします。 ```bash -curl -sL https://github.com/lets-fiware/FIWARE-Small-Bang/releases/download/v0.4.0/FIWARE-Small-Bang-0.4.0.tar.gz | tar zxf - +curl -sL https://github.com/lets-fiware/FIWARE-Small-Bang/releases/download/v0.5.0/FIWARE-Small-Bang-0.5.0.tar.gz | tar zxf - ``` -`FIWARE-Small-Bang-0.4.0` ディレクトリに移動します。 +`FIWARE-Small-Bang-0.5.0` ディレクトリに移動します。 ```bash -cd FIWARE-Small-Bang-0.4.0/ +cd FIWARE-Small-Bang-0.5.0/ ``` `setup-fiware.sh` スクリプトを実行します。 @@ -90,5 +92,5 @@ cd FIWARE-Small-Bang-0.4.0/ ## Copyright and License -Copyright (c) 2023 Kazuhito Suda
+Copyright (c) 2023-2024 Kazuhito Suda
Licensed under the MIT License. diff --git a/docs/ja/installation.md b/docs/ja/installation.md index 4e1aedb..48ff2b9 100644 --- a/docs/ja/installation.md +++ b/docs/ja/installation.md @@ -25,13 +25,13 @@ FIWARE Small Bang の tar.gz ファイルをダウンロードします。 ```bash -curl -sL https://github.com/lets-fiware/FIWARE-Small-Bang/releases/download/v0.4.0/FIWARE-Small-Bang-0.4.0.tar.gz | tar zxf - +curl -sL https://github.com/lets-fiware/FIWARE-Small-Bang/releases/download/v0.5.0/FIWARE-Small-Bang-0.5.0.tar.gz | tar zxf - ``` -`FIWARE-Small-Bang-0.4.0` ディレクトリに移動します。 +`FIWARE-Small-Bang-0.5.0` ディレクトリに移動します。 ```bash -cd FIWARE-Small-Bang-0.4.0/ +cd FIWARE-Small-Bang-0.5.0/ ``` `setup-fiware.sh` スクリプトを実行します。 diff --git a/maintenance/release.sh b/maintenance/release.sh index 44522eb..8390df1 100755 --- a/maintenance/release.sh +++ b/maintenance/release.sh @@ -2,7 +2,7 @@ # MIT License # -# Copyright (c) 2023 Kazuhito Suda +# Copyright (c) 2023-2024 Kazuhito Suda # # This file is part of FIWARE Small Bang # @@ -75,7 +75,7 @@ RES=$(curl -X POST \ DIR="${NAME}-${TAG//v/}" mkdir "${DIR}" -for FILE in LICENSE README.md config.sh setup-fiware.sh +for FILE in LICENSE README.md config.sh .config.sh setup-fiware.sh do cp -a "${FILE}" "${DIR}/" done diff --git a/maintenance/version-up.sh b/maintenance/version-up.sh index 2c7410b..4744f0a 100755 --- a/maintenance/version-up.sh +++ b/maintenance/version-up.sh @@ -3,7 +3,7 @@ set -ue # MIT License # -# Copyright (c) 2023 Kazuhito Suda +# Copyright (c) 2023-2024 Kazuhito Suda # # This file is part of FIWARE Small Bang # diff --git a/setup-fiware.sh b/setup-fiware.sh index b078ff8..17adb69 100755 --- a/setup-fiware.sh +++ b/setup-fiware.sh @@ -2,7 +2,7 @@ # MIT License # -# Copyright (c) 2023 Kazuhito Suda +# Copyright (c) 2023-2024 Kazuhito Suda # # This file is part of FIWARE Small Bang # @@ -28,7 +28,7 @@ set -Ceuo pipefail -VERSION=0.4.0 +VERSION=0.5.0 # # Syslog info @@ -309,16 +309,16 @@ get_config_sh() { # Set amd64(x86_64) images # set_amd64_images() { - IMAGE_ORION=telefonicaiot/fiware-orion:3.10.1 + IMAGE_ORION=telefonicaiot/fiware-orion:3.12.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.10.0 - IMAGE_CYGNUS=telefonicaiot/fiware-cygnus:3.2.0 - IMAGE_IOTAGENT_UL=telefonicaiot/iotagent-ul:2.4.2 - IMAGE_IOTAGENT_JSON=telefonicaiot/iotagent-json:2.4.2 - IMAGE_QUANTUMLEAP=orchestracities/quantumleap:0.8.3 + IMAGE_COMET=telefonicaiot/fiware-sth-comet:2.11.0 + IMAGE_CYGNUS=telefonicaiot/fiware-cygnus:3.8.0 + IMAGE_IOTAGENT_UL=telefonicaiot/iotagent-ul:3.4.0 + IMAGE_IOTAGENT_JSON=telefonicaiot/iotagent-json:3.4.0 + IMAGE_QUANTUMLEAP=orchestracities/quantumleap:1.0.0 IMAGE_PERSEO_CORE=telefonicaiot/perseo-core:1.13.0 - IMAGE_PERSEO_FE=telefonicaiot/perseo-fe:1.27.0 + IMAGE_PERSEO_FE=telefonicaiot/perseo-fe:1.30.0 IMAGE_ELASTICSEARCH=elasticsearch:2.4 } @@ -326,16 +326,16 @@ set_amd64_images() { # Set arm64 images # set_arm64_images() { - IMAGE_ORION=letsfiware/orion:3.10.1 + IMAGE_ORION=letsfiware/orion:3.12.0 IMAGE_WIRECLOUD=letsfiware/wirecloud:1.3.1 IMAGE_NGSIPROXY=letsfiware/ngsiproxy:1.2.2 - IMAGE_COMET=letsfiware/sth-comet:2.10.0 - IMAGE_CYGNUS=letsfiware/fiware-cygnus:3.2.0 - IMAGE_IOTAGENT_UL=letsfiware/iotagent-ul:2.4.2 - IMAGE_IOTAGENT_JSON=letsfiware/iotagent-json:2.4.2 - IMAGE_QUANTUMLEAP=letsfiware/quantumleap:latest + IMAGE_COMET=letsfiware/sth-comet:2.11.0 + IMAGE_CYGNUS=letsfiware/fiware-cygnus:3.8.0 + IMAGE_IOTAGENT_UL=letsfiware/iotagent-ul:3.4.0 + IMAGE_IOTAGENT_JSON=letsfiware/iotagent-json:3.4.0 + IMAGE_QUANTUMLEAP=letsfiware/quantumleap:1.0.0 IMAGE_PERSEO_CORE=letsfiware/perseo-core:1.13.0 - IMAGE_PERSEO_FE=letsfiware/perseo-fe:1.27.0 + IMAGE_PERSEO_FE=letsfiware/perseo-fe:1.30.0 IMAGE_ELASTICSEARCH=letsfiware/elasticsearch:2.4 } @@ -399,7 +399,7 @@ EOF IMAGE_ELASTICSEARCH_DB=elasticsearch:7.17.13 - IMAGE_NODE_RED=letsfiware/node-red:v0.4.0 + IMAGE_NODE_RED=letsfiware/node-red:v0.5.0 MONGO_INSTALLED=false POSTGRES_INSTALLED=false @@ -669,7 +669,6 @@ init_docker_compose_yml() { logging_info "${FUNCNAME[0]}" cat <<'EOF' > "${DOCKER_COMPOSE_YML}" -version: "3" services: EOF } @@ -1535,7 +1534,7 @@ setup_node_red() { mkdir "${NODE_RED_DIR}" cat <<'EOF' > "${NODE_RED_DIR}"/Dockerfile -FROM nodered/node-red:3.1.0 +FROM nodered/node-red:3.1.9 RUN \ npm i node-red-contrib-letsfiware-ngsi diff --git a/tests/script/lint-config.sh b/tests/script/lint-config.sh index 25ebfb0..bcbc2a7 100755 --- a/tests/script/lint-config.sh +++ b/tests/script/lint-config.sh @@ -2,7 +2,7 @@ # MIT License # -# Copyright (c) 2023 Kazuhito Suda +# Copyright (c) 2023-2024 Kazuhito Suda # # This file is part of FIWARE Small Bang # @@ -31,6 +31,9 @@ set -ue cd "$(dirname "$0")" cd ../.. +echo "*** diff config.sh .config.sh ***" +diff config.sh .config.sh + . ./config.sh for NAME in CYGNUS_MONGO CYGNUS_MYSQL CYGNUS_POSTGRES CYGNUS_ELASTICSEARCH ELASTICSEARCH_PASSWORD MYSQL_ROOT_PASSWORD POSTGRES_PASSWORD COMET QUANTUMLEAP PERSEO WIRECLOUD IOTAGENT_UL IOTAGENT_JSON IOTAGENT_HTTP IOTAGENT_MQTT NODE_RED START_CONTAINER diff --git a/tests/script/lint-docs.sh b/tests/script/lint-docs.sh index bdf278c..d7b158e 100755 --- a/tests/script/lint-docs.sh +++ b/tests/script/lint-docs.sh @@ -2,7 +2,7 @@ # MIT License # -# Copyright (c) 2023 Kazuhito Suda +# Copyright (c) 2023-2024 Kazuhito Suda # # This file is part of FIWARE Small Bang # diff --git a/tests/script/lint-shellcheck.sh b/tests/script/lint-shellcheck.sh index 77d1a5c..19fd8cf 100755 --- a/tests/script/lint-shellcheck.sh +++ b/tests/script/lint-shellcheck.sh @@ -2,7 +2,7 @@ # MIT License # -# Copyright (c) 2023 Kazuhito Suda +# Copyright (c) 2023-2024 Kazuhito Suda # # This file is part of FIWARE Small Bang # diff --git a/tests/script/lint.sh b/tests/script/lint.sh index de88dd3..e0dbf42 100755 --- a/tests/script/lint.sh +++ b/tests/script/lint.sh @@ -2,7 +2,7 @@ # MIT License # -# Copyright (c) 2023 Kazuhito Suda +# Copyright (c) 2023-2024 Kazuhito Suda # # This file is part of FIWARE Small Bang # diff --git a/tests/script/setup_test.sh b/tests/script/setup_test.sh index cb432d0..6c4918d 100755 --- a/tests/script/setup_test.sh +++ b/tests/script/setup_test.sh @@ -2,7 +2,7 @@ # MIT License # -# Copyright (c) 2023 Kazuhito Suda +# Copyright (c) 2023-2024 Kazuhito Suda # # This file is part of FIWARE Small Bang # diff --git a/tests/tools/mdlint/Dockerfile b/tests/tools/mdlint/Dockerfile index c1f81a4..7604fad 100644 --- a/tests/tools/mdlint/Dockerfile +++ b/tests/tools/mdlint/Dockerfile @@ -1,6 +1,6 @@ # MIT License # -# Copyright (c) 2023 Kazuhito Suda +# Copyright (c) 2023-2024 Kazuhito Suda # # This file is part of FIWARE Small Bang # diff --git a/tests/tools/mdlint/Makefile b/tests/tools/mdlint/Makefile index 30ff8b8..6bd110c 100644 --- a/tests/tools/mdlint/Makefile +++ b/tests/tools/mdlint/Makefile @@ -1,6 +1,6 @@ # MIT License # -# Copyright (c) 2023 Kazuhito Suda +# Copyright (c) 2023-2024 Kazuhito Suda # # This file is part of FIWARE Small Bang # diff --git a/tests/tools/textlint/Dockerfile b/tests/tools/textlint/Dockerfile index 35c2e38..7384a1a 100644 --- a/tests/tools/textlint/Dockerfile +++ b/tests/tools/textlint/Dockerfile @@ -1,6 +1,6 @@ # MIT License # -# Copyright (c) 2023 Kazuhito Suda +# Copyright (c) 2023-2024 Kazuhito Suda # # This file is part of FIWARE Small Bang # diff --git a/tests/tools/textlint/Makefile b/tests/tools/textlint/Makefile index 9c9e4f3..1702616 100644 --- a/tests/tools/textlint/Makefile +++ b/tests/tools/textlint/Makefile @@ -1,6 +1,6 @@ # MIT License # -# Copyright (c) 2023 Kazuhito Suda +# Copyright (c) 2023-2024 Kazuhito Suda # # This file is part of FIWARE Small Bang #