Commit 14d37d12 authored by Nico Vermaas's avatar Nico Vermaas

Merge branch 'esap-gateway-query' into 'acceptance'

Esap gateway query

See merge request !57
parents 4a6e7ec2 7dc89761
Pipeline #10982 passed with stages
in 3 minutes and 21 seconds
......@@ -31,11 +31,9 @@ docker-build-branch-query:
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
# except:
only:
- esap-gateway-query
- esap-gateway-query-xxx
# this deploys the 'esap-gateway-query' branch (a dev/test branch) as 'vermaas'
# by running /docker_compose/esap-api-gateway/docker-compose-query-cd.yml
docker-deploy-master:
docker-deploy-branch-query:
image: docker:latest
stage: deploy
before_script:
......@@ -47,13 +45,16 @@ docker-deploy-master:
- ssh-keyscan dop814.astron.nl >> ~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
script:
- ssh -o StrictHostKeyChecking=no vermaas@dop814.astron.nl "docker pull "$CI_REGISTRY_IMAGE""
- ssh -o StrictHostKeyChecking=no vermaas@dop814.astron.nl "docker-compose -p esap -f /docker_compose/esap-api-gateway/docker-compose-dev-cd.yml up -d"
- ssh -o StrictHostKeyChecking=no vermaas@dop814.astron.nl "docker pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG""
- ssh -o StrictHostKeyChecking=no vermaas@dop814.astron.nl "docker-compose -p esap -f /docker_compose/esap-api-gateway/docker-compose-query-dev-cd.yml up -d"
when: manual
only:
- master
- esap-gateway-query
docker-deploy-branch-query:
# this deploys the 'esap-gateway-query' branch (a dev/test branch) as 'vermaas'
# by running /docker_compose/esap-api-gateway/docker-compose-query-cd.yml
docker-deploy-master:
image: docker:latest
stage: deploy
before_script:
......@@ -65,11 +66,11 @@ docker-deploy-branch-query:
- ssh-keyscan dop814.astron.nl >> ~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
script:
- ssh -o StrictHostKeyChecking=no vermaas@dop814.astron.nl "docker pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG""
- ssh -o StrictHostKeyChecking=no vermaas@dop814.astron.nl "docker-compose -p esap -f /docker_compose/esap-api-gateway/docker-compose-query-dev-cd.yml up -d"
- ssh -o StrictHostKeyChecking=no vermaas@dop814.astron.nl "docker pull "$CI_REGISTRY_IMAGE""
- ssh -o StrictHostKeyChecking=no vermaas@dop814.astron.nl "docker-compose -p esap -f /docker_compose/esap-api-gateway/docker-compose-dev-cd.yml up -d"
when: manual
only:
- esap-gateway-query
- master
# deploy acceptance version on 'dop457.astron.nl'
......
......@@ -7,15 +7,16 @@ networks:
services:
esap_api:
container_name: esap_api_query
container_name: esap_api_acceptance
image: git.astron.nl:5000/astron-sdc/esap-api-gateway
ports:
- "5556:8000"
expose:
- 8000
networks:
- traefik_proxy
- esap_network
env_file:
- $HOME/shared/oidc.env
- /data/shared/oidc.env
restart: always
volumes:
- /data/shared/esap-gateway-query/:/shared
\ No newline at end of file
- /data/shared/:/shared
\ No newline at end of file
......@@ -238,6 +238,6 @@ STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static')
# configuration settings that can be requested through the REST API
VERSION = "ESAP-API version 23 feb 2021"
VERSION = "ESAP-API version 23 march 2021"
CONFIGURATION_DIR = os.path.join(BASE_DIR, 'configuration')
CONFIGURATION_FILE = 'esap_default'
......@@ -21,7 +21,7 @@ ALLOWED_HOSTS = ['*']
CORS_ORIGIN_ALLOW_ALL = True
CORS_ALLOWED_ORIGINS = [
"https://sdc-dev.astron.nl","https://sdc.astron.nl",
"https://sdc-dev.astron.nl","https://sdc.astron.nl","http://dop457.astron.nl",
]
CORS_ORIGIN_ALLOW_ALL = False
CORS_ALLOW_CREDENTIALS = True
......
......@@ -70,7 +70,7 @@
</div>
<p class="footer" small>ASTRON - version 23 mar 2021 - 10:00</p>
<p class="footer" small>ASTRON - version 23 mar 2021 - 13:00</p>
{% endblock %}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment