Merge branch 'dev' into 'staging'
ci(staging): staging tag See merge request external/treasurer!12
This commit is contained in:
commit
dac864ca8d
@ -1,15 +1,11 @@
|
|||||||
version: "3.3"
|
version: "3.3"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
treasurer-app:
|
treasurer-app-staging:
|
||||||
hostname: treasurer-service
|
hostname: treasurer-service-staging
|
||||||
container_name: treasurer-service
|
container_name: treasurer-service-staging
|
||||||
image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
|
image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
|
||||||
tty: true
|
tty: true
|
||||||
build:
|
|
||||||
context: ../../.
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
target: production
|
|
||||||
environment:
|
environment:
|
||||||
- HTTP_HOST=0.0.0.0
|
- HTTP_HOST=0.0.0.0
|
||||||
- HTTP_PORT=8085
|
- HTTP_PORT=8085
|
||||||
@ -19,14 +15,14 @@ services:
|
|||||||
- GRPC_PORT=9085
|
- GRPC_PORT=9085
|
||||||
|
|
||||||
- IS_MOCK=true
|
- IS_MOCK=true
|
||||||
- MOCK_SERVICE_HOST=treasurer-mock:8080
|
- MOCK_SERVICE_HOST=http://treasurer-mock-staging:8080
|
||||||
|
|
||||||
- YOOMONEY_STORE_ID=$YOOMONEY_STORE_ID
|
- YOOMONEY_STORE_ID=$YOOMONEY_STORE_ID
|
||||||
- YOOMONEY_SECRET_KEY=$YOOMONEY_SECRET_KEY
|
- YOOMONEY_SECRET_KEY=$YOOMONEY_SECRET_KEY
|
||||||
- YOOMONEY_WEBHOOKS_URL=http://treasurer-mock:8080/webhooks
|
- YOOMONEY_WEBHOOKS_URL=http://treasurer-mock-staging:8080/webhooks
|
||||||
- YOOMONEY_PAYMENTS_URL=http://treasurer-mock:8080/payments
|
- YOOMONEY_PAYMENTS_URL=http://treasurer-mock-staging:8080/payments
|
||||||
|
|
||||||
- MONGO_HOST=mongo
|
- MONGO_HOST=10.6.0.11
|
||||||
- MONGO_PORT=27017
|
- MONGO_PORT=27017
|
||||||
- MONGO_USER=$MONGO_USER
|
- MONGO_USER=$MONGO_USER
|
||||||
- MONGO_PASSWORD=$MONGO_PASSWORD
|
- MONGO_PASSWORD=$MONGO_PASSWORD
|
||||||
@ -41,9 +37,9 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- treasurer-mock
|
- treasurer-mock
|
||||||
|
|
||||||
treasurer-mock:
|
treasurer-mock-staging:
|
||||||
hostname: treasurer-mock
|
hostname: treasurer-mock-staging
|
||||||
container_name: treasurermock-container
|
container_name: treasurermock-container-staging
|
||||||
image: 'wiremock/wiremock:2.35.0'
|
image: 'wiremock/wiremock:2.35.0'
|
||||||
ports:
|
ports:
|
||||||
- 8080:8080
|
- 8080:8080
|
||||||
|
Loading…
Reference in New Issue
Block a user