Update docker-compose

.env

@@ -0,0 +1,15 @@
+# Project name
+COMPOSE_PROJECT_NAME=fiware
+EXPOSED_PORT=1026
+
+  # Hashicorp vault as a wallet
+VAULT_IMAGE=quay.io/fiware/vault-ethereum:1.0.1
+
+# Orion LD variables
+ORION_LD_PORT=1026
+ORION_IMAGE=quay.io/fiware/orion-ld:1.7.1
+EXPOSED_PORT=1026
+
+# Mongo DB is used by Orion
+MONGO_DB_VERSION=mongo:6.0
+MONGO_DB_PORT=27017

.github/workflows/it.yml

@@ -26,7 +26,7 @@ jobs:
         CANISMAJOR_IMAGE: quay.io/fiware/canis-major
       run: |
         cd it/docker-compose
-        docker-compose -f docker-compose-env.yaml -f docker-compose-java.yaml up -d
+        docker compose -f docker-compose-env.yaml -f docker-compose-java.yaml up -d
 
     - name: Extract Branch Name
       run: echo "BRANCH=$(echo ${GITHUB_REF##*/})" >> $GITHUB_ENV
@@ -53,7 +53,7 @@ jobs:
       if: ${{ failure() }}
       run: |
         cd it/docker-compose
-        docker-compose -f docker-compose-env.yaml -f docker-compose-java.yaml logs
+        docker compose -f docker-compose-env.yaml -f docker-compose-java.yaml logs
 
 ## skipped due to flakiness of the test node
 #  it-forward-proxy-best-effort:
@@ -145,7 +145,7 @@ jobs:
         sudo ./iptables.sh
         # workaround to enable strict mode, without changing the base
         sed -i 's/false/true/g' initial-config/listener.yaml
-        docker-compose up -d
+        docker compose up -d
 
     - name: Extract Branch Name
       run: echo "BRANCH=$(echo ${GITHUB_REF##*/})" >> $GITHUB_ENV
@@ -172,4 +172,4 @@ jobs:
       if: ${{ failure() }}
       run: |
         cd proxy/docker-compose/
-        docker-compose logs
+        docker compose logs

.github/workflows/pre-release.yml

@@ -117,7 +117,7 @@ jobs:
           docker build -f proxy/Dockerfile-build . -t build
           docker run -u root -v $(pwd)/proxy/cm-forward-filter:/cm-forward-filter --workdir /cm-forward-filter build tinygo build -o cm-forward-filter.wasm -target=wasi ./main.go     
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: cm-forward-filter
           path: proxy/cm-forward-filter/cm-forward-filter.wasm

README.md

@@ -27,19 +27,34 @@ send the transactions and provide the Wallet-Information. CanisMajor will create
 and include it as data into the transaction for the Blockchain. In order to properly sign the transaction, CanisMajor uses the provided Wallet-Information and delegates the
 signing to the client's Wallet. The signed transaction is then put into the Oketh-compatible blockchain.
 
-## Testing 
+## Testing
 
 Run unit-tests via: ```mvn clean test```
 
 A set of integration tests (using [cucumber](https://cucumber.io/)) is available under [it/](./it). 
 To run them use:
+
 ```shell
     cd it
     docker-compose -f docker-compose/docker-compose-env.yaml -f docker-compose/docker-compose-java.yaml up
     mvn clean test
 ```
 
 
+The integration tests use the following values by default:
+
+| Variable | Value |
+| ---| --- |
+| `VAULT_IMAGE`|`quay.io/fiware/vault-ethereum:1.0.1` |
+| `ORION_IMAGE`|`quay.io/fiware/orion-ld:1.7.1` |
+| `ORION_LD_PORT`|`1026` |
+| `EXPOSED_PORT`|`1026` |
+| `MONGO_DB_VERSION`|`mongo:6.0` |
+| `MONGO_DB_PORT`|`27017` |
+
+Additionally `NGSI_ADDRESS=localhost:4000` should be set if running locally.
+
+
 
 ## ADRs
 
@@ -50,4 +65,4 @@ To run them use:
 
 CanisMajor is licensed under the Apache License, Version 2.0. See [LICENSE](LICENSE) for the full license text.
 
-© 2021 FIWARE Foundation e.V.
+© 2021-2025 FIWARE Foundation e.V.