Commit 7a1a4e42 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.

Añade red de redmic.

Mueve healthcheck a compose, cuando se quiera pasar a Dockerfile
probablemente se generalizará para todos en la imagen padre.
parent d6d2cee7

.gitlab-ci.yml

+16 −11
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-service/custom-image.yml'



stages:

  - build

  - license-list

  - test

  - pre-package

  - package

  - test-package

  - post-package

  - deploy



.docker-build:

  variables:

  DOCKER_BUILD_ARGS: --build-arg PARENT_IMAGE_NAME=${REDMIC_SERVER_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${REDMIC_SERVER_IMAGE_TAG}

  STACK: download-manager

    DBLD_PARENT_IMAGE_NAME: ${REDMIC_SERVER_IMAGE_NAME}

    DBLD_PARENT_IMAGE_TAG: ${REDMIC_SERVER_IMAGE_TAG}



.deploy:

  environment:

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

    STACK: download-manager

Dockerfile

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



HEALTHCHECK \

	--interval=30s \

	--timeout=15s \

	--start-period=3m \

	--retries=10 \

CMD wget --spider -q http://localhost:${PORT}/api/${MICROSERVICE_NAME}/actuator/health

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=download-manager

MICROSERVICE_PORT=8080

build/Dockerfile

0 → 100644
+14 −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_NAME \

    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