diff --git a/.env b/.env index 36e28c8..3b174b5 100644 --- a/.env +++ b/.env @@ -23,9 +23,13 @@ HTTP_GW_VERSION=0.16.0 HTTP_GW_IMAGE=nspccdev/neofs-http-gw # S3 Gate -S3_GW_VERSION=0.17.0 +S3_GW_VERSION=17.0-16-gbefe084 S3_GW_IMAGE=nspccdev/neofs-s3-gw +# Coredns +COREDNS_VERSION=v016 +COREDNS_IMAGE=nspccdev/coredns + # NeoFS LOCODE database LOCODE_DB_URL=https://github.com/nspcc-dev/neofs-locode-db/releases/download/v0.2.1/locode_db.gz #LOCODE_DB_PATH=/path/to/locode_db diff --git a/.services b/.services index d17d5c8..7d10d26 100644 --- a/.services +++ b/.services @@ -7,3 +7,4 @@ ir storage http_gate s3_gate +coredns diff --git a/Makefile b/Makefile index 5fd2b71..c2684fc 100644 --- a/Makefile +++ b/Makefile @@ -55,6 +55,7 @@ get: $(foreach SVC, $(GET_SVCS), get.$(SVC)) up: pull get vendor/hosts @$(foreach SVC, $(START_SVCS), $(shell docker-compose -f services/$(SVC)/docker-compose.yml up -d)) @./bin/tick.sh + @./bin/config.sh string SystemDNS container @echo "NeoFS Developer Environment is ready" # Stop environment diff --git a/neofs_config.mk b/neofs_config.mk index 4f2d908..2cac697 100644 --- a/neofs_config.mk +++ b/neofs_config.mk @@ -23,6 +23,10 @@ update.eigen_trust_iterations: @./bin/config.sh int EigenTrustIterations $(val) +# Update system dns to resolve container names (make update.system_dns val=container) +update.system_dns: + @./bin/config.sh string SystemDNS $(val) + # Update alpha parameter of EigenTrust algorithm in 0 <= f <= 1.0 (make update.eigen_trust_alpha val=0.2) update.eigen_trust_alpha: @./bin/config.sh string EigenTrustAlpha $(val) diff --git a/services/coredns/.env b/services/coredns/.env new file mode 120000 index 0000000..c7360fb --- /dev/null +++ b/services/coredns/.env @@ -0,0 +1 @@ +../../.env \ No newline at end of file diff --git a/services/coredns/.hosts b/services/coredns/.hosts new file mode 100644 index 0000000..5f77ce9 --- /dev/null +++ b/services/coredns/.hosts @@ -0,0 +1 @@ +IPV4_PREFIX.53 coredns.LOCAL_DOMAIN diff --git a/services/coredns/Corefile b/services/coredns/Corefile new file mode 100644 index 0000000..852c758 --- /dev/null +++ b/services/coredns/Corefile @@ -0,0 +1,8 @@ +. { + nns http://192.168.130.90:30333 + transfer { + to * + } + log + debug +} diff --git a/services/coredns/docker-compose.yml b/services/coredns/docker-compose.yml new file mode 100644 index 0000000..e2752e3 --- /dev/null +++ b/services/coredns/docker-compose.yml @@ -0,0 +1,23 @@ +--- + +version: "2.4" +services: + neofs_coredns: + image: ${COREDNS_IMAGE}:${COREDNS_VERSION} + container_name: coredns + domainname: ${LOCAL_DOMAIN} + hostname: coredns + networks: + chain_int: + internet: + ipv4_address: ${IPV4_PREFIX}.53 + stop_signal: SIGKILL + volumes: + - ./Corefile:/Corefile + - ./../../vendor/hosts:/etc/hosts + +networks: + chain_int: + internet: + external: true + name: basenet_internet diff --git a/services/s3_gate/docker-compose.yml b/services/s3_gate/docker-compose.yml index 98c1055..cdad241 100644 --- a/services/s3_gate/docker-compose.yml +++ b/services/s3_gate/docker-compose.yml @@ -8,6 +8,8 @@ services: hostname: s3_gate container_name: s3_gate restart: on-failure + dns: + - ${IPV4_PREFIX}.53 networks: s3_gate_int: internet: