From 5ff5926c23152aa8f35e377aa62e87903f4816ef Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 13 Mar 2025 13:07:24 +0100 Subject: [PATCH] feat: run.sh build neccessary images --- test/cypress/run.sh | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/test/cypress/run.sh b/test/cypress/run.sh index 1f506aa57..0f8c59902 100755 --- a/test/cypress/run.sh +++ b/test/cypress/run.sh @@ -1,24 +1,39 @@ #!/bin/bash +salix_dir="${1:-$HOME/Projects/salix}" +salix_dir=$(eval echo "$salix_dir") + +echo "$salix_dir" + +current_dir=$(pwd) + cleanup() { - if [[ -z "$ended" ]]; then - ended=true - docker-compose -p e2e --project-directory . -f test/cypress/docker-compose.yml down -v - fi + docker-compose -p e2e --project-directory . -f test/cypress/docker-compose.yml down -v } trap cleanup SIGINT -#CLEAN +# CLEAN rm -rf test/cypress/screenshots rm -f test/cypress/results/* rm -f test/cypress/reports/* rm -f junit/e2e-*.xml -#RUN +# RUN export CI=true export TZ=Europe/Madrid +# IMAGES +docker build -t registry.verdnatura.es/salix-back:dev -f "$salix_dir/back/Dockerfile" "$salix_dir" +cd "$salix_dir" && npx myt run -t +docker exec vn-database sh -c "rm -rf /mysql-template" +docker exec vn-database sh -c "cp -a /var/lib/mysql /mysql-template" +docker commit vn-database registry.verdnatura.es/salix-db:dev +docker rm -f vn-database +cd "$current_dir" +docker build -f ./docs/Dockerfile.dev -t lilium-dev . +# END IMAGES + docker-compose -p e2e --project-directory . -f test/cypress/docker-compose.yml up -d docker run -it --rm \