diff --git a/Jenkinsfile b/Jenkinsfile index 3f06c9bb0..72148d69b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -114,10 +114,10 @@ pipeline { // sh 'cd front' // sh '# export VERSION=e2e-try' sh 'docker build -f salix/back/Dockerfile -t back ./salix' - sh 'docker compose -f docker-compose.e2e.yml up --build db' + sh 'docker-compose -f docker-compose.e2e.yml up --build db' sh 'docker run --net=host -v ./test/cypress/storage:/salix/storage -d back' - sh 'docker compose -f docker-compose.e2e.yml up -d --build front' - sh 'docker compose -f docker-compose.e2e.yml up e2e' + sh 'docker-compose -f docker-compose.e2e.yml up -d --build front' + sh 'docker-compose -f docker-compose.e2e.yml up e2e' } post { diff --git a/test/cypress/db/Dockerfile b/test/cypress/db/Dockerfile index a287b90f3..f481ab891 100644 --- a/test/cypress/db/Dockerfile +++ b/test/cypress/db/Dockerfile @@ -1,9 +1,10 @@ -FROM node:lts-bookworm +FROM node:20-bookworm-slim +ENV DEBIAN_FRONTEND=noninteractive ENV SHELL bash ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" RUN apt-get update -RUN apt install libkrb5-dev libssl-dev +RUN apt install -y libkrb5-dev libssl-dev RUN npm install -g pnpm@8.15.1 RUN pnpm setup RUN npm i -g pnpm