Commit c273516c authored by Nico Vermaas's avatar Nico Vermaas

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

release 0_2

See merge request !36
parents 5fdc3d5e 7c84e6cb
version: '3.4'
networks:
esap_network:
traefik_proxy:
external:
name: traefik_proxy
default:
driver: bridge
services:
# esap_api:
# container_name: esap_api
# image: esap_api:latest
# networks:
# - esap_network
# expose:
# - 8000
# env_file:
# - $HOME/shared/oidc
# restart: always
# volumes:
# - $HOME/shared:/shared
esap_api_dev:
container_name: esap_api_dev
image: esap_api_dev:latest
ports:
- 15671:8000
expose:
- 8000
networks:
- esap_network
env_file:
- $HOME/shared/oidc
restart: always
volumes:
- $HOME/shared/esap-gateway-dev:/shared
# esap_nginx:
# build:
# context: $HOME/shared
# dockerfile: Dockerfile
# container_name: esap_nginx
# image: esap_nginx:latest
# networks:
# - esap_network
# ports:
# - 80:80
# volumes:
# - $HOME/shared:/shared
# - $HOME/shared:/etc/nginx/conf.d
# - $HOME/shared/static:/static
# restart: always
......@@ -9,14 +9,12 @@ networks:
driver: bridge
services:
esap_api_release:
esap_api:
container_name: esap_api_release
image: esap_api_release:latest
ports:
- 15671:8000
networks:
- esap_network
expose:
expose:
- 8000
env_file:
- $HOME/shared/oidc
......@@ -24,19 +22,6 @@ services:
volumes:
- $HOME/shared/esap-gateway-release/:/shared
esap_api:
container_name: esap_api
image: esap_api:latest
networks:
- esap_network
expose:
- 8000
env_file:
- $HOME/shared/oidc
restart: always
volumes:
- $HOME/shared:/shared
esap_nginx:
build:
context: $HOME/shared
......@@ -44,11 +29,12 @@ services:
container_name: esap_nginx
image: esap_nginx:latest
networks:
- esap_network
- esap_network
ports:
- 80:80
volumes:
- $HOME/shared:/shared
- $HOME/shared:/etc/nginx/conf.d
- $HOME/shared:/etc/nginx/conf.d
- $HOME/shared/static:/static
restart: always
......@@ -70,7 +70,7 @@
</div>
<p class="footer" small>ASTRON - version 28 aug 2020</p>
<p class="footer" small>ASTRON - version 3 sept 2020</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