Commit 8dfea3b1 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza config de build y deploy y simplifica 

Separa recursos de build en directorio propio.

Limpia ficheros compose, actualiza nombres de variables e incluye
algunas nuevas.

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

Acorta nombres de variables, quitando prefijos innecesarios.

Actualiza opciones de montaje nfs de volumen.

Actualiza templates CI utilizados y revisa jobs.
parent 46b68527

.dockerignore

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
*



!/*-commands/

/*-commands/*

!/*-commands/dist/

/*-commands/dist/*

!/*-commands/dist/*.jar



!/*-view/

/*-view/*

!/*-view/dist/

/*-view/dist/*

!/*-view/dist/*.jar

.gitlab-ci.yml

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

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

    ref: master

    file: '/maven-building-functional-unit.yml'

    file: '/building/maven/functional-unit.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-functional-unit.yml'

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



stages:

  - build-parent

  - build-lib

  - build-service

  - license-list

  - test

  - pre-package

  - package

  - post-package
@@ -119,10 +119,5 @@ maven-build-view: 


.docker-build:

  variables:

    COMPOSE_FILE_NAME: docker-compose.atlas.build.yml

    DBLD_PARENT_IMAGE_NAME: ${REDMIC_SERVER_IMAGE_NAME}

    DBLD_PARENT_IMAGE_TAG: ${REDMIC_SERVER_IMAGE_TAG}
 


.deploy:

  variables:

    STACK: atlas

build/.env

0 → 100644
+3 −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_PORT=8080

Dockerfile→build/Dockerfile

+6 −6
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_PORT



ARG PORT=8080

ENV MICROSERVICE_PORT=${MICROSERVICE_PORT}



EXPOSE ${PORT}

EXPOSE ${MICROSERVICE_PORT}



ENV PORT=${PORT}
 
COPY /*/dist/*.jar ./

build/Dockerfile.dockerignore

0 → 100644
+3 −0
Original line number Diff line number Diff line 
*

!/*-commands/dist/*.jar

!/*-view/dist/*.jar