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

Merge branch 'dev' into 'master' 

Actualiza puerto interno y host a escuchar

See merge request redmic-project/static-pages!2
parents e14d66f4 de4f98c4

.env

+1 −0
Original line number Diff line number Diff line 
INTERNAL_PORT=8080

EXTERNAL_PORT=8099

PUBLIC_HOSTNAME=redmic.es

.gitlab-ci.yml

+3 −1
Original line number Diff line number Diff line
@@ -128,7 +128,9 @@ deploy-pro: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: '40'

    STACK: ${CI_PROJECT_NAME}

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

docker-compose.dev.yml

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ services: 
    container_name: static-pages

    restart: on-failure:3

    ports:

      - ${EXTERNAL_PORT}:80
 
      - ${EXTERNAL_PORT}:${INTERNAL_PORT}

docker-compose.prod.yml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ services: 
    deploy:

      mode: global

      labels:

        traefik.port: "80"

        traefik.port: "${INTERNAL_PORT}"

        traefik.docker.network: traefik-net

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

        traefik.backend: static-pages

static-pages.conf

+2 −2
Original line number Diff line number Diff line 
server {

	listen 80 default_server;

	server_name static-pages;

	listen 8080 default_server;

	server_name localhost;



	index index.html index.htm;