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

Merge branch 'dev' into 'master' 

Decrementa prioridad de slave respecto a master

See merge request redmic-project/gis/geoserver!15
parents ee3f1e20 19f332af

Dockerfile

+4 −24
Original line number Diff line number Diff line
@@ -2,25 +2,18 @@ FROM openjdk:8-jdk 


ENV DEBIAN_FRONTEND="noninteractive" \

    GEOSERVER_PLUGINS="css inspire libjpeg-turbo csw wps pyramid vectortiles netcdf gdal importer netcdf-out" \

    GEOSERVER_COMMUNITY_PLUGINS="gwc-s3 jms-cluster" \

    GEOSERVER_COMMUNITY_PLUGINS="gwc-s3" \

    GEOSERVER_MAJOR_VERSION="2.12" \

    GEOSERVER_MINOR_VERSION="2" \

    GEOSERVER_NODE_OPTS='id:$host_name' \

    GEOSERVER_DATA_DIR="/var/geoserver/data" \

    GEOSERVER_HOME="/opt/geoserver" \

    GEOSERVER_LOG_LOCATION="/var/log" \

    CLUSTER_CONFIG_DIR="/var/geoserver/conf/cluster" \

    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" \

    GOOGLE_FONTS="Open%20Sans Roboto Lato Ubuntu" \

    NOTO_FONTS="NotoSans-unhinted NotoSerif-unhinted NotoMono-hinted" \

    BROKER_TOPIC_NAME="VirtualTopic.geoserver" \

    ACTIVEMQ_PORT="61666" \

    BROKER_URL="tcp\://activemq-broker\:61666" \

    BROKER_GROUP="geoserver-cluster" \

    ROLE="slave"

    NOTO_FONTS="NotoSans-unhinted NotoSerif-unhinted NotoMono-hinted"



ENV GEOSERVER_VERSION="${GEOSERVER_MAJOR_VERSION}.${GEOSERVER_MINOR_VERSION}" \

    GEOSERVER_LOG_LOCATION="${GEOSERVER_LOG_DIR}/geoserver.log" \
@@ -29,9 +22,7 @@ ENV GEOSERVER_VERSION="${GEOSERVER_MAJOR_VERSION}.${GEOSERVER_MINOR_VERSION}" \ 


ARG TEMP_PATH=/tmp/resources



RUN mkdir -p $TEMP_PATH && \

    mkdir -p $CLUSTER_CONFIG_DIR && \

    mkdir -p $GEOSERVER_DATA_DIR

RUN mkdir -p ${TEMP_PATH} ${GEOSERVER_DATA_DIR}



# Install extra fonts to use with sld font markers

RUN apt-get update && \
@@ -47,10 +38,7 @@ RUN apt-get update && \ 
        libgdal-java \

        libnetcdf11 \

        libnetcdf-c++4 \

        netcdf-bin \

        gettext-base \

        dnsutils \

        rsync

        netcdf-bin



# Copy resources

COPY resources ${TEMP_PATH}
@@ -157,14 +145,6 @@ RUN URL="http://ares.boundlessgeo.com/geoserver/${GEOSERVER_MAJOR_VERSION}.x/com 
        unzip -o ${TEMP_PATH}/${FILENAME} -d ${GEOSERVER_HOME}/webapps/geoserver/WEB-INF/lib/ ; \

    done



# Install ElasticSearch plugin

RUN URL="https://github.com/ngageoint/elasticgeo/releases/download/${GEOSERVER_VERSION}-RC1/" && \

    FILENAME="elasticgeo-${GEOSERVER_VERSION}.zip" && \

    if [ ! -f ${TEMP_PATH}/${FILENAME} ]; then \

        curl -L $URL/$FILENAME -o ${TEMP_PATH}/${FILENAME} ; \

    fi; \

    unzip -o ${TEMP_PATH}/${FILENAME} -d ${GEOSERVER_HOME}/webapps/geoserver/WEB-INF/lib/ ;



ARG GDAL_VERSION="2.1.2"

RUN rm ${GEOSERVER_HOME}/webapps/geoserver/WEB-INF/lib/imageio-ext-gdal-bindings-*.jar && \

    ln -s /usr/share/java/gdal.jar \

docker-compose.prod.yml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ services: 
        traefik.port: "${GEOSERVER_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: "Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};PathPrefix:/geoserver/{((?!web).*)};PathPrefix:/geoserver/{((?!rest).*)}"

        traefik.frontend.priority: "100"

        traefik.frontend.priority: "99"

        traefik.backend: geoserver-slave

      placement:

        constraints:

docker-compose.tmpl.yml

+1 −3
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ services: 
  geoserver-master:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - ROLE=master-slave

      - JAVA_OPTS=-Xmx1g -Xss1g

    networks:

      - gis-net
@@ -20,8 +19,7 @@ services: 
  geoserver-slave:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - ROLE=slave

      - JAVA_OPTS=-Xmx1g -Xss1g

      - JAVA_OPTS=-Xmx1g -Xss1g -DGEOSERVER_CONSOLE_DISABLED=true

    networks:

      - gis-net

    volumes:

scripts/docker-entrypoint.sh

+0 −24
Original line number Diff line number Diff line
@@ -2,34 +2,10 @@ 


set -e



FILENAME="cluster"



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

then

	echo "Copy data_dir"

	cp -r "${GEOSERVER_HOME}/data_dir/*" "${GEOSERVER_DATA_DIR}"

fi



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

then

	export SLAVE_ACTIVE="true"

	export MASTER_ACTIVE="true"

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

then

	export SLAVE_ACTIVE="false"

	export MASTER_ACTIVE="true"

else

	export SLAVE_ACTIVE="true"

	export MASTER_ACTIVE="false"

	# Deactivate web, this node is slave

	export JAVA_OPTS="${JAVA_OPTS} -DGEOSERVER_CONSOLE_DISABLED=true"

fi



envsubst < /${FILENAME}.template > ${CLUSTER_CONFIG_DIR}/${FILENAME}.properties



if [ -n "${DEBUG}"]

then

	cat ${CLUSTER_CONFIG_DIR}/${FILENAME}.properties

fi



exec "$@"