diff --git a/.env b/.env index 9ae5674..53f4d61 100644 --- a/.env +++ b/.env @@ -1,5 +1,6 @@ # Project name COMPOSE_PROJECT_NAME=fiware +EXPOSED_PORT=1026 # Orion variables ORION_LD_PORT=1026 @@ -16,6 +17,8 @@ SCORPIO_VERSION=4.1.1 # Stellio variables STELLIO_DOCKER_TAG=2.5.2 STELLIO_PORT=8080 +STELLIO_TIMESCALE_POSTGIS=14-2.11.1-3.3 + # IoT Agent Ultralight Variables ULTRALIGHT_VERSION=2.2.0-distroless diff --git a/README.ja.md b/README.ja.md index 88c6147..b6ec74c 100644 --- a/README.ja.md +++ b/README.ja.md @@ -402,7 +402,7 @@ git clone https://github.com/FIWARE/tutorials.IoT-Agent.git cd tutorials.IoT-Agent git checkout NGSI-LD -./services orion|scorpio +./services [orion|scorpio|stellio] ``` > :information_source: **注:** クリーンアップしてやり直す場合は、次のコマンドを実行してください diff --git a/README.md b/README.md index c546a8f..6993b96 100644 --- a/README.md +++ b/README.md @@ -381,7 +381,7 @@ git clone https://github.com/FIWARE/tutorials.IoT-Agent.git cd tutorials.IoT-Agent git checkout NGSI-LD -./services orion|scorpio +./services [orion|scorpio|stellio] ``` > :information_source: **Note:** If you want to clean up and start over again you can do so with the following command: diff --git a/docker-compose/orion-ld.yml b/docker-compose/orion-ld.yml index 0795072..aa774a4 100644 --- a/docker-compose/orion-ld.yml +++ b/docker-compose/orion-ld.yml @@ -30,7 +30,7 @@ services: networks: - default ports: - - "${ORION_LD_PORT}:${ORION_LD_PORT}" # localhost:1026 + - ${EXPOSED_PORT:-1026}:${ORION_LD_PORT:-1026} command: -dbhost mongo-db -logLevel DEBUG -forwarding -experimental healthcheck: test: curl --fail -s http://orion:${ORION_LD_PORT}/version || exit 1 diff --git a/docker-compose/scorpio-aaio.yml b/docker-compose/scorpio-aaio.yml index a3fdcb3..051f8b2 100644 --- a/docker-compose/scorpio-aaio.yml +++ b/docker-compose/scorpio-aaio.yml @@ -79,7 +79,7 @@ services: networks: - default ports: - - "${SCORPIO_PORT}:9090" + - ${EXPOSED_PORT:-1026}:${SCORPIO_PORT:-9090} depends_on: - postgres - kafka diff --git a/docker-compose/stellio.yml b/docker-compose/stellio.yml index 2e3dd88..7d91318 100644 --- a/docker-compose/stellio.yml +++ b/docker-compose/stellio.yml @@ -9,7 +9,7 @@ services: environment: - SPRING_PROFILES_ACTIVE=docker ports: - - "${STELLIO_PORT}:8080" + - ${EXPOSED_PORT:-1026}:${STELLIO_PORT:-9090} search-service: container_name: stellio-search-service @@ -82,7 +82,8 @@ services: postgres: labels: org.fiware: 'tutorial' - image: stellio/stellio-timescale-postgis:14-2.9.1-3.3 + image: stellio/stellio-timescale-postgis:${STELLIO_TIMESCALE_POSTGIS} + hostname: postgres container_name: db-postgres environment: diff --git a/services b/services index ea0a1d7..aa0f1c9 100755 --- a/services +++ b/services @@ -225,6 +225,7 @@ case "${command}" in export CONTEXT_BROKER=orion:1026 loadData waitForIoTAgent + echo -e "\033[1;34m${command}\033[0m is now running and exposed on localhost:${EXPOSED_PORT}" ;; "scorpio") export $(cat .env | grep "#" -v) @@ -244,6 +245,7 @@ case "${command}" in export CONTEXT_BROKER=scorpio:9090 loadData waitForIoTAgent + echo -e "\033[1;34m${command}\033[0m is now running and exposed on localhost:${EXPOSED_PORT}" ;; "stellio") export $(cat .env | grep "#" -v) @@ -263,6 +265,7 @@ case "${command}" in export CONTEXT_BROKER=stellio:8080 loadData waitForIoTAgent + echo -e "\033[1;34m${command}\033[0m is now running and exposed on localhost:${EXPOSED_PORT}" ;; "stop") export $(cat .env | grep "#" -v) @@ -270,7 +273,7 @@ case "${command}" in ;; "start") export $(cat .env | grep "#" -v) - ./services orion $2 + ./services ${CONTEXT_BROKER:=orion} $2 ;; "create") export $(cat .env | grep "#" -v)