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

Dockerfile

+20 −19

Original line number	Diff line number	Diff line
		@@ -4,25 +4,27 @@ ENV DEBIAN_FRONTEND="noninteractive" \
		GEOSERVER_PLUGINS="css inspire libjpeg-turbo csw wps pyramid vectortiles netcdf gdal importer netcdf-out" \
		GEOSERVER_COMMUNITY_PLUGINS="gwc-s3" \
		GEOSERVER_MAJOR_VERSION="2.12" \
		GEOSERVER_MINOR_VERSION="2" \
		GEOSERVER_MINOR_VERSION="4" \
		GEOSERVER_DATA_DIR="/var/geoserver/data" \
		GEOSERVER_HOME="/opt/geoserver" \
		GEOSERVER_LOG_LOCATION="/var/log" \
		GEOSERVER_LOG_LOCATION="/var/log/geoserver" \
		GEOSERVER_OPTS="-server -Xrs -XX:PerfDataSamplingInterval=500 \
		-Dorg.geotools.referencing.forceXY=true -XX:SoftRefLRUPolicyMSPerMB=36000 \
		-XX:+UseParallelGC --XX:+UseParNewGC –XX:+UseG1GC -XX:NewRatio=2 \
		-XX:+CMSClassUnloadingEnabled" \
		-XX:+UseG1GC -XX:NewRatio=2 -XX:+CMSClassUnloadingEnabled \
		-Djava.library.path=/usr/share/java:/opt/libjpeg-turbo/lib64:/usr/lib/jni" \
		GOOGLE_FONTS="Open%20Sans Roboto Lato Ubuntu" \
		NOTO_FONTS="NotoSans-unhinted NotoSerif-unhinted NotoMono-hinted"
		NOTO_FONTS="NotoSans-unhinted NotoSerif-unhinted NotoMono-hinted" \
		GEOSERVER_PORT="8080"

		ENV GEOSERVER_VERSION="${GEOSERVER_MAJOR_VERSION}.${GEOSERVER_MINOR_VERSION}" \
		GEOSERVER_LOG_LOCATION="${GEOSERVER_LOG_DIR}/geoserver.log" \
		GDAL_DATA="/usr/share/gdal/2.1" \
		JAVA_OPTS="${JAVA_OPTS} -Djava.library.path=/usr/share/java:/opt/libjpeg-turbo/lib64:/usr/lib/jni ${GEOSERVER_OPTS}"
		GDAL_DATA="/usr/share/gdal/2.1"

		ARG TEMP_PATH=/tmp/resources

		RUN mkdir -p ${TEMP_PATH} ${GEOSERVER_DATA_DIR}
		RUN mkdir -p ${TEMP_PATH} && \
		mkdir -p ${GEOSERVER_DATA_DIR} && \
		mkdir -p ${GEOSERVER_LOG_LOCATION}

		# Install extra fonts to use with sld font markers
		RUN apt-get update && \
		@@ -42,8 +44,6 @@ RUN apt-get update && \
		dnsutils

		# Copy resources
		COPY resources ${TEMP_PATH}

		# Install Google Noto fonts
		RUN mkdir -p /usr/share/fonts/truetype/noto && \
		for FONT in ${NOTO_FONTS}; \
		@@ -71,13 +71,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/workspaces/* && \
		rm -rf ${GEOSERVER_HOME}/data_dir/layergroups/* && \
		rm -rf ${GEOSERVER_HOME}/data_dir/data/* && \
		rm -rf ${GEOSERVER_HOME}/data_dir/coverages/* && \
		rm -rf ${GEOSERVER_HOME}/data_dir/demo && \
		rm -rf ${GEOSERVER_HOME}/data_dir/logs
		mv -v ${GEOSERVER_HOME}* ${GEOSERVER_HOME}

		# Install Marlin
		ARG MARLIN_VERSION=0.9.1
		@@ -88,6 +82,7 @@ RUN FILENAME=$(echo "marlin-${MARLIN_VERSION}-Unsafe.jar") && \
		fi; \
		cp ${TEMP_PATH}/${FILENAME} ${GEOSERVER_HOME}/lib

		# El espacio final es necesario, corrige bug en script de arranque
		ENV MARLIN_JAR="${GEOSERVER_HOME}/lib/marlin-${MARLIN_VERSION}-Unsafe.jar "

		# Install Turbo JPEG
		@@ -154,7 +149,13 @@ RUN rm ${GEOSERVER_HOME}/webapps/geoserver/WEB-INF/lib/imageio-ext-gdal-bindings
		# Clean
		RUN rm -fr ${TEMP_PATH} && \
		rm -rf /var/lib/apt/lists/* && \
		apt-get clean
		apt-get clean && \
		useradd geoserver && \
		chown -R geoserver:geoserver "${GEOSERVER_DATA_DIR}" && \
		chown -R geoserver:geoserver "${GEOSERVER_HOME}" && \
		chown -R geoserver:geoserver "${GEOSERVER_LOG_LOCATION}"

		USER geoserver

		COPY ./scripts /

scripts/docker-entrypoint.sh

+7 −1

Original line number	Diff line number	Diff line
		@@ -3,9 +3,15 @@
		if [ -z "$(ls -A ${GEOSERVER_DATA_DIR})" ]
		then
		echo "Copy data_dir"
		cp -r "${GEOSERVER_HOME}/data_dir/*" "${GEOSERVER_DATA_DIR}"
		mv "${GEOSERVER_HOME}/data_dir/"* "${GEOSERVER_DATA_DIR}/"
		rm -rf ${GEOSERVER_DATA_DIR}/workspaces/*
		rm -rf ${GEOSERVER_DATA_DIR}/layergroups/*
		rm -rf ${GEOSERVER_DATA_DIR}/data/*
		rm -rf ${GEOSERVER_DATA_DIR}/coverages/*
		fi

		export JAVA_OPTS="${JAVA_OPTS} ${GEOSERVER_OPTS} -DGEOSERVER_LOG_LOCATION=\"${GEOSERVER_LOG_LOCATION}\""

		if [ "${ROLE}" == "master" ]
		then
		/manage-slaves.sh & disown