From c81dce99e2777f67906f2bd495f242020aac8c60 Mon Sep 17 00:00:00 2001 From: Logan Cusano Date: Sun, 28 Apr 2024 05:04:52 -0400 Subject: [PATCH] Update makefile with clean step --- .gitea/workflows/DRBv3_tests.yaml | 2 +- server/makefile | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/DRBv3_tests.yaml b/.gitea/workflows/DRBv3_tests.yaml index 6638181..fa41fb7 100644 --- a/.gitea/workflows/DRBv3_tests.yaml +++ b/.gitea/workflows/DRBv3_tests.yaml @@ -39,7 +39,7 @@ jobs: - name: Build Docker image and run container working-directory: "./server" - run: make build && make run + run: make clean && make build && make run - name: Wait for server to start run: sleep 10 diff --git a/server/makefile b/server/makefile index 4f57790..bbc15e2 100644 --- a/server/makefile +++ b/server/makefile @@ -2,7 +2,13 @@ DOCKER_IMAGE_NAME := drb-server # Define targets and rules -.PHONY: build run +.PHONY: clean build run + +clean: + @echo "Cleaning existing Docker images, containers, and builds..." + docker stop drb || true + docker rm drb || true + docker rmi $(DOCKER_IMAGE_NAME) || true build: @echo "Building Docker image..." @@ -10,7 +16,7 @@ build: run: @echo "Running Docker container..." - docker run -e NODE_ENV=${NODE_ENV} \ + docker run -it --rm -e NODE_ENV=${NODE_ENV} \ -e MONGO_INITDB_ROOT_USERNAME=${MONGO_INITDB_ROOT_USERNAME} \ -e MONGO_INITDB_ROOT_PASSWORD=${MONGO_INITDB_ROOT_PASSWORD} \ -e MONGO_INITDB_DATABASE=${MONGO_INITDB_DATABASE} \