Commit 4ba80e26 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Mapea puertos para producción

See merge request redmic-project/index-page/redmic-dev!2
parents fd5c1835 dc0b2fea

.gitlab-ci.yml

+3 −6
Original line number Diff line number Diff line
@@ -5,10 +5,12 @@ stages: 
  - test-package

  - deploy



variables:

  DOCKER_DRIVER: overlay2



docker-build-development:

  stage: package

  variables:

    DOCKER_DRIVER: overlay2

    PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/index-pages

    PARENT_IMAGE_TAG: dev-latest

  services:
@@ -27,7 +29,6 @@ docker-build-development: 
docker-build-stable:

  stage: package

  variables:

    DOCKER_DRIVER: overlay2

    PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/index-pages

    PARENT_IMAGE_TAG: latest

  services:
@@ -43,8 +44,6 @@ docker-build-stable: 


container-scanning:

  stage: test-package

  variables:

    DOCKER_DRIVER: overlay2

  allow_failure: true

  services:

    - docker:stable-dind
@@ -68,7 +67,6 @@ deploy-development: 
  stage: deploy

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

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: ${CI_PROJECT_NAME}

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}
@@ -94,7 +92,6 @@ deploy-stable: 
  stage: deploy

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

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: ${CI_PROJECT_NAME}

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

docker-compose.prod.yml

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


services:

 redmic-dev:

    ports:

      - target: ${SITE_PORT}

        published: ${SITE_PORT}

        mode: host

    deploy:

      mode: replicated

      replicas: 1

docker-compose.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ services: 
      interval: 30s

      timeout: 10s

      retries: 3

      start_period: 2m

      start_period: 1m



networks:

  redmic-net: