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

Separa geoserver en servicios y actualiza detalles 

Ahora cuenta con un servicio de maestro-esclavo y otro de esclavo, con
distinto nivel de replicación.
parent 8b6678b8

.gitlab-ci.yml

+31 −8
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ stages: 
  - test-package

  - deploy



docker-build-dev:

docker-build-commit-non-master-branches:

  stage: package

  image: redmic/docker-gitlab

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

  services:
@@ -19,9 +19,9 @@ docker-build-dev: 
    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-build-pro:

docker-build-commit-master-branch:

  stage: package

  image: redmic/docker-gitlab

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

  services:
@@ -33,7 +33,7 @@ docker-build-pro: 
    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:latest .

    - docker push ${CI_REGISTRY_IMAGE}



container_scanning:

container-scanning:

  stage: test-package

  image: docker:stable

  variables:
@@ -43,8 +43,6 @@ container_scanning: 
    - docker:stable-dind

  only:

    - branches

  except:

    - master

  script:

    - docker run -d --name db arminc/clair-db:latest

    - docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1
@@ -55,11 +53,35 @@ container_scanning: 
    - mv clair-scanner_linux_amd64 clair-scanner

    - chmod +x clair-scanner

    - touch clair-whitelist.yml

    - ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log -w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} || true

    - >

      ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log

      -w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} || true

  artifacts:

    paths: [gl-sast-container-report.json]



deploy-dev:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    STATUS_CHECK_DELAY: 120

  services:

    - docker:dind

  script:

    - deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

  environment:

    name: dev

    url: https://atlas.${DEV_PUBLIC_HOSTNAME}

  only:

    - dev

  when: manual



deploy-supporting-branch:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:
@@ -81,6 +103,7 @@ deploy-dev: 
    - branches

  except:

    - master

    - dev

  when: manual



deploy-pro:

Dockerfile

+7 −24
Original line number Diff line number Diff line 
FROM openjdk:8-jdk



RUN export DEBIAN_FRONTEND=noninteractive



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" \
@@ -25,16 +23,16 @@ ENV DEBIAN_FRONTEND="noninteractive" \ 
    ROLE="slave"



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

    GEOSERVER_LOG_LOCATION="${GEOSERVER_LOG_DIR}/geoserver.log"

    GEOSERVER_LOG_LOCATION="${GEOSERVER_LOG_DIR}/geoserver.log" \

    GDAL_DATA="/usr/share/gdal/2.1" \

    JAVA_OPTS="${JAVA_OPTS} -Djava.library.path=/usr/share/java:/opt/libjpeg-turbo/lib64:/usr/lib/jni ${GEOSERVER_OPTS}"



ARG TEMP_PATH=/tmp/resources





RUN mkdir -p $TEMP_PATH && \

    mkdir -p $CLUSTER_CONFIG_DIR && \

    mkdir -p $GEOSERVER_DATA_DIR





# Install extra fonts to use with sld font markers

RUN apt-get update && \

    apt-get install -y --no-install-recommends fonts-cantarell \
@@ -55,8 +53,7 @@ RUN apt-get update && \ 
        rsync



# Copy resources

COPY resources $TEMP_PATH



COPY resources ${TEMP_PATH}



# Install Google Noto fonts

RUN mkdir -p /usr/share/fonts/truetype/noto && \
@@ -68,7 +65,6 @@ RUN mkdir -p /usr/share/fonts/truetype/noto && \ 
        unzip -o ${TEMP_PATH}/${FONT}.zip -d /usr/share/fonts/truetype/noto ; \

    done





# Install Google Fonts

RUN for FONT in ${GOOGLE_FONTS}; \

    do \
@@ -79,7 +75,6 @@ RUN for FONT in ${GOOGLE_FONTS}; \ 
        unzip -o ${TEMP_PATH}/${FONT}.zip -d /usr/share/fonts/truetype/${FONT} ; \

    done





# Install GeoServer

RUN FILENAME="geoserver-${GEOSERVER_VERSION}-bin.zip" && \

    if [ ! -f ${TEMP_PATH}/${FILENAME} ]; then \
@@ -95,7 +90,6 @@ RUN FILENAME="geoserver-${GEOSERVER_VERSION}-bin.zip" && \ 
    rm -rf ${GEOSERVER_HOME}/data_dir/demo && \

    rm -rf ${GEOSERVER_HOME}/data_dir/logs





# Install Marlin

ARG MARLIN_VERSION=0.9.1

RUN FILENAME=$(echo "marlin-${MARLIN_VERSION}-Unsafe.jar") && \
@@ -107,10 +101,8 @@ RUN FILENAME=$(echo "marlin-${MARLIN_VERSION}-Unsafe.jar") && \ 


ENV MARLIN_JAR="${GEOSERVER_HOME}/lib/marlin-${MARLIN_VERSION}-Unsafe.jar"





# Install Turbo JPEG

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}" && \
@@ -118,7 +110,6 @@ RUN TURBO_JPEG_FILENAME=$(echo "libjpeg-turbo-official_${TURBO_JPEG_VERSION}_amd 
    fi; \

    dpkg -i ${TEMP_PATH}/$TURBO_JPEG_FILENAME





# Install JAI & Image IO

ARG JAI_VERSION=1_1_3

ARG IMAGE_IO_VERSION=1_1
@@ -144,7 +135,6 @@ RUN rm ${GEOSERVER_HOME}/webapps/geoserver/WEB-INF/lib/jai_*jar && \ 
    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" && \

    for PLUGIN in ${GEOSERVER_PLUGINS}; \
@@ -156,7 +146,6 @@ RUN URL="https://sourceforge.net/projects/geoserver/files/GeoServer/${GEOSERVER_ 
        unzip -o "${TEMP_PATH}/${FILENAME}" -d "${GEOSERVER_HOME}/webapps/geoserver/WEB-INF/lib/" ; \

    done





# Install GeoServer Community Plugins

RUN URL="http://ares.boundlessgeo.com/geoserver/${GEOSERVER_MAJOR_VERSION}.x/community-latest" && \

    for PLUGIN in ${GEOSERVER_COMMUNITY_PLUGINS}; \
@@ -168,7 +157,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" && \
@@ -177,25 +165,20 @@ RUN URL="https://github.com/ngageoint/elasticgeo/releases/download/${GEOSERVER_V 
    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 \

        "${GEOSERVER_HOME}/webapps/geoserver/WEB-INF/lib/imageio-ext-gdal-bindings-${GDAL_VERSION}.jar"





ENV GDAL_DATA="/usr/share/gdal/2.1" \

    JAVA_OPTS="$JAVA_OPTS -Djava.library.path=/usr/share/java:/opt/libjpeg-turbo/lib64:/usr/lib/jni $GEOSERVER_OPTS"





# Clean

RUN rm -fr ${TEMP_PATH} && \

    rm -rf /var/lib/apt/lists/* && \

    apt-get clean



COPY ./scripts /

ENTRYPOINT ["/docker-entrypoint.sh"]



EXPOSE 8080



ENTRYPOINT ["/docker-entrypoint.sh"]



CMD ["/opt/geoserver/bin/startup.sh"]

docker-compose.dev.yml

+2 −2
Original line number Diff line number Diff line 
version: '3.5'



services:

  geoserver:

    container_name: geoserver

  geoserver-master:

    container_name: geoserver-master

    restart: on-failure:3

    ports:

      - 8095:${GEOSERVER_PORT}

docker-compose.prod.yml

+24 −7
Original line number Diff line number Diff line 
version: '3.5'



services:

  geoserver:

    environment:

      - SWARM_MODE=true

  geoserver-master:

    networks:

      - traefik-net

    deploy:

      mode: replicated

      replicas: 3

      replicas: 1

      labels:

        traefik.port: "${GEOSERVER_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}

        traefik.backend: geoserver

        traefik.backend.loadbalancer.stickiness: "true"

        traefik.frontend.rule: "Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};PathPrefix:/geoserver,PathPrefix:/geoserver/web,PathPrefix:/geoserver/rest"

        traefik.frontend.priority: "1"

        traefik.backend: geoserver-master

      placement:

        constraints:

          - node.role == worker

      restart_policy:

        condition: on-failure

        max_attempts: 3



  geoserver-slave:

    networks:

      - traefik-net

    deploy:

      mode: replicated

      replicas: 2

      labels:

        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: "1"

        traefik.backend: geoserver-slave

      placement:

        constraints:

          - node.role == worker

docker-compose.tmpl.yml

+17 −3
Original line number Diff line number Diff line 
version: '3.5'



services:

  geoserver:

  geoserver-master:

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

    environment:

      - ROLE=master-slave

      - BROKER_SERVICE_NAME=activemq

      - ACTIVEMQ_PORT

      - JAVA_OPTS=-Xmx1g -Xss1g

    networks:

      - gis-net
@@ -20,6 +18,22 @@ services: 
      retries: 3

      start_period: 2m



  geoserver-slave:

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

    environment:

      - ROLE=slave

      - JAVA_OPTS=-Xmx1g -Xss1g

    networks:

      - gis-net

    volumes:

      - geoserver-vol:/var/geoserver/data

    healthcheck:

      test: wget --spider -S -t 3 http://localhost:${GEOSERVER_PORT}/geoserver

      interval: 30s

      timeout: 10s

      retries: 3

      start_period: 2m



networks:

  gis-net:

    external: true