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

Merge branch 'dev' into 'master'

Dev

See merge request redmic-project/index-page/redmic-pro!9
parents bb6426d9 b75c9e17
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ stages:
  - deploy

variables:
  PROJECT_PARENT_NAME: index
  COMPOSE_NAME: docker-compose.yml

.docker-build:
@@ -25,11 +24,8 @@ variables:

.deploy:
  variables:
    STACK: ${PROJECT_PARENT_NAME}
    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}
    STACK: index
    STATUS_CHECK_DELAY: 60
  environment:
    url: https://${PROJECT_PARENT_NAME}.${PUBLIC_HOSTNAME}

.deploy-compose-file:
  variables: &deploy-compose-file-variables
+2 −0
Original line number Diff line number Diff line
@@ -5,4 +5,6 @@ FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}

LABEL maintainer="info@redmic.es"

WORKDIR ${DIRPATH}

COPY content content/
+8 −3
Original line number Diff line number Diff line
@@ -36,8 +36,13 @@ var config = {
	},{
		"subdomain": "kafkamanager",
		"img": "kafka-manager.png",
		"title": "Kafka Manager",
		"description": "Gestor de brokers y topics de Kafka"
		"title": "CMAK",
		"description": "Gestor de brokers, topics y consumers de Kafka"
	},{
		"subdomain": "kowl",
		"img": "kowl.jpg",
		"title": "Kowl",
		"description": "Gestor detallado del entorno Kafka"
	},{
		"subdomain": "prometheus",
		"img": "prometheus.svg",
@@ -64,7 +69,7 @@ var config = {
		"title": "Karma",
		"description": "Dashboard de visualización de alertas generadas por Alertmanager"
	},{
		"subdomain": "atlas-admin",
		"subdomain": "atlas",
		"img": "geoserver.png",
		"title": "Atlas",
		"description": "Gestor de GeoServer, servidor de datos GIS"
+10.7 KiB
Loading image diff...