Skip to content

[REFACTOR] [CONFIG] [DOCKER] docker-compose calls replaced by new "do… #207

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.

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

Merged
merged 1 commit into from
Aug 14, 2024
Merged
Changes from all commits
Commits
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
25 changes: 13 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ GRADLE=gradle

# DOCKER
BUILDKIT_PROGRESS=plain
DOCKER_COMPOSE=docker compose

.MAIN: test
.PHONY: all clean dependencies help list test outdated
Expand Down Expand Up @@ -81,34 +82,34 @@ build: env
--exclude-task checkstyleTest

compose/build: env
docker-compose --profile lint build
docker-compose --profile testing build
docker-compose --profile production build
${DOCKER_COMPOSE} --profile lint build
${DOCKER_COMPOSE} --profile testing build
${DOCKER_COMPOSE} --profile production build

compose/rebuild: env
docker-compose --profile lint build --no-cache
docker-compose --profile testing build --no-cache
docker-compose --profile production build --no-cache
${DOCKER_COMPOSE} --profile lint build --no-cache
${DOCKER_COMPOSE} --profile testing build --no-cache
${DOCKER_COMPOSE} --profile production build --no-cache

compose/lint/markdown: compose/build
docker-compose --profile lint run --rm algorithm-exercises-java-lint make lint/markdown
${DOCKER_COMPOSE} --profile lint run --rm algorithm-exercises-java-lint make lint/markdown

compose/lint/yaml: compose/build
docker-compose --profile lint run --rm algorithm-exercises-java-lint make lint/yaml
${DOCKER_COMPOSE} --profile lint run --rm algorithm-exercises-java-lint make lint/yaml

compose/test/styling: compose/build
docker-compose --profile lint run --rm algorithm-exercises-java-lint make test/styling
${DOCKER_COMPOSE} --profile lint run --rm algorithm-exercises-java-lint make test/styling

compose/test/static: compose/build
docker-compose --profile lint run --rm algorithm-exercises-java-lint make test/static
${DOCKER_COMPOSE} --profile lint run --rm algorithm-exercises-java-lint make test/static

compose/lint: compose/lint/markdown compose/lint/yaml compose/test/styling compose/test/static

compose/test: compose/build
docker-compose --profile testing run --rm algorithm-exercises-java-test make test
${DOCKER_COMPOSE} --profile testing run --rm algorithm-exercises-java-test make test

compose/run: compose/build
docker-compose --profile testing run --rm algorithm-exercises-java make run
${DOCKER_COMPOSE} --profile testing run --rm algorithm-exercises-java make run
all: env dependencies lint test

run:
Expand Down