Commit 1507e2e4 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza imágenes de CI y de la base de ejecución

parent 973bc1ec

.gitlab-ci.yml

+21 −13
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ stages: 


maven-build-lib:

  stage: build-lib

  image: redmic/maven-gitlab

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

  variables:

    MAVEN_OPTS: -Dmaven.repo.local=.m2/repository

    SPRING_PROFILES_ACTIVE: test
@@ -32,7 +32,7 @@ maven-build-lib: 


maven-build-commands:

  stage: build-services

  image: redmic/maven-gitlab

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

  variables:

    MAVEN_OPTS: -Dmaven.repo.local=.m2/repository

    SPRING_PROFILES_ACTIVE: test
@@ -58,7 +58,7 @@ maven-build-commands: 


maven-build-view:

  stage: build-services

  image: redmic/maven-gitlab

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

  variables:

    MAVEN_OPTS: -Dmaven.repo.local=.m2/repository

    SPRING_PROFILES_ACTIVE: test
@@ -84,9 +84,11 @@ maven-build-view: 


docker-build-commit:

  stage: package

  image: redmic/docker-gitlab

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

    PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/redmic-server

    PARENT_IMAGE_TAG: latest

  services:

    - docker:dind

  only:
@@ -95,21 +97,27 @@ docker-build-commit: 
    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - >

      docker build --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}

      -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-build-tag:

  stage: package

  image: redmic/docker-gitlab

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

    PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/redmic-server

    PARENT_IMAGE_TAG: latest

  services:

    - docker:dind

  only:

    - tags

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG} -t ${CI_REGISTRY_IMAGE}:latest .

    - >

      docker build --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}

      -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG} -t ${CI_REGISTRY_IMAGE}:latest .

    - docker push ${CI_REGISTRY_IMAGE}



container_scanning:
@@ -140,7 +148,7 @@ container_scanning: 


deploy-commands-dev:

  stage: deploy

  image: redmic/docker-gitlab

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

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}
@@ -162,7 +170,7 @@ deploy-commands-dev: 


deploy-view-dev:

  stage: deploy

  image: redmic/docker-gitlab

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

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}
@@ -184,7 +192,7 @@ deploy-view-dev: 


deploy-commands-supporting-branch:

  stage: deploy

  image: redmic/docker-gitlab

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

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}
@@ -210,7 +218,7 @@ deploy-commands-supporting-branch: 


deploy-view-supporting-branch:

  stage: deploy

  image: redmic/docker-gitlab

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

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}
@@ -236,7 +244,7 @@ deploy-view-supporting-branch: 


deploy-commands-pro:

  stage: deploy

  image: redmic/docker-gitlab

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

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}
@@ -259,7 +267,7 @@ deploy-commands-pro: 


deploy-view-pro:

  stage: deploy

  image: redmic/docker-gitlab

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

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

Dockerfile

+4 −1
Original line number Diff line number Diff line 
FROM redmic/redmic-server

ARG PARENT_IMAGE_NAME

ARG PARENT_IMAGE_TAG



FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}



ENV SERVICE=undefined-service