Commit 2367657c authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza definición de imagen y compose 

Mueve healthcheck a Dockerfile.
Parametiza imagen Docker.
Configura build desde docker-compose.
Fija versión de imagen padre de forma más concreta.
Permite cambio de puerto a nivel de construcción y de ejecución.
Actualiza docker-compose con nuevas variables para permitir
actualizaciones de valor.
Asigna driver a las redes externas.
Asigna el modo de producción directamente desde docker-compose, ya que
hay disgregación por entornos.
parent 8f233181

.gitlab-ci.yml

+0 −8
Original line number Diff line number Diff line
@@ -117,14 +117,6 @@ prepare-built-version: 
  environment:

    url: https://${PUBLIC_HOSTNAME}



.deploy-development:

  variables:

    DD_PRODUCTION: 0



.deploy-production:

  variables:

    DD_PRODUCTION: 1



run-functional-tests:

  extends: .web-build

  stage: test-deploy

Dockerfile

+11 −2
Original line number Diff line number Diff line 
FROM node:11-alpine

ARG NODE_IMAGE_TAG=11.15.0-alpine



FROM node:${NODE_IMAGE_TAG}



LABEL maintainer="info@redmic.es"
@@ -7,10 +9,17 @@ ARG DIRPATH=/redmic 


EXPOSE ${PORT}



ENV PORT=${PORT}



WORKDIR ${DIRPATH}



ADD dist*.tar.gz ./



RUN npm install --production



CMD ["node", "app", "-b"]
 
HEALTHCHECK --interval=30s --timeout=15s --start-period=1m --retries=3 \

	CMD wget --spider -q http://localhost:${PORT} || exit 1



ENTRYPOINT ["/bin/sh"]



CMD ["-c", "node app -b -p ${PORT}"]

deploy/.env

+5 −2
Original line number Diff line number Diff line 
NODE_IMAGE_TAG=11.15.0-alpine

PORT=3050

DIRPATH=/redmic



OAUTH_URL=https://api.domain/oauth

OAUTH_CLIENT_SECRET=secret

API_URL=https://api.domain

PRODUCTION=0

PORT=3050
 
PUBLIC_HOSTNAME=change.me

deploy/docker-compose.dev.yml

+5 −0
Original line number Diff line number Diff line 
version: '3.5'



services:

  web:

    environment:

      PRODUCTION: 0

deploy/docker-compose.prod.yml

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ version: '3.5' 


services:

  web:

    environment:

      PRODUCTION: 1

    deploy:

      placement:

        constraints: