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

release 0_2

See merge request astron-sdc/esap-api-gateway!36

esap/docker/docker-compose-dev.yml

-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
-

esap/docker/docker-compose-release.yml

@@ -9,11 +9,9 @@ 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:
@@ -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
@@ -52,3 +37,4 @@ services:
       - $HOME/shared:/etc/nginx/conf.d
       - $HOME/shared/static:/static
     restart: always
+

esap/query/templates/query/index.html

@@ -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 %}