Skip to content

Commit

Permalink
Additions to Makefile and docker-compose so you can run clamav locall…
Browse files Browse the repository at this point in the history
…y during test (#195)
  • Loading branch information
rstens authored Apr 1, 2021
1 parent b08aa00 commit 1cfc7b8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/jira-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ jobs:
jira-base-url: ${{ secrets.JIRA_BASE_URL }}
skip-branches: '^(prod|test\/v\d+)$'
skip-comments: false
pr-threshold: 500
pr-threshold: 2000
validate_issue_status: true
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,19 @@ build-backend: ## Builds all backend containers
@echo "==============================================="
@echo "Make: build-backend - building backend images"
@echo "==============================================="
@docker-compose -f docker-compose.yml build db db_setup api nginx
@docker-compose -f docker-compose.yml build db db_setup api nginx clamav

run-backend: ## Runs all backend containers
@echo "==============================================="
@echo "Make: run-backend - running backend images"
@echo "==============================================="
@docker-compose -f docker-compose.yml up -d db db_setup api nginx
@docker-compose -f docker-compose.yml up -d db db_setup api nginx clamav

run-backend-debug: ## Runs all backend containers in debug mode, where all container output is printed to the console
@echo "==============================================="
@echo "Make: run-backend-debug - running backend images in debug mode"
@echo "==============================================="
@docker-compose -f docker-compose.yml up db db_setup api nginx
@docker-compose -f docker-compose.yml up db db_setup api nginx clamav

## ------------------------------------------------------------------------------
## Build/Run Backend+Web Commands (backend + web frontend)
Expand All @@ -114,19 +114,19 @@ build-web: ## Builds all backend+web containers
@echo "==============================================="
@echo "Make: build-web - building web images"
@echo "==============================================="
@docker-compose -f docker-compose.yml build db db_setup api nginx app
@docker-compose -f docker-compose.yml build db db_setup api nginx app clamav

run-web: ## Runs all backend+web containers
@echo "==============================================="
@echo "Make: run-web - running web images"
@echo "==============================================="
@docker-compose -f docker-compose.yml up -d db db_setup api nginx app
@docker-compose -f docker-compose.yml up -d db db_setup api nginx app clamav

run-web-debug: ## Runs all backend+web containers in debug mode, where all container output is printed to the console
@echo "==============================================="
@echo "Make: run-web-debug - running web images in debug mode"
@echo "==============================================="
@docker-compose -f docker-compose.yml up db db_setup api nginx app
@docker-compose -f docker-compose.yml up db db_setup api nginx app clamav

## ------------------------------------------------------------------------------
## Build/Run Backend+Ionic Commands (backend + ionic frontend)
Expand Down
7 changes: 7 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@ services:
depends_on:
- api

# Build the clamav docker image
clamav:
image: mkodockx/docker-clamav:latest
container_name: clamav
ports:
- 3310:3310

## Build the app docker image
app:
image: ${DOCKER_PROJECT_NAME}-app-${DOCKER_NAMESPACE}-img
Expand Down

0 comments on commit 1cfc7b8

Please sign in to comment.