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

Pone al día el proyecto 

Actualiza ficheros compose y configuración del servicio.

Actualiza definición CI, usando plantillas actualizadas.

Migra exposición a Traefik v2.

Limpia restos y reorganiza recursos de construcción y despliegue.
parent a67cdc0d

.gitlab-ci.yml

+5 −6
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
@@ -34,6 +34,5 @@ maven-build-view: 


.docker-build:

  variables:

    COMPOSE_FILE_NAME: docker-compose.time-series.build.yml

    DBLD_PARENT_IMAGE_NAME: ${REDMIC_SERVER_IMAGE_NAME}

    DBLD_PARENT_IMAGE_TAG: ${REDMIC_SERVER_IMAGE_TAG}

Dockerfile

deleted100644 → 0
+0 −12
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



FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}



COPY /*/dist/*.jar ./



ARG PORT=8080



EXPOSE ${PORT}



ENV PORT=${PORT}

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

build/Dockerfile

0 → 100644
+12 −0
Original line number Diff line number Diff line 
ARG PARENT_IMAGE_NAME \

    PARENT_IMAGE_TAG



FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}



ARG MICROSERVICE_PORT



ENV MICROSERVICE_PORT=${MICROSERVICE_PORT}



EXPOSE ${MICROSERVICE_PORT}



COPY /dist/*.jar ./

.dockerignore→build/Dockerfile.dockerignore

+0 −0

File moved.

View file