WIP: 5739-dockerRefactor #1822

Draft
alexm wants to merge 67 commits from 5739-dockerRefactor into dev
5 changed files with 1 additions and 21 deletions
Showing only changes of commit 5af6e2bfb9 - Show all commits

View File

@ -22,10 +22,6 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*
RUN npm i -g gulp-cli
# RUN npm i -g bun
# RUN apt update && apt install -y chromium-browser chromium-chromedriver
# RUN curl -fsSL https://bun.sh/install | bash
WORKDIR /salix
@ -37,7 +33,6 @@ COPY \
LICENSE \
README.md \
./
# RUN bun --prefix ./print install ./print
FROM base AS local
WORKDIR /salix
@ -57,6 +52,3 @@ COPY print print
COPY storage storage
CMD ["npx", "gulp", "backOnly"]
# CMD ["node", "back/tests.js", "ci"]

View File

@ -22,8 +22,6 @@ async function test() {
isCI = true;
dataSources = JSON.parse(JSON.stringify(dataSources));
// dataSources.vn.port = 3308;
// dataSources.vn.host = 'db';
const bootOptions = {dataSources};
Outdated
Review

Quitar

Quitar
const app = require('vn-loopback/server/server');
await new Promise((resolve, reject) => {

View File

@ -1,12 +1,5 @@
version: "3.7"
services:
# node_modules:
# image: node:20-bullseye-slim
# command: sh -c "npm i gulp-cli && npm install --ci && npx gulp i"
# user: "${UID}:${GID}"
# working_dir: /salix
# volumes:
# - .:/salix
db:
image: db:local
restart: unless-stopped
@ -47,7 +40,6 @@ services:
- NODE_ENV
depends_on:
- db
# - node_modules
volumes:
- ./loopback:/salix/loopback
- ./storage:/salix/storage

View File

@ -24,7 +24,6 @@ WORKDIR /salix
COPY /front/gulpfile.js ./
COPY /front/webpack.config.js ./
COPY /front/package.json ./front/
# RUN cd front && npm install --ci
CMD ["npx", "gulp", "front"]

View File

@ -201,8 +201,7 @@
"Try again": "Try again",
"keepPrice": "keepPrice",
"Cannot past travels with entries": "Cannot past travels with entries",
"The notification subscription of this worker cant be modified": "The notification subscription of this worker cant be modified",
"It was not able to remove the next expeditions:": "It was not able to remove the next expeditions: {{expeditions}}",
"Incorrect pin": "Incorrect pin.",
"The notification subscription of this worker cant be modified": "The notification subscription of this worker cant be modified"
}
}