Commit 5b12fcb5 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Instala dig y lo usa para descubrir otros nodos

parent 17247423

Dockerfile

+137 −138
Original line number Diff line number Diff line
@@ -48,9 +48,7 @@ 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}"

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



COPY ./scripts /
@@ -70,7 +68,8 @@ RUN apt-get update && \ 
		libnetcdf11 \

		libnetcdf-c++4 \

		netcdf-bin \

        gettext-base

		gettext-base \

		dnsutils



# Copy resources

# Install Google Noto fonts

deploy/.env

+1 −1
Original line number Diff line number Diff line 
GEOSERVER_PORT=8080

HAZELCAST_PORT=5701

CLUSTER_NAME=geoserver-cluster

CLUSTER_PASSWORD="changeme"

CLUSTER_PASSWORD=changeme

SYNC_MODE=event

SYNC_DELAY=0

SESSION_STICKY=true

deploy/docker-compose.dev.yml

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ services: 
        traefik.frontend.rule: "Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};PathPrefix:/geoserver"

        traefik.backend: geoserver

      restart_policy:

        delay: 1m

        window: 3m

        delay: 2m

        window: 5m

      resources:

        limits:

          cpus: '0.75'

scripts/docker-entrypoint.sh

+24 −14
Original line number Diff line number Diff line
@@ -5,11 +5,8 @@ set -e 
if [ -z "$(ls -A ${GEOSERVER_DATA_DIR})" ]

then

	echo "Data dir is empty, creating data folders structure"

    mkdir -p ${GEOSERVER_DATA_DIR}/coverages

    mkdir -p ${GEOSERVER_DATA_DIR}/data

    mkdir -p ${GEOSERVER_DATA_DIR}/gwc-layers

    mkdir -p ${GEOSERVER_DATA_DIR}/layergroups

    mkdir -p ${GEOSERVER_DATA_DIR}/workspaces

	mkdir -p ${GEOSERVER_DATA_DIR}/coverages ${GEOSERVER_DATA_DIR}/data ${GEOSERVER_DATA_DIR}/gwc-layers \

		${GEOSERVER_DATA_DIR}/layergroups ${GEOSERVER_DATA_DIR}/workspaces



	cp -arv "${GEOSERVER_HOME}/data_dir/"* "${GEOSERVER_DATA_DIR}"
@@ -17,16 +14,29 @@ then 
	rm -rf "${GEOSERVER_HOME}/data_dir"

fi



if [ ! -d "${GEOSERVER_DATA_DIR}" ]

then

    mkdir -p ${GEOSERVER_DATA_DIR}/cluster

echo "Discovering other nodes in cluster..."

serviceNodesIps=$(dig ${CLUSTER_DISCOVERY_URL} +short)

echo "${serviceNodesIps}"



    clusterTemplateFilename="cluster"

    hazelcastTemplateFilename="hazelcast"

myIp=$(dig ${HOSTNAME} +short)

echo "My IP: ${myIp}"



    envsubst < /${clusterTemplateFilename}.template > ${GEOSERVER_DATA_DIR}/cluster/${clusterTemplateFilename}.properties

    envsubst < /${hazelcastTemplateFilename}.template > ${GEOSERVER_DATA_DIR}/cluster/${hazelcastTemplateFilename}.properties

for nodeIp in ${serviceNodesIps}

do

	if [ "${nodeIp}" == "${myIp}" ];then

		continue;

	fi

	clusterNodesIps="${clusterNodesIps}<hostname>${nodeIp}</hostname>"

done

export CLUSTER_NODES_IPS_TAGS="${clusterNodesIps}"



mkdir -p ${GEOSERVER_DATA_DIR}/cluster



clusterTemplateName="cluster"

hazelcastTemplateName="hazelcast"



envsubst < /${clusterTemplateName}.template > ${GEOSERVER_DATA_DIR}/cluster/${clusterTemplateName}.properties

envsubst < /${hazelcastTemplateName}.template > ${GEOSERVER_DATA_DIR}/cluster/${hazelcastTemplateName}.properties



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

scripts/hazelcast.template

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    <join>

      <multicast enabled="false"></multicast>

      <tcp-ip enabled="true">

        <hostname>${CLUSTER_DISCOVERY_URL}</hostname>

        ${CLUSTER_NODES_IPS_TAGS}

      </tcp-ip>

    </join>

  </network>