Commit acd339d2 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Recupera Dockerfile, simplifica entrypoint

parent 23a1c5fe

Dockerfile

+130 −127
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 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="4" \

	GEOSERVER_MINOR_VERSION="5" \

	GEOSERVER_DATA_DIR="/var/geoserver/data" \

	GEOSERVER_HOME="/opt/geoserver" \

	GEOSERVER_LOG_DIR="/var/log/geoserver" \
@@ -28,7 +28,7 @@ ENV DEBIAN_FRONTEND="noninteractive" \ 
		-XX:PerfDataSamplingInterval=500 \

		-XX:+UnlockExperimentalVMOptions \

		-XX:+UseCGroupMemoryLimitForHeap \

     -XX:MaxRAMFraction=1 \

		-XX:MaxRAMFraction=2 \

		-Djava.awt.headless=true \

		-Dorg.geotools.referencing.forceXY=true \

		-Djava.library.path=/usr/share/java:/opt/libjpeg-turbo/lib64:/usr/lib/jni" \
@@ -42,12 +42,9 @@ ENV GEOSERVER_VERSION="${GEOSERVER_MAJOR_VERSION}.${GEOSERVER_MINOR_VERSION}" \ 


ARG TEMP_PATH=/tmp/resources



RUN mkdir -p ${TEMP_PATH} && \

    mkdir -p ${GEOSERVER_DATA_DIR} && \

    mkdir -p ${GEOSERVER_LOG_DIR}



# Install extra fonts to use with sld font markers

RUN apt-get update && \

RUN mkdir -p "${TEMP_PATH}" "${GEOSERVER_DATA_DIR}" "${GEOSERVER_LOG_DIR}" && \

	apt-get update && \

	apt-get install -y --no-install-recommends fonts-cantarell \

		lmodern \

		ttf-aenigma \
@@ -92,7 +89,13 @@ 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}

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

	rm -rf ${GEOSERVER_HOME}/data_dir/coverages/* \

		${GEOSERVER_HOME}/data_dir/data/* \

		${GEOSERVER_HOME}/data_dir/demo/* \

		${GEOSERVER_HOME}/data_dir/gwc-layers/* \

		${GEOSERVER_HOME}/data_dir/layergroups/* \

		${GEOSERVER_HOME}/data_dir/workspaces/*



# Install Marlin

ARG MARLIN_VERSION=0.9.1

scripts/docker-entrypoint.sh

+3 −6
Original line number Diff line number Diff line
@@ -2,12 +2,9 @@ 


if [ -z "$(ls -A ${GEOSERVER_DATA_DIR})" ]

then

	echo "Copy data_dir"

	cp "${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/*

	echo "Move data_dir"



	mv -v "${GEOSERVER_HOME}/data_dir/"* "${GEOSERVER_DATA_DIR}/"

fi



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