Commit 56c016fa authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' into 'master' 

Corrige nombre del directorio de logs

See merge request redmic-project/gis/geoserver!23
parents d3e690b6 ca0eb56b

Dockerfile

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND="noninteractive" \ 
    GEOSERVER_MINOR_VERSION="4" \

    GEOSERVER_DATA_DIR="/var/geoserver/data" \

    GEOSERVER_HOME="/opt/geoserver" \

    GEOSERVER_LOG_LOCATION="/var/log/geoserver" \

    GEOSERVER_LOG_DIR="/var/log/geoserver" \

    GEOSERVER_OPTS="-server -Xrs -XX:PerfDataSamplingInterval=500 \

     -Dorg.geotools.referencing.forceXY=true -XX:SoftRefLRUPolicyMSPerMB=36000 \

     -XX:+UseG1GC -XX:NewRatio=2 -XX:+CMSClassUnloadingEnabled \
@@ -24,7 +24,7 @@ ARG TEMP_PATH=/tmp/resources 


RUN mkdir -p ${TEMP_PATH} && \

    mkdir -p ${GEOSERVER_DATA_DIR} && \

    mkdir -p ${GEOSERVER_LOG_LOCATION}

    mkdir -p ${GEOSERVER_LOG_DIR}



# Install extra fonts to use with sld font markers

RUN apt-get update && \
@@ -153,7 +153,7 @@ RUN rm -fr ${TEMP_PATH} && \ 
    useradd geoserver && \

    chown -R geoserver:geoserver "${GEOSERVER_DATA_DIR}" && \

    chown -R geoserver:geoserver "${GEOSERVER_HOME}" && \

    chown -R geoserver:geoserver "${GEOSERVER_LOG_LOCATION}"

    chown -R geoserver:geoserver "${GEOSERVER_LOG_DIR}"



USER geoserver

scripts/docker-entrypoint.sh

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ then 
	rm -rf ${GEOSERVER_DATA_DIR}/coverages/*

fi



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

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



if [ "${ROLE}" == "master" ]

then