Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Additions to Makefile and docker-compose #195

Merged
merged 2 commits into from
Apr 1, 2021
Merged

Additions to Makefile and docker-compose #195

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db0fda1
Additions to Makefile and docker-compose so you can run clamav locall…
rstens Apr 1, 2021
fbf1e2d
Merge branch 'dev' into Adding-ClamAv-to-the-setup-for-local
rstens Apr 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/jira-lint.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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