diff --git a/docker-compose.yml b/docker-compose.yml index e25df86..74d959b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -114,7 +114,7 @@ services: - PROXY_VOLUME_DIR # where to persist cert files. defaults to /tmp/mitproxy - PROXY_URL # http(s) proxy to use. if USE_PROXY_HOST is enabled will be set to http://PROXY_CONTAINER_NAME:8080 - PROXY_AUTO_EXPORT_ENV # auto export HTTP_PROXY and HTTPS_PROXY vars equal to PROXY_URL - - DEV_CONTAINER=1.9.65 # used to detect if running inside dev container + - DEV_CONTAINER=1.9.66 # used to detect if running inside dev container volumes: - /var/run/docker.sock:/var/run/docker.sock # allow container to interact with host docker - "${GDC_DIR}:/root/gdc-host" # mount gdc folder inside container to get access to compose files diff --git a/etc/skel/.bashrc b/etc/skel/.bashrc index 689dd7e..23dad1d 100644 --- a/etc/skel/.bashrc +++ b/etc/skel/.bashrc @@ -203,6 +203,8 @@ if [ "$USE_LOCALSTACK" = "yes" ]; then if [ -n "$LOCALSTACK_STATIC_IP" ]; then echo "Localstack static ip: $LOCALSTACK_STATIC_IP" fi + echo "GDC PRI DNS IP $GDC_DNS_PRI_IP" + echo "GDC SEC DNS IP $GDC_DNS_SEC_IP" fi if [ -n "$PULUMI_VERSION" ]; then diff --git a/run-dev-container.sh b/run-dev-container.sh index 754a45b..3246ce8 100755 --- a/run-dev-container.sh +++ b/run-dev-container.sh @@ -102,7 +102,7 @@ if [ "$USE_LOCALSTACK_DNS" = "yes" ]; then echo "ERROR: When USE_LOCALSTACK_DNS=yes and DEVNET_SUBNET is specified, you must also specify LOCALSTACK_STATIC_IP" exit 1 fi - if [ -z "$DEVNET_SUBNET" ]; then + if [[ -z "$DEVNET_SUBNET" && -z "$LOCALSTACK_STATIC_IP" ]]; then D=$(date) OCTET=$(convert_string_to_number "$CI_JOB_TOKEN,$D") export DEVNET_SUBNET="172.$OCTET.0.0/16"