优化
This commit is contained in:
@@ -11,9 +11,11 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- "${HOST_PORT:-9001}:80"
|
- "${HOST_PORT:-9001}:80"
|
||||||
|
extra_hosts:
|
||||||
|
- "host.docker.internal:host-gateway"
|
||||||
environment:
|
environment:
|
||||||
# Runtime URL used by the secure customer-workbench handoff. Each
|
# Runtime URL used by the secure customer-workbench handoff. Each
|
||||||
# environment may override it without rebuilding the Admin image.
|
# environment may override it without rebuilding the Admin image.
|
||||||
CLIENT_WEB_URL: "${CLIENT_WEB_URL:-https://test-app.buggoglobal.com/}"
|
CLIENT_WEB_URL: "${CLIENT_WEB_URL:-https://test-app.buggoglobal.com/}"
|
||||||
API_UPSTREAM: "http://test-api-cn.buggoglobal.com"
|
API_UPSTREAM: "${API_UPSTREAM:-http://host.docker.internal:9000}"
|
||||||
OVERSEAS_API_UPSTREAM: "http://test-api-global.buggoglobal.com"
|
OVERSEAS_API_UPSTREAM: "${OVERSEAS_API_UPSTREAM:-http://host.docker.internal:9300}"
|
||||||
|
|||||||
@@ -39,8 +39,11 @@ describe('admin nginx deployment config', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('declares an explicit overseas gateway upstream in container deployments', () => {
|
it('declares an explicit overseas gateway upstream in container deployments', () => {
|
||||||
expect(testCompose).toContain('API_UPSTREAM: "http://test-api-cn.buggoglobal.com"')
|
expect(testCompose).toContain('- "host.docker.internal:host-gateway"')
|
||||||
expect(testCompose).toContain('OVERSEAS_API_UPSTREAM: "http://test-api-global.buggoglobal.com"')
|
expect(testCompose).toContain('API_UPSTREAM: "${API_UPSTREAM:-http://host.docker.internal:9000}"')
|
||||||
|
expect(testCompose).toContain('OVERSEAS_API_UPSTREAM: "${OVERSEAS_API_UPSTREAM:-http://host.docker.internal:9300}"')
|
||||||
|
expect(testCompose).not.toContain('http://test-api-cn.buggoglobal.com')
|
||||||
|
expect(testCompose).not.toContain('http://test-api-global.buggoglobal.com')
|
||||||
expect(testCompose).toContain('CLIENT_WEB_URL: "${CLIENT_WEB_URL:-https://test-app.buggoglobal.com/}"')
|
expect(testCompose).toContain('CLIENT_WEB_URL: "${CLIENT_WEB_URL:-https://test-app.buggoglobal.com/}"')
|
||||||
expect(testCompose).not.toContain('CLIENT_WEB_URL: "http://8.163.')
|
expect(testCompose).not.toContain('CLIENT_WEB_URL: "http://8.163.')
|
||||||
expect(developmentCompose).toContain('CLIENT_WEB_URL: "${CLIENT_WEB_URL:-https://dev-app.buggoglobal.com/}"')
|
expect(developmentCompose).toContain('CLIENT_WEB_URL: "${CLIENT_WEB_URL:-https://dev-app.buggoglobal.com/}"')
|
||||||
|
|||||||
Reference in New Issue
Block a user