Commit 71ab6fc2 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Retoca detalles de ci y deploy

See merge request redmic-project/index-page/redmic-dev!7
parents 8c8c7130 9d86080a

.gitlab-ci.yml

+7 −13
Original line number Diff line number Diff line
@@ -10,13 +10,19 @@ services: 


variables:

  DOCKER_DRIVER: overlay2

  SSH_REMOTE: ${DEV_SSH_REMOTE}

  STATUS_CHECK_DELAY: 60

  STACK: index

  SERVICES_TO_CHECK: index_${CI_PROJECT_NAME}

  IMAGE_NAME: ${CI_REGISTRY_IMAGE}

  IMAGE_TAG: ${CI_COMMIT_SHA}

  PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}



docker-build-development:

  stage: package

  variables:

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

    PARENT_IMAGE_TAG: dev-latest

    PARENT_IMAGE_TAG: latest

  only:

    - branches

  except:
@@ -67,13 +73,7 @@ deploy-development: 
  stage: deploy

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

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    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.dev.yml

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
@@ -91,13 +91,7 @@ deploy-stable: 
  stage: deploy

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

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    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

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:

    - >

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

content/config.js

+6 −1
Original line number Diff line number Diff line 
var config = {

	"domain": "redmic.net",

	"protocol": "https",

	"resourcesPath": "content/resources/",

	"resourcesPath": "resources",

	"title": "Bienvenido a redmic.net",

	"items": [{

		"href": "https://redmic.net",
@@ -108,5 +108,10 @@ var config = { 
		"img": "traefik.png",

		"title": "Traefik",

		"description": "Dashboard de Traefik, proxy inverso dinámico de contenedores y balanceador de carga"

	},{

		"subdomain": "kibana",

		"img": "kibana.png",

		"title": "Kibana",

		"description": "Visualizador y gestor de Elasticsearch"

	}]

};

content/favicon.ico

0 → 100644
+97.3 KiB
Loading image diff...

content/resources/kibana.png

0 → 100644
+10.3 KiB
Loading image diff...

deploy/docker-compose.tmpl.yml

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ services: 
    networks:

      - traefik-net

    healthcheck:

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

      test: wget --spider http://localhost:${SITE_PORT}

      interval: 30s

      timeout: 10s

      retries: 3
@@ -15,10 +15,9 @@ services: 
      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${SITE_PORT}"

        traefik.docker.network: traefik-net

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

        traefik.backend: ${SITE_NAME}

        traefik.port: "${SITE_PORT}"

      placement:

        constraints:

          - node.role == manager
@@ -34,4 +33,5 @@ services: 


networks:

  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    external: true