Commit c654eb1d authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/index-page/redmic-dev!11
parents 3a422513 6a44edf2

.gitignore

deleted100644 → 0
+0 −0

Empty file deleted.

.gitlab-ci.yml

+22 −31
Original line number Diff line number Diff line
@@ -4,48 +4,39 @@ include: 
    file: '/packaging.yml'

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/_deployment.yml'

    file: '/deployment.yml'

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment-custom-image.yml'



stages:

  - package

  - test-package

  - deploy



.docker-operations-build:

variables:

    PARENT_IMAGE_NAME: redmic/docker-index-pages

    PARENT_IMAGE_TAG: v1.0.0

    DOCKER_BUILD_ARGS: --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}

  PROJECT_PARENT_NAME: index



.deploy:

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: index

    SERVICES_TO_CHECK: index_${CI_PROJECT_NAME}

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: 60

    DD_IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    DD_IMAGE_TAG: ${CI_COMMIT_SHA}

    DD_PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  environment:

    name: dev

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

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



deploy-support-branch-development:

  extends: .deploy

  only:

    - branches

  except:

    - master

    - schedules

.deploy-compose-file:

  variables: &deploy-compose-file-variables

    COMPOSE_FILE: docker-compose.yml



deploy-stable-branch-development:

  extends: .deploy

  only:

    - master

  except:

    - schedules

.deploy-development:

  variables:

    <<: *deploy-compose-file-variables



deploy-version-development:

  extends: .deploy

  only:

    - tags
 
.deploy-production:

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SSH_PORT: ${DEV_SSH_PORT}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    DD_PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    <<: *deploy-compose-file-variables

content/config.js

+28 −28
Original line number Diff line number Diff line 
var config = {

	"domain": "redmic.net",

	"domain": "redmic.grafcan.es",

	"protocol": "https",

	"resourcesPath": "resources",

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

	"title": "Bienvenido a redmic.grafcan.es",

	"items": [{

		"href": "https://redmic.net",

		"href": "https://redmic.grafcan.es",

		"img": "redmic.png",

		"title": "REDMIC",

		"description": "Versión de desarrollo de REDMIC (Repositorio de Datos Marinos Integrados de Canarias)"

deploy/docker-compose.yml

+1 −0
Original line number Diff line number Diff line
@@ -42,4 +42,5 @@ services: 
networks:

  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    driver: ${TRAEFIK_NET_DRIVER:-overlay}

    external: true