diff --git a/Makefile b/Makefile index 4c77182..82e3ff7 100644 --- a/Makefile +++ b/Makefile @@ -21,12 +21,12 @@ local: mvn compile exec:java -Dexec.mainClass="com.meucafelist.app.App" -f ./server/pom.xml -e generate: - source ./scripts/ccr.sh; checker && \ - docker compose build -t localhost:5000/mcl_slimjre:v03 -f ./Dockerfile + source ./scripts/ccr.sh; checker + docker compose build -t localhost:5000/mcl_slimjre:v03 -f ./Dockerfile images: - source ./scrits/ccr.sh; checker && \ - docker compose images + source ./scrits/ccr.sh; checker + docker compose images # cronjob for the ci hook method to fetch the API on the mainClass fetchapi: @@ -44,26 +44,26 @@ up: up_server up_client up_server: #(call compose) #docker build -t localhost:5000/mcl_slimjre:v03 -f ./server/Dockerfile && \ - source ./scripts/ccr.sh; checker && \ - docker compose -f ./compose.yml up server + source ./scripts/ccr.sh; checker + docker compose -f ./compose.yml up server up_client: #(call compose) #docker build -t localhost:5000/mcl_slimrust:v01 -f ./client/Dockerfile && \ - source ./scripts/ccr.sh; checker && \ - docker compose -f ./compose.yml up client + source ./scripts/ccr.sh; checker + docker compose -f ./compose.yml up client clean: #(call compose) - source ./scripts/ccr.sh; checker && \ - docker compose -f ./compose.yml down + source ./scripts/ccr.sh; checker + docker compose -f ./compose.yml down build: build_server build_client build_server: - source ./scripts/ccr.sh; checker && \ - docker compose -f ./compose.yml build server + source ./scripts/ccr.sh; checker + docker compose -f ./compose.yml build server build_client: - source ./scripts/ccr.sh; checker && \ - docker compose -f ./compose.yml build client + source ./scripts/ccr.sh; checker + docker compose -f ./compose.yml build client scaff: @echo "[Scaffolding] creating directory structure..."