Commit e31461c2 authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' into 'master' 

Usa variable para restricción de lugar de deploy

See merge request redmic-project/server/db2es!3
parents 02cb2279 3940fedc

.env

+1 −0
Original line number Diff line number Diff line 
MICROSERVICE_NAME=db2es

MICROSERVICE_PORT=8094

DESIRED_WORKER_ID=1

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ docker-build-commit-master-branch: 
    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - >

      docker build --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}

      -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG} -t ${CI_REGISTRY_IMAGE}:latest .

      -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-tag-already-built-image:

docker-compose.prod.yml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ services: 
      placement:

        constraints:

          - node.role == worker

          - node.labels.workerid == ${DESIRED_WORKER_ID}

      restart_policy:

        condition: on-failure

        max_attempts: 3