From 10d00e0f4da3a120cb3dfd4b898c475d88b6a32f Mon Sep 17 00:00:00 2001 From: Jimmy Holway Date: Fri, 19 May 2023 10:37:39 -0700 Subject: [PATCH] feat(makefile): adds rebuild.frontend and updates rebuild.api so both containers arent rebuilt when either command is run - also removes java checks from pre-commit config Signed-off-by: Jimmy Holway --- .pre-commit-config.yaml | 12 ------------ Makefile | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9aa51a1..d78c87e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,18 +4,6 @@ default_language_version: # force all unspecified python hooks to run python3 python: python3 repos: - - repo: https://github.com/gherynos/pre-commit-java - rev: v0.2.0 # Use the ref you want to point at - hooks: - - id: checkstyle - exclude: ".*/src/test/.*" - args: - - -c - - build-tools/src/main/resources/checkstyle.xml - - id: cpd - exclude: ".*/src/test/.*" - - id: pmd - exclude: ".*/src/test/.*" - repo: https://github.com/pre-commit/mirrors-eslint rev: v8.33.0 # Use the sha / tag you want to point at hooks: diff --git a/Makefile b/Makefile index ab98df1..52b5224 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,17 @@ database.migrate: .PHONY: rebuild.api rebuild.api: - docker-compose down - docker rmi sextant-dev-api || true + docker-compose stop api || true + docker-compose rm -f api || true + docker rmi -f sextant-dev-api || true docker-compose up -d docker-compose exec api bash + + +.PHONY: rebuild.frontend +rebuild.frontend: + docker-compose stop frontend || true + docker-compose rm -f frontend || true + docker rmi -f sextant-dev-frontend || true + docker-compose up -d + docker-compose exec frontend bash