Fix more bugs
This commit is contained in:
parent
53fa74b61d
commit
20f19b40fc
|
@ -177,7 +177,7 @@ test-auth-api:
|
||||||
- export API_IMAGE=${USER_MANAGER_TEST_IMAGE_NAME}
|
- export API_IMAGE=${USER_MANAGER_TEST_IMAGE_NAME}
|
||||||
- export CLIENT_IMAGE=dummy-image
|
- export CLIENT_IMAGE=dummy-image
|
||||||
- export FOLDER=auth-domain
|
- export FOLDER=auth-domain
|
||||||
- export DOCKER_CONTAINER=fids_usermanager_api_dev
|
- export DOCKER_CONTAINER=fids-auth-dev_auth-api
|
||||||
- *test-api-script
|
- *test-api-script
|
||||||
needs:
|
needs:
|
||||||
- job: build-auth-api
|
- job: build-auth-api
|
||||||
|
@ -196,7 +196,7 @@ test-subscription-api:
|
||||||
- export API_IMAGE=${SUBSCRIPTION_TEST_IMAGE_NAME}
|
- export API_IMAGE=${SUBSCRIPTION_TEST_IMAGE_NAME}
|
||||||
- export CLIENT_IMAGE=dummy-image
|
- export CLIENT_IMAGE=dummy-image
|
||||||
- export FOLDER=subscription-domain
|
- export FOLDER=subscription-domain
|
||||||
- export DOCKER_CONTAINER=fids_subscriptions_api_dev
|
- export DOCKER_CONTAINER=fids-subs-dev_subscriptions-api
|
||||||
- *test-api-script
|
- *test-api-script
|
||||||
needs:
|
needs:
|
||||||
- job: build-subscription-api
|
- job: build-subscription-api
|
||||||
|
@ -215,7 +215,7 @@ test-flights-api:
|
||||||
- export API_IMAGE=${FLIGHTS_INFO_TEST_IMAGE_NAME}
|
- export API_IMAGE=${FLIGHTS_INFO_TEST_IMAGE_NAME}
|
||||||
- export CLIENT_IMAGE=dummy-image
|
- export CLIENT_IMAGE=dummy-image
|
||||||
- export FOLDER=flights-domain
|
- export FOLDER=flights-domain
|
||||||
- export DOCKER_CONTAINER=fids_flights_api_dev
|
- export DOCKER_CONTAINER=fids-flights-dev_flights-api
|
||||||
- *test-api-script
|
- *test-api-script
|
||||||
needs:
|
needs:
|
||||||
- job: build-flights-api
|
- job: build-flights-api
|
||||||
|
@ -234,7 +234,7 @@ test-gateway:
|
||||||
- export API_IMAGE=${GATEWAY_TEST_IMAGE_NAME}
|
- export API_IMAGE=${GATEWAY_TEST_IMAGE_NAME}
|
||||||
- export CLIENT_IMAGE=dummy-image
|
- export CLIENT_IMAGE=dummy-image
|
||||||
- export FOLDER=gateway
|
- export FOLDER=gateway
|
||||||
- export DOCKER_CONTAINER=fids_api_gateway_dev
|
- export DOCKER_CONTAINER=fids-gateway-dev_api-gw
|
||||||
- *test-api-script
|
- *test-api-script
|
||||||
needs:
|
needs:
|
||||||
- job: build-gateway
|
- job: build-gateway
|
||||||
|
@ -271,7 +271,7 @@ test-browser-client:
|
||||||
script:
|
script:
|
||||||
- export CLIENT_IMAGE=${BROWSER_CLIENT_TEST_IMAGE_NAME}
|
- export CLIENT_IMAGE=${BROWSER_CLIENT_TEST_IMAGE_NAME}
|
||||||
- export FOLDER=browser-domain
|
- export FOLDER=browser-domain
|
||||||
- export DOCKER_CONTAINER=fids_browser_client_dev
|
- export DOCKER_CONTAINER=fids-browser-dev_browser-client
|
||||||
- *test-client-script
|
- *test-client-script
|
||||||
needs:
|
needs:
|
||||||
- job: build-browser-client
|
- job: build-browser-client
|
||||||
|
@ -289,7 +289,7 @@ test-screen-client:
|
||||||
script:
|
script:
|
||||||
- export CLIENT_IMAGE=${SCREEN_CLIENT_TEST_IMAGE_NAME}
|
- export CLIENT_IMAGE=${SCREEN_CLIENT_TEST_IMAGE_NAME}
|
||||||
- export FOLDER=screen-domain
|
- export FOLDER=screen-domain
|
||||||
- export DOCKER_CONTAINER=fids_screens_client_dev
|
- export DOCKER_CONTAINER=fids-screen_screen-client
|
||||||
- *test-client-script
|
- *test-client-script
|
||||||
needs:
|
needs:
|
||||||
- job: build-screen-client
|
- job: build-screen-client
|
||||||
|
|
|
@ -7,16 +7,16 @@ services:
|
||||||
file: docker-template.yml
|
file: docker-template.yml
|
||||||
service: flights-api
|
service: flights-api
|
||||||
depends_on:
|
depends_on:
|
||||||
flights-api-db:
|
flights-db:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
networks:
|
networks:
|
||||||
- flights
|
- flights
|
||||||
- subscriptions
|
- subscriptions
|
||||||
|
|
||||||
flights-api-db:
|
flights-db:
|
||||||
extends:
|
extends:
|
||||||
file: docker-template.yml
|
file: docker-template.yml
|
||||||
service: flights-api-db
|
service: flights-db
|
||||||
volumes:
|
volumes:
|
||||||
- flights_db:/var/lib/postgresql/data
|
- flights_db:/var/lib/postgresql/data
|
||||||
networks:
|
networks:
|
||||||
|
|
Loading…
Reference in New Issue