Merge pull request #397 from fisuda/release/0.40.0

Bumps 0.39.0-next -> 0.40.0
lets-fiware · Jun 21, 2024 · 036e383 · 036e383
2 parents aa7b744 + cf56ab6
commit 036e383
Show file tree

Hide file tree

Showing 22 changed files with 166 additions and 44 deletions.
diff --git a/.config.sh b/.config.sh
@@ -27,7 +27,7 @@ IDM_DEBUG=false
 IMAGE_KEYROCK=letsfiware/fiware-idm:8.4.0
 
 # Docker image for Postfix
-IMAGE_POSTFIX=letsfiware/postfix:0.39.0
+IMAGE_POSTFIX=letsfiware/postfix:0.40.0
 
 #
 # Wilma
@@ -48,6 +48,31 @@ ORION=orion
 # Expose port 1026 (none, local, all) Default: none
 ORION_EXPOSE_PORT=
 
+# Enable cross-origin resource sharing (CORS) Default: false
+ORION_CORS=
+
+# Set Access-Control-Allow-Origin header for CORS
+#   Default: '*'
+set -f
+ORION_ACCESS_CONTROL_ALLOW_ORIGIN=
+set +f
+
+# Set Access-Control-Allow-Methods header for CORS
+#   Default: 'GET, POST, OPTIONS, DELETE, PUT, PATCH'
+ORION_ACCESS_CONTROL_ALLOW_METHODS=
+
+# Set Access-Control-Allow-Headers header for CORS
+#   Default: 'Origin, Content-Type, Accept, Authorization, X-Requested-With, fiware-service, fiware-servicepath'
+ORION_ACCESS_CONTROL_ALLOW_HEADERS=
+
+# Set Access-Control-Expose-Headers header for CORS
+#   Default: 'location, fiware-correlator'
+ORION_CONTROL_EXPOSE_HEADERS=
+
+# Set Access-Control-Max-Age header for CORS
+#   Default: 7200
+ORION_ACCESS_CONTROL_MAX_AGE=
+
 # Docker image for Orion
 IMAGE_ORION=telefonicaiot/fiware-orion:4.0.0
 
@@ -338,7 +363,7 @@ NODE_RED_LOGGING_METRICS=
 NODE_RED_LOGGING_AUDIT=
 
 # Docker image for Node-RED
-IMAGE_NODE_RED=letsfiware/node-red:0.39.0
+IMAGE_NODE_RED=letsfiware/node-red:0.40.0
 
 #
 # Grafana
@@ -364,7 +389,7 @@ ZEPPELIN=
 ZEPPELIN_DEBUG=
 
 # Docker image for Zeppelin
-IMAGE_ZEPPELIN=letsfiware/zeppelin:0.39.0
+IMAGE_ZEPPELIN=letsfiware/zeppelin:0.40.0
 
 #
 # Queryproxy
@@ -376,7 +401,7 @@ QUERYPROXY=
 QUERYPROXY_LOGLEVEL=info
 
 # Docker image for Queryproxy
-IMAGE_QUERYPROXY=letsfiware/queryproxy:0.39.0
+IMAGE_QUERYPROXY=letsfiware/queryproxy:0.40.0
 
 #
 # Tokenproxy
@@ -388,7 +413,7 @@ TOKENPROXY_LOGLEVEL=info
 TOKENPROXY_VERBOSE=
 
 # Docker image for Tokenproxy
-IMAGE_TOKENPROXY=letsfiware/tokenproxy:0.39.0
+IMAGE_TOKENPROXY=letsfiware/tokenproxy:0.40.0
 
 #
 # Regproxy
@@ -427,7 +452,7 @@ REGPROXY_LOGLEVEL=info
 REGPROXY_VERBOSE=false
 
 # Docker image for Regproxy
-IMAGE_REGPROXY=letsfiware/regproxy:0.39.0
+IMAGE_REGPROXY=letsfiware/regproxy:0.40.0
 
 #
 # MongoDB
@@ -463,7 +488,7 @@ IMAGE_POSTGRES=postgres:15
 IMAGE_NGINX=nginx:1.26
 
 # Docker image for pwgen
-IMAGE_PWGEN=letsfiware/pwgen:0.39.0
+IMAGE_PWGEN=letsfiware/pwgen:0.40.0
 
 #
 # Firewall (firewalld)

diff --git 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.39.0-next` branch.
+the `v0.40.0-next` branch.
 
 ## Types of changes
 
@@ -23,7 +23,7 @@ merging your code._
 -   \[ \] I have read the [CONTRIBUTING](https://github.com/lets-fiware/FIWARE-Big-Bang/blob/main/CONTRIBUTING.md) doc
 -   \[ \] I have signed the [CLA](https://github.com/lets-fiware/FIWARE-Big-Bang/blob/main/FIWARE-Big-Bang-individual-cla.pdf)
 -   \[ \] I have updated the change log (CHANGELOG.md)
--   \[ \] I send this pull request to the `v0.39.0-next` branch.
+-   \[ \] I send this pull request to the `v0.40.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/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## FIWARE Big Bang v0.40.0 - 21 June, 2024
+
+-   Update Node-RED to 4.0.0 (#395)
+-   Add cross-origin resource sharing for Orion (#394)
+-   Fix maintenance script (#393)
+
 ## FIWARE Big Bang v0.39.0 - 09 June, 2024
 
 -   Update Mongodb to 6.0 for Orion (#389)

diff --git 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.39.0-next` branch (not main branch).
+-   Send a pull request to the `v0.40.0-next` branch (not main branch).
 
 ## Community
 

diff --git a/README.ja.md b/README.ja.md
@@ -90,13 +90,13 @@ FI-BB は FIWARE Big Bang の略名です。
 FIWARE Big Bang の tar.gz ファイルをダウンロードします。
 
 ```bash
-curl -sL https://github.com/lets-fiware/FIWARE-Big-Bang/releases/download/v0.39.0/FIWARE-Big-Bang-0.39.0.tar.gz | tar zxf -
+curl -sL https://github.com/lets-fiware/FIWARE-Big-Bang/releases/download/v0.40.0/FIWARE-Big-Bang-0.40.0.tar.gz | tar zxf -
 ```
 
-`FIWARE-Big-Bang-0.39.0` ディレクトリに移動します。
+`FIWARE-Big-Bang-0.40.0` ディレクトリに移動します。
 
 ```bash
-cd FIWARE-Big-Bang-0.39.0/
+cd FIWARE-Big-Bang-0.40.0/
 ```
 
 独自のドメイン名とパブリック IP アドレスを指定して、`lets-fiware.sh` スクリプトを実行します。

diff --git a/README.md b/README.md
@@ -92,13 +92,13 @@ or CNAME records.
 Download a tar.gz file for the FIWARE Big Bang.
 
 ```bash
-curl -sL https://github.com/lets-fiware/FIWARE-Big-Bang/releases/download/v0.39.0/FIWARE-Big-Bang-0.39.0.tar.gz | tar zxf -
+curl -sL https://github.com/lets-fiware/FIWARE-Big-Bang/releases/download/v0.40.0/FIWARE-Big-Bang-0.40.0.tar.gz | tar zxf -
 ```
 
-Move to the `FIWARE-Big-Bang-0.39.0` directory.
+Move to the `FIWARE-Big-Bang-0.40.0` directory.
 
 ```bash
-cd FIWARE-Big-Bang-0.39.0/
+cd FIWARE-Big-Bang-0.40.0/
 ```
 
 Run the `lets-fiware.sh` script with your own domain name and a public IP address.

diff --git a/SECURITY.md b/SECURITY.md
@@ -4,8 +4,8 @@
 
 | Version  | Supported          |
 | -------- | ------------------ |
-| 0.39.0   | :white_check_mark: |
-| < 0.39.0 | :x:                |
+| 0.40.0   | :white_check_mark: |
+| < 0.40.0 | :x:                |
 
 ## Reporting a Vulnerability
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-VERSION=0.39.0
+VERSION=0.40.0
diff --git a/config.sh b/config.sh
@@ -27,7 +27,7 @@ IDM_DEBUG=false
 IMAGE_KEYROCK=letsfiware/fiware-idm:8.4.0
 
 # Docker image for Postfix
-IMAGE_POSTFIX=letsfiware/postfix:0.39.0
+IMAGE_POSTFIX=letsfiware/postfix:0.40.0
 
 #
 # Wilma
@@ -48,6 +48,31 @@ ORION=orion
 # Expose port 1026 (none, local, all) Default: none
 ORION_EXPOSE_PORT=
 
+# Enable cross-origin resource sharing (CORS) Default: false
+ORION_CORS=
+
+# Set Access-Control-Allow-Origin header for CORS
+#   Default: '*'
+set -f
+ORION_ACCESS_CONTROL_ALLOW_ORIGIN=
+set +f
+
+# Set Access-Control-Allow-Methods header for CORS
+#   Default: 'GET, POST, OPTIONS, DELETE, PUT, PATCH'
+ORION_ACCESS_CONTROL_ALLOW_METHODS=
+
+# Set Access-Control-Allow-Headers header for CORS
+#   Default: 'Origin, Content-Type, Accept, Authorization, X-Requested-With, fiware-service, fiware-servicepath'
+ORION_ACCESS_CONTROL_ALLOW_HEADERS=
+
+# Set Access-Control-Expose-Headers header for CORS
+#   Default: 'location, fiware-correlator'
+ORION_CONTROL_EXPOSE_HEADERS=
+
+# Set Access-Control-Max-Age header for CORS
+#   Default: 7200
+ORION_ACCESS_CONTROL_MAX_AGE=
+
 # Docker image for Orion
 IMAGE_ORION=telefonicaiot/fiware-orion:4.0.0
 
@@ -338,7 +363,7 @@ NODE_RED_LOGGING_METRICS=
 NODE_RED_LOGGING_AUDIT=
 
 # Docker image for Node-RED
-IMAGE_NODE_RED=letsfiware/node-red:0.39.0
+IMAGE_NODE_RED=letsfiware/node-red:0.40.0
 
 #
 # Grafana
@@ -364,7 +389,7 @@ ZEPPELIN=
 ZEPPELIN_DEBUG=
 
 # Docker image for Zeppelin
-IMAGE_ZEPPELIN=letsfiware/zeppelin:0.39.0
+IMAGE_ZEPPELIN=letsfiware/zeppelin:0.40.0
 
 #
 # Queryproxy
@@ -376,7 +401,7 @@ QUERYPROXY=
 QUERYPROXY_LOGLEVEL=info
 
 # Docker image for Queryproxy
-IMAGE_QUERYPROXY=letsfiware/queryproxy:0.39.0
+IMAGE_QUERYPROXY=letsfiware/queryproxy:0.40.0
 
 #
 # Tokenproxy
@@ -388,7 +413,7 @@ TOKENPROXY_LOGLEVEL=info
 TOKENPROXY_VERBOSE=
 
 # Docker image for Tokenproxy
-IMAGE_TOKENPROXY=letsfiware/tokenproxy:0.39.0
+IMAGE_TOKENPROXY=letsfiware/tokenproxy:0.40.0
 
 #
 # Regproxy
@@ -427,7 +452,7 @@ REGPROXY_LOGLEVEL=info
 REGPROXY_VERBOSE=false
 
 # Docker image for Regproxy
-IMAGE_REGPROXY=letsfiware/regproxy:0.39.0
+IMAGE_REGPROXY=letsfiware/regproxy:0.40.0
 
 #
 # MongoDB
@@ -463,7 +488,7 @@ IMAGE_POSTGRES=postgres:15
 IMAGE_NGINX=nginx:1.26
 
 # Docker image for pwgen
-IMAGE_PWGEN=letsfiware/pwgen:0.39.0
+IMAGE_PWGEN=letsfiware/pwgen:0.40.0
 
 #
 # Firewall (firewalld)

diff --git a/docs/en/installation/index.md b/docs/en/installation/index.md
@@ -92,13 +92,13 @@ or CNAME records.
 Download a tar.gz file for the FIWARE Big Bang.
 
 ```bash
-curl -sL https://github.com/lets-fiware/FIWARE-Big-Bang/releases/download/v0.39.0/FIWARE-Big-Bang-0.39.0.tar.gz | tar zxf -
+curl -sL https://github.com/lets-fiware/FIWARE-Big-Bang/releases/download/v0.40.0/FIWARE-Big-Bang-0.40.0.tar.gz | tar zxf -
 ```
 
-Move to the `FIWARE-Big-Bang-0.39.0` directory.
+Move to the `FIWARE-Big-Bang-0.40.0` directory.
 
 ```bash
-cd FIWARE-Big-Bang-0.39.0/
+cd FIWARE-Big-Bang-0.40.0/
 ```
 
 Run the `lets-fiware.sh` script with your own domain name and a public IP address.

diff --git a/docs/en/installation/orion.md b/docs/en/installation/orion.md
@@ -15,10 +15,16 @@
 
 You can specify configurations by editing the `config.sh` file.
 
-| Variable name       | Description                           | Default value |
-| ------------------- | ------------------------------------- | ------------- |
-| ORION               | A sub-domain name of Orion.           | orion         | 
-| ORION\_EXPOSE\_PORT | Expose port 1026. (none, local, all)  | none          |
+| Variable name                          | Description                                       | Default value                                                                                       |
+| -------------------------------------- | ------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
+| ORION                                  | A sub-domain name of Orion.                       | orion                                                                                               |
+| ORION\_EXPOSE\_PORT                    | Expose port 1026. (none, local, all)              | none                                                                                                |
+| ORION\_CORS                            | Enable cross-origin resource sharing (CORS)       | false                                                                                               |
+| ORION\_ACCESS\_CONTROL\_ALLOW\_ORIGIN  | Set Access-Control-Allow-Origin header for CORS   | '\*'                                                                                                |
+| ORION\_ACCESS\_CONTROL\_ALLOW\_METHODS | Set Access-Control-Allow-Methods header for CORS  | 'GET, POST, OPTIONS, DELETE, PUT, PATCH'                                                            |
+| ORION\_ACCESS\_CONTROL\_ALLOW\_HEADERS | Set Access-Control-Allow-Headers header for CORS  | 'Origin, Content-Type, Accept, Authorization, X-Requested-With, fiware-service, fiware-servicepath' |
+| ORION\_CONTROL\_EXPOSE\_HEADERS        | Set Access-Control-Expose-Headers header for CORS | 'location, fiware-correlator'                                                                       |
+| ORION\_ACCESS\_CONTROL\_MAX\_AGE       | Set Access-Control-Max-Age header for CORS        | 7200                                                                                                |
 
 ## How to setup
 

diff --git a/docs/ja/installation/index.md b/docs/ja/installation/index.md
@@ -100,13 +100,13 @@ FIWARE Big Bang によってインストールされた Web アプリケーシ
 FIWARE Big Bang の tar.gz ファイルをダウンロードします。
 
 ```bash
-curl -sL https://github.com/lets-fiware/FIWARE-Big-Bang/releases/download/v0.39.0/FIWARE-Big-Bang-0.39.0.tar.gz | tar zxf -
+curl -sL https://github.com/lets-fiware/FIWARE-Big-Bang/releases/download/v0.40.0/FIWARE-Big-Bang-0.40.0.tar.gz | tar zxf -
 ```
 
-`FIWARE-Big-Bang-0.39.0` ディレクトリに移動します。
+`FIWARE-Big-Bang-0.40.0` ディレクトリに移動します。
 
 ```bash
-cd FIWARE-Big-Bang-0.39.0/
+cd FIWARE-Big-Bang-0.40.0/
 ```
 
 独自のドメイン名とパブリック IP アドレスを指定して、`lets-fiware.sh` スクリプトを実行します。

diff --git a/docs/ja/installation/orion.md b/docs/ja/installation/orion.md
@@ -17,10 +17,16 @@
 
 `config.sh` ファイルを編集して構成を指定できます。
 
-| 変数名              | 説明                                                 | 既定値 |
-| ------------------- | ---------------------------------------------------- | ------ |
-| ORION               | Orion のサブドメイン名                               | orion  | 
-| ORION\_EXPOSE\_PORT | Orion のポート 1026 を公開。(none, local または all) | none   |
+| 変数名                                 | 説明                                                 | 既定値                                                                                              |
+| -------------------------------------- | ---------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
+| ORION                                  | Orion のサブドメイン名                               | orion                                                                                               |
+| ORION\_EXPOSE\_PORT                    | Orion のポート 1026 を公開。(none, local または all) | none                                                                                                |
+| ORION\_CORS                            | Cross-origin resource sharing (CORS) を有効化        | false                                                                                               |
+| ORION\_ACCESS\_CONTROL\_ALLOW\_ORIGIN  | CORS の Access-Control-Allow-Origin ヘッダを設定     | '\*'                                                                                                |
+| ORION\_ACCESS\_CONTROL\_ALLOW\_METHODS | CORS の Access-Control-Allow-Methods ヘッダを設定    | 'GET, POST, OPTIONS, DELETE, PUT, PATCH'                                                            |
+| ORION\_ACCESS\_CONTROL\_ALLOW\_HEADERS | CORS の Access-Control-Allow-Headers ヘッダを設定    | 'Origin, Content-Type, Accept, Authorization, X-Requested-With, fiware-service, fiware-servicepath' |
+| ORION\_CONTROL\_EXPOSE\_HEADERS        | CORS の Access-Control-Expose-Headers ヘッダを設定   | 'location, fiware-correlator'                                                                       |
+| ORION\_ACCESS\_CONTROL\_MAX\_AGE       | CORS の Access-Control-Max-Age header ヘッダを設定   | 7200                                                                                                |
 
 <a name="how-to-setup"></a>
 

diff --git a/extras/node-red/Dockerfile b/extras/node-red/Dockerfile
@@ -1,4 +1,4 @@
-FROM nodered/node-red:3.1.9
+FROM nodered/node-red:4.0.0
 
 #
 # Add node modules for Node-RED