Skip to content
Snippets Groups Projects
Verified Commit 11c4e90e authored by Malte Bauch's avatar Malte Bauch
Browse files

Revert "Fix: docker-compose is working again" 

This reverts commit f4b5b226.
parent f4b5b226
No related branches found
No related tags found
1 merge request!227Resolve "Receiver map is not updated correctly for key exchange"
This commit is part of merge request !227. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
config/controller/add_devices.sh
+ 2
− 5
View file @ 11c4e90e
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
## Note: This script does not clean up network elements already existing in the storage. Running it repeatedly will ## Note: This script does not clean up network elements already existing in the storage. Running it repeatedly will
## create a garbage storage. ## create a garbage storage.
GOSDNC_PATH="./gosdnc" GOSDNC_PATH="./artifacts/gosdnc"
GOSDN_ADDRESS="qkdn-controller:55055" GOSDN_ADDRESS="127.0.0.1:55055"
ADMINPW="TestPassword" ADMINPW="TestPassword"
KMS_PLUGIN="e404ecf7-4860-41ee-9cee-3dd6af6c5e2b" KMS_PLUGIN="e404ecf7-4860-41ee-9cee-3dd6af6c5e2b"
PND_UUID="5f20f34b-cbd0-4511-9ddc-c50cf6a3b49d" PND_UUID="5f20f34b-cbd0-4511-9ddc-c50cf6a3b49d"
...@@ -28,6 +28,3 @@ $GOSDNC_PATH mne create --address "kms01:7030" --name kms01 --password admin --p ...@@ -28,6 +28,3 @@ $GOSDNC_PATH mne create --address "kms01:7030" --name kms01 --password admin --p
$GOSDNC_PATH mne create --address "kms02:7030" --name kms02 --password admin --plugin-id $KMS_PLUGIN --username admin --uuid 5e41c291-6121-4335-84f6-41e04b8bdaa2 $GOSDNC_PATH mne create --address "kms02:7030" --name kms02 --password admin --plugin-id $KMS_PLUGIN --username admin --uuid 5e41c291-6121-4335-84f6-41e04b8bdaa2
$GOSDNC_PATH mne create --address "kms03:7030" --name kms03 --password admin --plugin-id $KMS_PLUGIN --username admin --uuid f80db2c0-2480-46b9-b7d1-b63f954e8227 $GOSDNC_PATH mne create --address "kms03:7030" --name kms03 --password admin --plugin-id $KMS_PLUGIN --username admin --uuid f80db2c0-2480-46b9-b7d1-b63f954e8227
$GOSDNC_PATH mne create --address "kms04:7030" --name kms03 --password admin --plugin-id $KMS_PLUGIN --username admin --uuid 968fd594-b0e7-41f0-ba4b-de259047a933 $GOSDNC_PATH mne create --address "kms04:7030" --name kms03 --password admin --plugin-id $KMS_PLUGIN --username admin --uuid 968fd594-b0e7-41f0-ba4b-de259047a933
## Add additional user for an app
$GOSDNC_PATH user create --u app --p TestApp --r app
config/controller/qkdn-gosdn.toml
+ 1
− 1
View file @ 11c4e90e
...@@ -15,5 +15,5 @@ log-level = 'debug' ...@@ -15,5 +15,5 @@ log-level = 'debug'
nogrpcpassthrough = false nogrpcpassthrough = false
plugin-folder = 'plugins' plugin-folder = 'plugins'
plugin-registry = 'plugin-registry:55057' plugin-registry = 'plugin-registry:55057'
security = 'insecure' security = 'secure'
socket = ':55055' socket = ':55055'
docker-compose.yml
+ 127
− 131
View file @ 11c4e90e
services: services:
kms01: kms01:
image: gokms image: gokms
command: command: ["--log", "debug", "--kms_config", "/tmp/kms/config/kms01.yaml"]
["--log", "debug", "--kms_config", "/tmp/kms/config/kms01.yaml"] volumes:
volumes: - ./config/goKMS/example01.yaml:/tmp/kms/config/kms01.yaml
- ./config/goKMS/example01.yaml:/tmp/kms/config/kms01.yaml - ./artifacts/ssl:/ssl
- ./artifacts/ssl:/ssl ports:
ports: - "127.0.0.1:4401:1337"
- "127.0.0.1:4401:1337" - "127.0.0.1:9696:9696"
- "127.0.0.1:9696:9696"
kms02:
kms02: image: gokms
image: gokms command: ["--log", "debug", "--kms_config", "/tmp/kms/config/kms02.yaml"]
command: volumes:
["--log", "debug", "--kms_config", "/tmp/kms/config/kms02.yaml"] - ./config/goKMS/example02.yaml:/tmp/kms/config/kms02.yaml
volumes: - ./artifacts/ssl:/ssl
- ./config/goKMS/example02.yaml:/tmp/kms/config/kms02.yaml ports:
- ./artifacts/ssl:/ssl - "127.0.0.1:4402:1337"
ports:
- "127.0.0.1:4402:1337" kms03:
image: gokms
kms03: command: ["--log", "debug", "--kms_config", "/tmp/kms/config/kms03.yaml"]
image: gokms volumes:
command: - ./config/goKMS/example03.yaml:/tmp/kms/config/kms03.yaml
["--log", "debug", "--kms_config", "/tmp/kms/config/kms03.yaml"] - ./artifacts/ssl:/ssl
volumes: ports:
- ./config/goKMS/example03.yaml:/tmp/kms/config/kms03.yaml - "127.0.0.1:4403:1337"
- ./artifacts/ssl:/ssl
ports: kms04:
- "127.0.0.1:4403:1337" image: gokms
command: ["--log", "debug", "--kms_config", "/tmp/kms/config/kms04.yaml"]
kms04: volumes:
image: gokms - ./config/goKMS/example04.yaml:/tmp/kms/config/kms04.yaml
command: - ./artifacts/ssl:/ssl
["--log", "debug", "--kms_config", "/tmp/kms/config/kms04.yaml"] ports:
volumes: - "127.0.0.1:4404:1337"
- ./config/goKMS/example04.yaml:/tmp/kms/config/kms04.yaml - "127.0.0.1:9697:9696"
- ./artifacts/ssl:/ssl
ports: qlayer01:
- "127.0.0.1:4404:1337" image: quantumlayer
- "127.0.0.1:9697:9696" command: ["--config", "/tmp/quantumlayer/config/quantumlayer01.yaml"]
volumes:
qlayer01: - ./config/quantumlayer/example01.yaml:/tmp/quantumlayer/config/quantumlayer01.yaml
image: quantumlayer
command: ["--config", "/tmp/quantumlayer/config/quantumlayer01.yaml"] qlayer02:
volumes: image: quantumlayer
- ./config/quantumlayer/example01.yaml:/tmp/quantumlayer/config/quantumlayer01.yaml command: ["--config", "/tmp/quantumlayer/config/quantumlayer02.yaml"]
volumes:
qlayer02: - ./config/quantumlayer/example02.yaml:/tmp/quantumlayer/config/quantumlayer02.yaml
image: quantumlayer
command: ["--config", "/tmp/quantumlayer/config/quantumlayer02.yaml"] qlayer03:
volumes: image: quantumlayer
- ./config/quantumlayer/example02.yaml:/tmp/quantumlayer/config/quantumlayer02.yaml command: ["--config", "/tmp/quantumlayer/config/quantumlayer03.yaml"]
volumes:
qlayer03: - ./config/quantumlayer/example03.yaml:/tmp/quantumlayer/config/quantumlayer03.yaml
image: quantumlayer
command: ["--config", "/tmp/quantumlayer/config/quantumlayer03.yaml"] qlayer04:
volumes: image: quantumlayer
- ./config/quantumlayer/example03.yaml:/tmp/quantumlayer/config/quantumlayer03.yaml command: ["--config", "/tmp/quantumlayer/config/quantumlayer04.yaml"]
volumes:
qlayer04: - ./config/quantumlayer/example04.yaml:/tmp/quantumlayer/config/quantumlayer04.yaml
image: quantumlayer
command: ["--config", "/tmp/quantumlayer/config/quantumlayer04.yaml"] qlayer05:
volumes: image: quantumlayer
- ./config/quantumlayer/example04.yaml:/tmp/quantumlayer/config/quantumlayer04.yaml command: ["--config", "/tmp/quantumlayer/config/quantumlayer05.yaml"]
volumes:
qlayer05: - ./config/quantumlayer/example05.yaml:/tmp/quantumlayer/config/quantumlayer05.yaml
image: quantumlayer
command: ["--config", "/tmp/quantumlayer/config/quantumlayer05.yaml"] qlayer06:
volumes: image: quantumlayer
- ./config/quantumlayer/example05.yaml:/tmp/quantumlayer/config/quantumlayer05.yaml command: ["--config", "/tmp/quantumlayer/config/quantumlayer06.yaml"]
volumes:
qlayer06: - ./config/quantumlayer/example06.yaml:/tmp/quantumlayer/config/quantumlayer06.yaml
image: quantumlayer
command: ["--config", "/tmp/quantumlayer/config/quantumlayer06.yaml"] qlayer07:
volumes: image: quantumlayer
- ./config/quantumlayer/example06.yaml:/tmp/quantumlayer/config/quantumlayer06.yaml command: ["--config", "/tmp/quantumlayer/config/quantumlayer07.yaml"]
volumes:
qlayer07: - ./config/quantumlayer/example07.yaml:/tmp/quantumlayer/config/quantumlayer07.yaml
image: quantumlayer
command: ["--config", "/tmp/quantumlayer/config/quantumlayer07.yaml"] qlayer08:
volumes: image: quantumlayer
- ./config/quantumlayer/example07.yaml:/tmp/quantumlayer/config/quantumlayer07.yaml command: ["--config", "/tmp/quantumlayer/config/quantumlayer08.yaml"]
volumes:
qlayer08: - ./config/quantumlayer/example08.yaml:/tmp/quantumlayer/config/quantumlayer08.yaml
image: quantumlayer
command: ["--config", "/tmp/quantumlayer/config/quantumlayer08.yaml"] akms-receiver01:
volumes: image: akms-simulator
- ./config/quantumlayer/example08.yaml:/tmp/quantumlayer/config/quantumlayer08.yaml
akms-receiver02:
akms-receiver01: image: akms-simulator
image: akms-simulator
qkdn-controller:
akms-receiver02: image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller:qkdn-main
image: akms-simulator volumes:
- ./config/controller/qkdn-gosdn.toml:/app/configs/qkdn-gosdn.toml
qkdn-controller: - ./config/controller/gNMISubscriptions.txt:/app/configs/gNMISubscriptions.txt
image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller:qkdn-main command: --config ./configs/qkdn-gosdn.toml
volumes: ports:
- ./config/controller/qkdn-gosdn.toml:/app/configs/qkdn-gosdn.toml - "127.0.0.1:55055:55055"
- ./config/controller/gNMISubscriptions.txt:/app/configs/gNMISubscriptions.txt environment:
command: --config ./configs/qkdn-gosdn.toml GOSDN_ADMIN_PASSWORD: TestPassword
ports:
- "127.0.0.1:55055:55055" gosdnc:
environment: image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller/gosdnc:qkdn-main
GOSDN_ADMIN_PASSWORD: TestPassword volumes:
- ./config/controller/add_devices.sh:/scripts/add_devices.sh
gosdnc: entrypoint: ["/scripts/add_devices.sh"]
image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller/gosdnc:qkdn-main
volumes: plugin-registry:
- ./config/controller/add_devices.sh:/scripts/add_devices.sh image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller/plugin-registry:qkdn-main
entrypoint: ["./scripts/add_devices.sh"]
mongo:
plugin-registry: image: mongo:7
image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller/plugin-registry:qkdn-main environment:
MONGO_INITDB_ROOT_USERNAME: root
mongo: MONGO_INITDB_ROOT_PASSWORD: example
image: mongo:7
environment: rabbitmq:
MONGO_INITDB_ROOT_USERNAME: root image: rabbitmq:3-management
MONGO_INITDB_ROOT_PASSWORD: example
routing-app:
rabbitmq: image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller/routing-app:qkdn-main
image: rabbitmq:3-management entrypoint: ["./start_ra_sleep.sh"]
volumes:
routing-app: - ./config/controller/start_ra_sleep.sh:/app/start_ra_sleep.sh
image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller/routing-app:qkdn-main - ./config/controller/routing-config.yaml:/new/routing-config.yaml
entrypoint: ["./start_ra_sleep.sh"]
volumes:
- ./config/controller/start_ra_sleep.sh:/app/start_ra_sleep.sh
- ./config/controller/routing-config.yaml:/new/routing-config.yaml
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment