Commit 431cad38 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza config de build y deploy 

Separa recursos de build en directorio propio.

Actualiza ficheros compose y plantillas CI.

Utiliza por defecto subdominio api unificado, en lugar de nombre propio.
parent bde61100

.gitlab-ci.yml

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

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

    ref: master

    file: '/maven-building-microservice.yml'

    file: '/building/maven/microservice.yml'

  - 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'

    file: '/packaging-docker/docker-build.yml'

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

    ref: master

    file: '/deployment.yml'

    file: '/deployment-service/docker-deploy.yml'

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

    ref: master

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

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

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

    ref: master

    file: '/deployment-external-service/backup-files.yml'

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

    ref: master

    file: '/maintenance.yml'

    file: '/deployment-service/maintenance.yml'



stages:

  - build

  - license-list

  - test

  - pre-package

  - package

  - post-package
@@ -211,8 +211,6 @@ variables: 
  variables:

    STACK: ${PROJECT_PARENT_NAME}

    STATUS_CHECK_DELAY: 300

  environment:

    url: https://${PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}



.deploy-external-service:

  variables:

build/.env

0 → 100644
+4 −0
Original line number Diff line number Diff line 
PARENT_IMAGE_NAME=registry.gitlab.com/redmic-project/docker/redmic-server

PARENT_IMAGE_TAG=latest

MICROSERVICE_NAME=api

MICROSERVICE_PORT=8080

Dockerfile→build/Dockerfile

+14 −0
Original line number Diff line number Diff line 
ARG PARENT_IMAGE_NAME=registry.gitlab.com/redmic-project/docker/redmic-server

ARG PARENT_IMAGE_TAG=latest

ARG PARENT_IMAGE_NAME=registry.gitlab.com/redmic-project/docker/redmic-server \

    PARENT_IMAGE_TAG=latest



FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}



COPY /dist/*.jar ./



ARG MICROSERVICE_NAME=api

ENV MICROSERVICE_NAME=${MICROSERVICE_NAME}

ARG MICROSERVICE_NAME \

    MICROSERVICE_PORT



ARG MICROSERVICE_PORT=8080

ENV MICROSERVICE_PORT=${MICROSERVICE_PORT}

ENV MICROSERVICE_NAME=${MICROSERVICE_NAME} \

    MICROSERVICE_PORT=${MICROSERVICE_PORT}



EXPOSE ${MICROSERVICE_PORT}



COPY /dist/*.jar ./

.dockerignore→build/Dockerfile.dockerignore

+0 −0

File moved.

View file

build/compose.yaml

0 → 100644
+11 −0
Original line number Diff line number Diff line 
services:

  api:

    image: ${IMAGE_NAME:-registry.gitlab.com/redmic-project/server/api}:${IMAGE_TAG:-latest}

    build:

      context: ..

      dockerfile: ${DOCKERFILE:-build/Dockerfile}

      args:

        PARENT_IMAGE_NAME:

        PARENT_IMAGE_TAG:

        MICROSERVICE_NAME:

        MICROSERVICE_PORT: