Merge branch 'master' into nginx-exporter (f2115134) · Commits · ESGF / mirrors / Esgf Docker

.gitlab-ci.yml

+0 −7

Original line number	Diff line number	Diff line
		@@ -154,13 +154,6 @@ build:tomcat:
		CONTEXT_DIR: $CI_PROJECT_DIR/images/tomcat
		needs: ["build:jre"]

		build:keycloak:
		extends: .docker-build
		stage: build-3
		variables:
		CONTEXT_DIR: $CI_PROJECT_DIR/images/keycloak
		needs: ["build:jdk"]

		build:python-build:
		extends: .docker-build
		stage: build-3

+8 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,14 @@ server {
		return 404;
		}

		# Health check
		location /health {
		return 200;
		}
		location /thredds/fileServer/health {
		return 200;
		}

		# Create a location block for each dataset
		{% for dataset in data_datasets %}
		location /thredds/fileServer/{{ dataset.path }}/ {

+5 −0

+9 −5

Original line number	Diff line number	Diff line
		@@ -4,14 +4,18 @@ server {
		listen 8080 default_server;
		server_name _;

		# By default, return 404
		# Look for static files to serve
		location / {
		return 404;
		root /var/www/html;
		autoindex off;
		}

		# Disallow access to all dot-files
		location ~ /\. {
		return 404;
		# Health checks
		location /health {
		return 200;
		}
		location /thredds/fileServer/health {
		return 200;
		}

		# Create a location block for each dataset

0 → 100644

+2 −0