Commit 9aa8d202 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Implementa recarga de esclavos desde maestro

See merge request redmic-project/gis/geoserver!21
parents 1501abcc 97b1265b

.env

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

ACTIVEMQ_PORT=61666
 
GEOSERVER_USER=admin

GEOSERVER_PASS=geoserver

SLAVE_SERVICE_NAME=geoserver-slave

SLAVES_MANAGEMENT_DELAY=180

SLAVES_MANAGEMENT_INTERVAL=1800

SLAVE_MANAGEMENT_TIMEOUT=300

.gitlab-ci.yml

+4 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ deploy-dev: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    STATUS_CHECK_DELAY: 120

    STATUS_CHECK_DELAY: '60'

  services:

    - docker:dind

  script:
@@ -91,7 +91,7 @@ deploy-supporting-branch: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    STATUS_CHECK_DELAY: 120

    STATUS_CHECK_DELAY: '60'

  services:

    - docker:dind

  script:
@@ -117,7 +117,8 @@ deploy-pro: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    STATUS_CHECK_DELAY: 120

    STATUS_CHECK_DELAY: '120'

    STATUS_CHECK_INTERVAL: '20'

    GEOSERVER_SUBDOMAIN: ${PRO_GEOSERVER_SUBDOMAIN}

    GEOSERVER_ADMIN_SUBDOMAIN: ${PRO_GEOSERVER_ADMIN_SUBDOMAIN}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

Dockerfile

+19 −18
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ RUN apt-get update && \ 
        libgdal-java \

        libnetcdf11 \

        libnetcdf-c++4 \

        netcdf-bin

        netcdf-bin \

        dnsutils



# Copy resources

COPY resources ${TEMP_PATH}
@@ -83,9 +84,9 @@ ARG MARLIN_VERSION=0.9.1 
RUN FILENAME=$(echo "marlin-${MARLIN_VERSION}-Unsafe.jar") && \

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

        URL="https://github.com/bourgesl/marlin-renderer/releases/download/v0_9_1//${FILENAME}" && \

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

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

    fi; \

    cp ${TEMP_PATH}/$FILENAME ${GEOSERVER_HOME}/lib

    cp ${TEMP_PATH}/${FILENAME} ${GEOSERVER_HOME}/lib



ENV MARLIN_JAR="${GEOSERVER_HOME}/lib/marlin-${MARLIN_VERSION}-Unsafe.jar"
@@ -94,34 +95,34 @@ ARG TURBO_JPEG_VERSION=1.5.3 
RUN TURBO_JPEG_FILENAME=$(echo "libjpeg-turbo-official_${TURBO_JPEG_VERSION}_amd64.deb") && \

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

        URL="https://sourceforge.net/projects/libjpeg-turbo/files/${TURBO_JPEG_VERSION}/${TURBO_JPEG_FILENAME}" && \

        curl -L $URL --output ${TEMP_PATH}/${TURBO_JPEG_FILENAME} ; \

        curl -L ${URL} --output ${TEMP_PATH}/${TURBO_JPEG_FILENAME} ; \

    fi; \

    dpkg -i ${TEMP_PATH}/$TURBO_JPEG_FILENAME

    dpkg -i ${TEMP_PATH}/${TURBO_JPEG_FILENAME}



# Install JAI & Image IO

ARG JAI_VERSION=1_1_3

ARG IMAGE_IO_VERSION=1_1



RUN rm ${GEOSERVER_HOME}/webapps/geoserver/WEB-INF/lib/jai_*jar && \

    cd $JAVA_HOME && \

    echo $JAVA_HOME && \

    cd ${JAVA_HOME} && \

    echo ${JAVA_HOME} && \

    JAI_FILENAME=$(echo "jai-${JAI_VERSION}-lib-linux-amd64-jdk.bin") && \

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

        URL="http://data.boundlessgeo.com/suite/jai/${JAI_FILENAME}" && \

        curl -L $URL --output $TEMP_PATH/$JAI_FILENAME ; \

        curl -L ${URL} --output ${TEMP_PATH}/${JAI_FILENAME} ; \

    fi; \

    mv $TEMP_PATH/$JAI_FILENAME $JAVA_HOME && \

    echo "yes" | sh $JAI_FILENAME && \

    rm $JAI_FILENAME && \

    mv ${TEMP_PATH}/${JAI_FILENAME} ${JAVA_HOME} && \

    echo "yes" | sh ${JAI_FILENAME} && \

    rm ${JAI_FILENAME} && \

    export _POSIX2_VERSION=199209 && \

    IMAGE_IO_FILENAME="jai_imageio-${IMAGE_IO_VERSION}-lib-linux-amd64-jdk.bin" && \

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

        URL="http://data.opengeo.org/suite/jai/${IMAGE_IO_FILENAME}" && \

        curl -L $URL --output $TEMP_PATH/$IMAGE_IO_FILENAME ; \

        curl -L ${URL} --output ${TEMP_PATH}/${IMAGE_IO_FILENAME} ; \

    fi; \

    mv $TEMP_PATH/$IMAGE_IO_FILENAME $JAVA_HOME && \

    echo "yes" | sh $IMAGE_IO_FILENAME && \

    rm $IMAGE_IO_FILENAME

    mv ${TEMP_PATH}/${IMAGE_IO_FILENAME} ${JAVA_HOME} && \

    echo "yes" | sh ${IMAGE_IO_FILENAME} && \

    rm ${IMAGE_IO_FILENAME}



# Install GeoServer Plugins

RUN URL="https://sourceforge.net/projects/geoserver/files/GeoServer/${GEOSERVER_VERSION}/extensions" && \
@@ -129,7 +130,7 @@ RUN URL="https://sourceforge.net/projects/geoserver/files/GeoServer/${GEOSERVER_ 
    do \

        FILENAME="geoserver-${GEOSERVER_VERSION}-${PLUGIN}-plugin.zip" && \

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

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

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

        fi; \

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

    done
@@ -140,7 +141,7 @@ RUN URL="http://ares.boundlessgeo.com/geoserver/${GEOSERVER_MAJOR_VERSION}.x/com 
    do \

        FILENAME="geoserver-${GEOSERVER_MAJOR_VERSION}-SNAPSHOT-${PLUGIN}-plugin.zip" && \

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

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

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

        fi; \

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

    done
@@ -157,7 +158,7 @@ RUN rm -fr ${TEMP_PATH} && \ 


COPY ./scripts /



EXPOSE 8080

EXPOSE ${GEOSERVER_PORT}



ENTRYPOINT ["/docker-entrypoint.sh"]

docker-compose.prod.yml

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ version: '3.5' 


services:

  geoserver-master:

    environment:

      - SWARM_MODE=true

    networks:

      - traefik-net

    deploy:
@@ -48,6 +50,7 @@ services: 
          memory: 1500M

        reservations:

          memory: 1200M



networks:

  traefik-net:

    external: true

docker-compose.tmpl.yml

+8 −0
Original line number Diff line number Diff line
@@ -4,7 +4,15 @@ services: 
  geoserver-master:

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

    environment:

      - ROLE=master

      - JAVA_OPTS=-Xmx512m -Xss512m

      - GEOSERVER_PORT

      - GEOSERVER_USER

      - GEOSERVER_PASS

      - SLAVE_SERVICE_NAME

      - SLAVES_MANAGEMENT_DELAY

      - SLAVES_MANAGEMENT_INTERVAL

      - SLAVE_MANAGEMENT_TIMEOUT

    networks:

      - gis-net

      - postgres-net