From b7d0bc96bf4f55249b7120e6f34d7a671bda11f8 Mon Sep 17 00:00:00 2001 From: Elizaveta Chichindaeva Date: Thu, 7 Apr 2022 15:33:53 +0300 Subject: [PATCH] Add .int_test.env files for config amendments (#167) Signed-off-by: Elizaveta Chichindaeva --- .env.int_test | 0 .int_test.env | 0 Makefile | 3 ++- services/basenet/.int_test.env | 1 + services/basenet/docker-compose.yml | 1 + services/chain/.int_test.env | 1 + services/chain/docker-compose.yml | 1 + services/coredns/.int_test.env | 1 + services/coredns/docker-compose.yml | 1 + services/http_gate/.int_test.env | 1 + services/http_gate/docker-compose.yml | 2 +- services/ir/.int_test.env | 1 + services/ir/docker-compose.yml | 2 +- services/morph_chain/.int_test.env | 1 + services/morph_chain/docker-compose.yml | 1 + services/nats/.int_test.env | 1 + services/nats/docker-compose.yml | 2 +- services/s3_gate/.int_test.env | 1 + services/s3_gate/docker-compose.yml | 2 +- services/storage/.int_test.env | 1 + services/storage/docker-compose.yml | 8 ++++---- 21 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 .env.int_test create mode 100644 .int_test.env create mode 120000 services/basenet/.int_test.env create mode 120000 services/chain/.int_test.env create mode 120000 services/coredns/.int_test.env create mode 120000 services/http_gate/.int_test.env create mode 120000 services/ir/.int_test.env create mode 120000 services/morph_chain/.int_test.env create mode 120000 services/nats/.int_test.env create mode 120000 services/s3_gate/.int_test.env create mode 120000 services/storage/.int_test.env diff --git a/.env.int_test b/.env.int_test new file mode 100644 index 0000000..e69de29 diff --git a/.int_test.env b/.int_test.env new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile index b31be8b..423dded 100644 --- a/Makefile +++ b/Makefile @@ -114,7 +114,8 @@ hosts: vendor/hosts .ONESHELL: clean: @rm -rf vendor/* services/storage/s04tls.* services/nats/*.pem - @for svc in $(START_SVCS) + @> .int_test.env + @for svc in $(PULL_SVCS) do vols=`docker-compose -f services/$${svc}/docker-compose.yml config --volumes` if [[ ! -z "$${vols}" ]]; then diff --git a/services/basenet/.int_test.env b/services/basenet/.int_test.env new file mode 120000 index 0000000..582b6a2 --- /dev/null +++ b/services/basenet/.int_test.env @@ -0,0 +1 @@ +../../.int_test.env \ No newline at end of file diff --git a/services/basenet/docker-compose.yml b/services/basenet/docker-compose.yml index 708329e..cc70cd8 100644 --- a/services/basenet/docker-compose.yml +++ b/services/basenet/docker-compose.yml @@ -11,6 +11,7 @@ services: command: ["/bin/sleep", "infinity"] restart: always stop_signal: SIGKILL + env_file: [ ".int_test.env" ] environment: - TZ=Etc/UTC networks: diff --git a/services/chain/.int_test.env b/services/chain/.int_test.env new file mode 120000 index 0000000..582b6a2 --- /dev/null +++ b/services/chain/.int_test.env @@ -0,0 +1 @@ +../../.int_test.env \ No newline at end of file diff --git a/services/chain/docker-compose.yml b/services/chain/docker-compose.yml index f460206..be54f4c 100644 --- a/services/chain/docker-compose.yml +++ b/services/chain/docker-compose.yml @@ -13,6 +13,7 @@ services: internet: ipv4_address: ${IPV4_PREFIX}.50 stop_signal: SIGKILL + env_file: [ ".int_test.env" ] environment: - ACC=/chain.gz volumes: diff --git a/services/coredns/.int_test.env b/services/coredns/.int_test.env new file mode 120000 index 0000000..582b6a2 --- /dev/null +++ b/services/coredns/.int_test.env @@ -0,0 +1 @@ +../../.int_test.env \ No newline at end of file diff --git a/services/coredns/docker-compose.yml b/services/coredns/docker-compose.yml index e2752e3..fa354ff 100644 --- a/services/coredns/docker-compose.yml +++ b/services/coredns/docker-compose.yml @@ -12,6 +12,7 @@ services: internet: ipv4_address: ${IPV4_PREFIX}.53 stop_signal: SIGKILL + env_file: [ ".int_test.env" ] volumes: - ./Corefile:/Corefile - ./../../vendor/hosts:/etc/hosts diff --git a/services/http_gate/.int_test.env b/services/http_gate/.int_test.env new file mode 120000 index 0000000..582b6a2 --- /dev/null +++ b/services/http_gate/.int_test.env @@ -0,0 +1 @@ +../../.int_test.env \ No newline at end of file diff --git a/services/http_gate/docker-compose.yml b/services/http_gate/docker-compose.yml index f67925e..2bd9e6f 100644 --- a/services/http_gate/docker-compose.yml +++ b/services/http_gate/docker-compose.yml @@ -16,7 +16,7 @@ services: - ./wallet.json:/wallet.json - ./../../vendor/hosts:/etc/hosts stop_signal: SIGKILL - env_file: [ ".env", ".http.env" ] + env_file: [ ".env", ".http.env", ".int_test.env" ] environment: - HTTP_GW_WALLET=/wallet.json - HTTP_GW_WALLET_PASSPHRASE=one diff --git a/services/ir/.int_test.env b/services/ir/.int_test.env new file mode 120000 index 0000000..582b6a2 --- /dev/null +++ b/services/ir/.int_test.env @@ -0,0 +1 @@ +../../.int_test.env \ No newline at end of file diff --git a/services/ir/docker-compose.yml b/services/ir/docker-compose.yml index 23489fc..5265bbe 100644 --- a/services/ir/docker-compose.yml +++ b/services/ir/docker-compose.yml @@ -21,7 +21,7 @@ services: - ./../../vendor/locode_db:/locode/db - ./../../vendor/neofs-cli:/neofs-cli - ./healthcheck.sh:/healthcheck.sh - env_file: [ ".env", ".ir.env" ] + env_file: [ ".env", ".ir.env", ".int_test.env" ] environment: - NEOFS_IR_WALLET_PATH=/wallet.json - NEOFS_IR_WALLET_ADDRESS=Nhfg3TbpwogLvDGVvAvqyThbsHgoSUKwtn diff --git a/services/morph_chain/.int_test.env b/services/morph_chain/.int_test.env new file mode 120000 index 0000000..582b6a2 --- /dev/null +++ b/services/morph_chain/.int_test.env @@ -0,0 +1 @@ +../../.int_test.env \ No newline at end of file diff --git a/services/morph_chain/docker-compose.yml b/services/morph_chain/docker-compose.yml index a622402..564902c 100644 --- a/services/morph_chain/docker-compose.yml +++ b/services/morph_chain/docker-compose.yml @@ -13,6 +13,7 @@ services: internet: ipv4_address: ${IPV4_PREFIX}.90 stop_signal: SIGKILL + env_file: [ ".int_test.env" ] environment: - ACC=/morph_chain.gz volumes: diff --git a/services/nats/.int_test.env b/services/nats/.int_test.env new file mode 120000 index 0000000..582b6a2 --- /dev/null +++ b/services/nats/.int_test.env @@ -0,0 +1 @@ +../../.int_test.env \ No newline at end of file diff --git a/services/nats/docker-compose.yml b/services/nats/docker-compose.yml index cfc26b2..d69d10d 100644 --- a/services/nats/docker-compose.yml +++ b/services/nats/docker-compose.yml @@ -21,7 +21,7 @@ services: - ./server-key.pem:/certs/server-key.pem - ./ca-cert.pem:/certs/ca-cert.pem stop_signal: SIGKILL - env_file: [ ".env" ] + env_file: [ ".env", ".int_test.env" ] command: ["-c", "/etc/nats/neofs-nats-server.conf"] networks: diff --git a/services/s3_gate/.int_test.env b/services/s3_gate/.int_test.env new file mode 120000 index 0000000..582b6a2 --- /dev/null +++ b/services/s3_gate/.int_test.env @@ -0,0 +1 @@ +../../.int_test.env \ No newline at end of file diff --git a/services/s3_gate/docker-compose.yml b/services/s3_gate/docker-compose.yml index 8d1458d..f2329ac 100644 --- a/services/s3_gate/docker-compose.yml +++ b/services/s3_gate/docker-compose.yml @@ -20,7 +20,7 @@ services: - ./tls.crt:/tls.crt - ./../../vendor/hosts:/etc/hosts stop_signal: SIGKILL - env_file: [ ".env", ".s3.env" ] + env_file: [ ".env", ".s3.env", ".int_test.env" ] environment: - S3_GW_WALLET=/wallet.json - S3_GW_WALLET_PASSPHRASE=s3 diff --git a/services/storage/.int_test.env b/services/storage/.int_test.env new file mode 120000 index 0000000..582b6a2 --- /dev/null +++ b/services/storage/.int_test.env @@ -0,0 +1 @@ +../../.int_test.env \ No newline at end of file diff --git a/services/storage/docker-compose.yml b/services/storage/docker-compose.yml index e71b02d..cf3320d 100644 --- a/services/storage/docker-compose.yml +++ b/services/storage/docker-compose.yml @@ -20,7 +20,7 @@ services: - ./healthcheck.sh:/healthcheck.sh - ./s04tls.crt:/etc/ssl/certs/s04tls.crt stop_signal: SIGKILL - env_file: [ ".env", ".storage.env" ] + env_file: [ ".env", ".storage.env", ".int_test.env" ] environment: - NEOFS_NODE_KEY=/01.key - NEOFS_NODE_ADDRESSES=s01.${LOCAL_DOMAIN}:8080 @@ -53,7 +53,7 @@ services: - ./healthcheck.sh:/healthcheck.sh - ./s04tls.crt:/etc/ssl/certs/s04tls.crt stop_signal: SIGKILL - env_file: [ ".env", ".storage.env" ] + env_file: [ ".env", ".storage.env", ".int_test.env" ] environment: - NEOFS_NODE_KEY=/02.key - NEOFS_NODE_ADDRESSES=s02.${LOCAL_DOMAIN}:8080 @@ -86,7 +86,7 @@ services: - ./healthcheck.sh:/healthcheck.sh - ./s04tls.crt:/etc/ssl/certs/s04tls.crt stop_signal: SIGKILL - env_file: [ ".env", ".storage.env" ] + env_file: [ ".env", ".storage.env", ".int_test.env" ] environment: - NEOFS_NODE_KEY=/03.key - NEOFS_NODE_ADDRESSES=s03.${LOCAL_DOMAIN}:8080 @@ -120,7 +120,7 @@ services: - ./s04tls.crt:/tls.crt - ./s04tls.key:/tls.key stop_signal: SIGKILL - env_file: [ ".env", ".storage.env" ] + env_file: [ ".env", ".storage.env", ".int_test.env" ] environment: - NEOFS_NODE_KEY=/04.key - NEOFS_NODE_ADDRESSES=s04.${LOCAL_DOMAIN}:8080 grpcs://s04.${LOCAL_DOMAIN}:8082