Commit d1767652 authored by Nico Vermaas's avatar Nico Vermaas

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

Esap gateway query

See merge request !59
parents 572cc3f8 af88a15b
Pipeline #12439 passed with stages
in 1 minute and 27 seconds
......@@ -31,7 +31,7 @@ docker-build-branch-query:
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
# except:
only:
- esap-gateway-query-xxx
- esap-gateway-query
docker-deploy-branch-query:
image: docker:latest
......
......@@ -29,6 +29,7 @@ services:
- "traefik.http.services.esap-qstatic.loadbalancer.server.port=8000"
env_file:
- $HOME/shared/oidc.env
- $HOME/shared/esap.env
restart: always
volumes:
- $HOME/shared/esap-gateway-query/:/shared
......
......@@ -29,6 +29,7 @@ services:
- "traefik.http.services.esap-qstatic.loadbalancer.server.port=8000"
env_file:
- $HOME/shared/oidc.env
- $HOME/shared/esap.env
restart: always
volumes:
- $HOME/shared/esap-gateway-query/:/shared
......
......@@ -234,11 +234,16 @@ LOGOUT_REDIRECT_URL = os.environ['LOGOUT_REDIRECT_URL']
LOGIN_REDIRECT_URL_FAILURE = os.environ['LOGIN_REDIRECT_URL_FAILURE']
# Rucio environment variables
RUCIO_AUTH_TOKEN = os.environ['RUCIO_AUTH_TOKEN']
RUCIO_HOST = os.environ['RUCIO_HOST']
RUCIO_PORT = os.environ['RUCIO_PORT']
RUCIO_AUTH_PORT = os.environ['RUCIO_AUTH_PORT']
try:
RUCIO_AUTH_TOKEN = os.environ['RUCIO_AUTH_TOKEN']
RUCIO_HOST = os.environ['RUCIO_HOST']
RUCIO_PORT = os.environ['RUCIO_PORT']
RUCIO_AUTH_PORT = os.environ['RUCIO_AUTH_PORT']
except:
RUCIO_AUTH_TOKEN = None
RUCIO_HOST = None
RUCIO_PORT = None
RUCIO_AUTH_PORT = None
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/2.0/howto/static-files/
......
......@@ -70,7 +70,7 @@
</div>
<p class="footer" small>ASTRON - version 29 april 2021 - 15:00</p>
<p class="footer" small>ASTRON - version 30 april 2021 - 09:01</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