fix(deploy): bind development gateways to loopback
This commit is contained in:
@@ -37,10 +37,7 @@ case "$DEPLOY_ENV" in
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
if [ "$DEPLOY_ENV" = "development" ]; then
|
if [ "$DEPLOY_ENV" = "development" ]; then
|
||||||
case "$SERVICE" in
|
PUBLISHED_BIND_ADDRESS=127.0.0.1
|
||||||
gateway|gateway-overseas) PUBLISHED_BIND_ADDRESS=0.0.0.0 ;;
|
|
||||||
*) PUBLISHED_BIND_ADDRESS=127.0.0.1 ;;
|
|
||||||
esac
|
|
||||||
else
|
else
|
||||||
PUBLISHED_BIND_ADDRESS="${PUBLISHED_BIND_ADDRESS:-0.0.0.0}"
|
PUBLISHED_BIND_ADDRESS="${PUBLISHED_BIND_ADDRESS:-0.0.0.0}"
|
||||||
fi
|
fi
|
||||||
@@ -433,10 +430,7 @@ export DEPLOY_ENV="$deploy_env"
|
|||||||
export IMAGE_REPOSITORY="$image_repository"
|
export IMAGE_REPOSITORY="$image_repository"
|
||||||
export IMAGE_TAG="$image_tag"
|
export IMAGE_TAG="$image_tag"
|
||||||
if [ "$deploy_env" = "development" ]; then
|
if [ "$deploy_env" = "development" ]; then
|
||||||
case "$service" in
|
export PUBLISHED_BIND_ADDRESS=127.0.0.1
|
||||||
gateway|gateway-overseas) export PUBLISHED_BIND_ADDRESS=0.0.0.0 ;;
|
|
||||||
*) export PUBLISHED_BIND_ADDRESS=127.0.0.1 ;;
|
|
||||||
esac
|
|
||||||
else
|
else
|
||||||
export PUBLISHED_BIND_ADDRESS="${PUBLISHED_BIND_ADDRESS:-0.0.0.0}"
|
export PUBLISHED_BIND_ADDRESS="${PUBLISHED_BIND_ADDRESS:-0.0.0.0}"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -85,13 +85,12 @@ test('development and test deployment locks are acquired before target executors
|
|||||||
assert.ok(lockIndex < nodeIndex, 'deployment lock must be acquired before target node allocation')
|
assert.ok(lockIndex < nodeIndex, 'deployment lock must be acquired before target node allocation')
|
||||||
})
|
})
|
||||||
|
|
||||||
test('development exposes gateways for remote acceptance and keeps internal services on loopback', () => {
|
test('development publishes every service on loopback without changing test defaults', () => {
|
||||||
assert.match(serviceCompose, /\$\{PUBLISHED_BIND_ADDRESS:-0\.0\.0\.0\}:\$\{GATEWAY_PORT:-9000\}:9000/)
|
assert.match(serviceCompose, /\$\{PUBLISHED_BIND_ADDRESS:-0\.0\.0\.0\}:\$\{GATEWAY_PORT:-9000\}:9000/)
|
||||||
assert.match(overseasCompose, /\$\{PUBLISHED_BIND_ADDRESS:-0\.0\.0\.0\}:\$\{GATEWAY_OVERSEAS_PORT:-9300\}:9300/)
|
assert.match(overseasCompose, /\$\{PUBLISHED_BIND_ADDRESS:-0\.0\.0\.0\}:\$\{GATEWAY_OVERSEAS_PORT:-9300\}:9300/)
|
||||||
assert.match(directDeployScript, /gateway\|gateway-overseas\) PUBLISHED_BIND_ADDRESS=0\.0\.0\.0/)
|
assert.match(directDeployScript, /if \[ "\$DEPLOY_ENV" = "development" \]; then\s+PUBLISHED_BIND_ADDRESS=127\.0\.0\.1/)
|
||||||
assert.match(directDeployScript, /\*\) PUBLISHED_BIND_ADDRESS=127\.0\.0\.1/)
|
assert.match(directDeployScript, /if \[ "\$deploy_env" = "development" \]; then\s+export PUBLISHED_BIND_ADDRESS=127\.0\.0\.1/)
|
||||||
assert.match(directDeployScript, /gateway\|gateway-overseas\) export PUBLISHED_BIND_ADDRESS=0\.0\.0\.0/)
|
assert.doesNotMatch(directDeployScript, /gateway\|gateway-overseas\) (?:export )?PUBLISHED_BIND_ADDRESS=0\.0\.0\.0/)
|
||||||
assert.match(directDeployScript, /\*\) export PUBLISHED_BIND_ADDRESS=127\.0\.0\.1/)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
test('parallel image publications isolate registry credentials per Jenkins job', () => {
|
test('parallel image publications isolate registry credentials per Jenkins job', () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user