Commit 340e839a authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Elimina ficheros compose innecesarios, retoca CI

See merge request redmic-project/index-page/redmic-pro!3
parents 97916cb4 816ce6f0

.dockerignore

+1 −1
Original line number Diff line number Diff line 
*

!/content
 
!content

.gitlab-ci.yml

+7 −15
Original line number Diff line number Diff line
@@ -71,16 +71,12 @@ container-scanning: 


deploy-development:

  stage: deploy

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

  variables:

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

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

  script:

    - >

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

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

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

  environment:

    name: dev

    url: https://index.${PRO_PUBLIC_HOSTNAME}

    name: pro

    url: https://index.${PUBLIC_HOSTNAME}

  only:

    - branches

  except:
@@ -89,15 +85,11 @@ deploy-development: 


deploy-stable:

  stage: deploy

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

  variables:

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

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

  script:

    - >

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

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

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

  environment:

    name: pro

    url: https://index.${PRO_PUBLIC_HOSTNAME}

    url: https://index.${PUBLIC_HOSTNAME}

  only:

    - master

content/config.js

+10 −0
Original line number Diff line number Diff line
@@ -83,5 +83,15 @@ var config = { 
		"img": "kibana.png",

		"title": "Kibana",

		"description": "Visualizador y gestor de Elasticsearch"

	},{

		"subdomain": "nifi",

		"img": "nifi.png",

		"title": "Apache NiFi",

		"description": "Plataforma de procesamiento y distribución de datos"

	},{

		"subdomain": "static",

		"img": "static.png",

		"title": "Static pages",

		"description": "Páginas web estáticas, usadas para mostrar en caso de mantenimiento, error, etc."

	}]

};

content/resources/nifi.png

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

content/resources/static.png

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