Commit 0de7a2c8 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Añade visor STAC y generaliza embed

See merge request redmic-project/client/web!101
parents ef7b611b 6e31594f

.gitlab-ci.build.yml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ prepare-unbuilt-version: 
  stage: pre-build

  script:

    - grunt preBuild

  dependencies: []

  tags:

    - custom-runner

  artifacts:

.gitlab-ci.deploy.yml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
.deploy:

  variables:

    STACK: client

  environment:

    url: https://${PUBLIC_HOSTNAME}



deploy-support-branch-development:

  variables:

    DD_VERSION: ${CI_COMMIT_SHORT_SHA}

.gitlab-ci.package.yml

0 → 100644
+2 −0
Original line number Diff line number Diff line 
.docker-build:

  dependencies: ["prepare-built-version"]

.gitlab-ci.scan.yml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
dependency_scanning:

  stage: pre-build

  variables:

    DS_MAX_DEPTH: 0

    DS_REMEDIATE: 'false'

.gitlab-ci.yml

+5 −9
Original line number Diff line number Diff line 
include:

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

    ref: master

    file: '/license-listing.yml'

    file: '/scanning/dependency-scanning.yml'

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

    ref: master

    file: '/packaging.yml'
@@ -11,21 +11,17 @@ include: 
  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

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

  - local: '/.gitlab-ci.build.yml'

  - local: '/.gitlab-ci.scan.yml'

  - local: '/.gitlab-ci.test.yml'

  - local: '/.gitlab-ci.build.yml'

  - local: '/.gitlab-ci.package.yml'

  - local: '/.gitlab-ci.deploy.yml'



stages:

  - pre-build

  - build

  - license-list

  - pre-package

  - package

  - post-package

  - deploy

  - test-deploy
 


.deploy:

  variables:

    STACK: client

  environment:

    url: https://${PUBLIC_HOSTNAME}