Merge branch 'dev' into 'master' (81929a4e) · Commits · REDMIC Project / GIS / GeoServer

.gitlab-ci.yml

+6 −6

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ deploy-geoserver-master-dev:
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		STACK: gis
		SERVICES_TO_CHECK: gis_geoserver-master
		STATUS_CHECK_DELAY: 180
		STATUS_CHECK_DELAY: 400
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.geoserver-master.tmpl.yml:docker-compose.geoserver-master.dev.yml
		@@ -85,7 +85,7 @@ deploy-geoserver-slave-dev:
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		STACK: gis
		SERVICES_TO_CHECK: gis_geoserver-slave
		STATUS_CHECK_DELAY: 180
		STATUS_CHECK_DELAY: 400
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.geoserver-slave.tmpl.yml:docker-compose.geoserver-slave.dev.yml
		@@ -110,7 +110,7 @@ deploy-geoserver-master-supporting-branch:
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		STACK: gis
		SERVICES_TO_CHECK: gis_geoserver-master
		STATUS_CHECK_DELAY: 180
		STATUS_CHECK_DELAY: 400
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.geoserver-master.tmpl.yml:docker-compose.geoserver-master.dev.yml
		@@ -138,7 +138,7 @@ deploy-geoserver-slave-supporting-branch:
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		STACK: gis
		SERVICES_TO_CHECK: gis_geoserver-slave
		STATUS_CHECK_DELAY: 180
		STATUS_CHECK_DELAY: 400
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.geoserver-slave.tmpl.yml:docker-compose.geoserver-slave.dev.yml
		@@ -166,7 +166,7 @@ deploy-geoserver-master-pro:
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		STACK: gis
		SERVICES_TO_CHECK: gis_geoserver-master
		STATUS_CHECK_DELAY: 180
		STATUS_CHECK_DELAY: 400
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.geoserver-master.tmpl.yml:docker-compose.geoserver-master.prod.yml
		@@ -191,7 +191,7 @@ deploy-geoserver-slave-pro:
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		STACK: gis
		SERVICES_TO_CHECK: gis_geoserver-slave
		STATUS_CHECK_DELAY: 180
		STATUS_CHECK_DELAY: 400
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.geoserver-slave.tmpl.yml:docker-compose.geoserver-slave.prod.yml

Dockerfile

+1 −8

Original line number	Diff line number	Diff line
		@@ -92,14 +92,7 @@ RUN FILENAME="geoserver-${GEOSERVER_VERSION}-bin.zip" && \
		curl -L ${URL}/${FILENAME} -o ${TEMP_PATH}/${FILENAME} ; \
		fi; \
		unzip -o ${TEMP_PATH}/${FILENAME} -d /opt/ && \
		mv -v ${GEOSERVER_HOME}* ${GEOSERVER_HOME} && \
		rm -rf ${GEOSERVER_HOME}/data_dir/coverages && \
		rm -rf ${GEOSERVER_HOME}/data_dir/data && \
		rm -rf ${GEOSERVER_HOME}/data_dir/demo && \
		rm -rf ${GEOSERVER_HOME}/data_dir/gwc-layers && \
		rm -rf ${GEOSERVER_HOME}/data_dir/layergroups && \
		rm -rf ${GEOSERVER_HOME}/data_dir/workspaces

		mv -v ${GEOSERVER_HOME}* ${GEOSERVER_HOME}

		# Install Marlin
		ARG MARLIN_VERSION=0.9.1