diff --git a/deployment/develop/docker/Dockerfile b/deployment/develop/docker/Dockerfile index a3d43d2..529acb6 100644 --- a/deployment/develop/docker/Dockerfile +++ b/deployment/develop/docker/Dockerfile @@ -6,16 +6,22 @@ WORKDIR /home/node/app COPY ./dist/packages ./packages # Instalar dependencias de produccion +# Eliminar workspaces y scripts del package.json para evitar que npm +# intente resolver paquetes del workspace que no existen en la imagen COPY ./package.json ./ -COPY ./package-lock.json ./ -RUN npm ci --omit=dev +RUN node -e "\ + const p = require('./package.json'); \ + delete p.workspaces; \ + delete p.scripts; \ + delete p.devDependencies; \ + require('fs').writeFileSync('./package.json', JSON.stringify(p, null, 2));" +RUN npm install --omit=dev -# Symlinks para modulos compartidos del workspace +# Symlink para el modulo compartido del workspace RUN mkdir -p packages/node_modules && \ - ln -sf ../sim-shared packages/node_modules/sim-shared && \ - ln -sf ../sim-consumidor-objenious packages/node_modules/sim-consumidor-objenious + ln -sf ../sim-shared packages/node_modules/sim-shared -# Script de inicio para los 3 servicios +# Script de inicio para los 4 servicios COPY ./entrypoint.sh ./ RUN chmod +x entrypoint.sh diff --git a/deployment/develop/docker/docker-compose.yaml b/deployment/develop/docker/docker-compose.yaml index aa5b365..07a816c 100644 --- a/deployment/develop/docker/docker-compose.yaml +++ b/deployment/develop/docker/docker-compose.yaml @@ -61,7 +61,11 @@ services: - ./sim-consumidor-objenious.env:/home/node/app/packages/sim-consumidor-objenious/.env:ro - ./sim-objenious-cron.env:/home/node/app/packages/sim-objenious-cron/.env:ro healthcheck: - test: ["CMD-SHELL", "wget -qO- http://localhost:${PORT:-3000}/health || exit 1"] + test: + [ + "CMD-SHELL", + "wget -qO- http://localhost:${PORT:-3000}/health || exit 1", + ] interval: 10s timeout: 5s retries: 5 diff --git a/deployment/develop/jenkinsfile.groovy b/deployment/develop/jenkinsfile.groovy index 8253961..a8430a9 100644 --- a/deployment/develop/jenkinsfile.groovy +++ b/deployment/develop/jenkinsfile.groovy @@ -83,11 +83,6 @@ pipeline { remoteDirectory: "$APP_REMOTE_PATH", sourceFiles: "package.json", ), - sshTransfer( - cleanRemote: false, - remoteDirectory: "$APP_REMOTE_PATH", - sourceFiles: "package-lock.json", - ), sshTransfer( cleanRemote: false, execCommand: "sh $APP_REMOTE_PATH/rebuild.sh"