Commit 6cc756d7 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 definición CI.

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

Actualiza otros valores por defecto.
parent 2c59b4d7

.gitlab-ci.yml

+1 −7
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ stages: 
  - post-package

  - deploy



variables:

  PROJECT_PARENT_NAME: user



.maven-build:

  services:

    - name: postgres:${POSTGRES_IMAGE_TAG}
@@ -43,7 +40,4 @@ variables: 


.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

  environment:

    url: https://${PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
 
    STACK: user

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=oauth

MICROSERVICE_PORT=8081

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=oauth

ENV MICROSERVICE_NAME=${MICROSERVICE_NAME}

ARG MICROSERVICE_NAME \

    MICROSERVICE_PORT



ARG MICROSERVICE_PORT=8081

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:

  user:

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

    build:

      context: ..

      dockerfile: ${DOCKERFILE:-build/Dockerfile}

      args:

        PARENT_IMAGE_NAME:

        PARENT_IMAGE_TAG:

        MICROSERVICE_NAME:

        MICROSERVICE_PORT: