Skip to content

Commit 0bd4f60

Browse files
authored
Merge pull request #207 from sir-gon/develop
[REFACTOR] [CONFIG] [DOCKER] docker-compose calls replaced by new "do…
2 parents aa1f09a + 2fb1b6d commit 0bd4f60

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

Makefile

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ GRADLE=gradle
2525

2626
# DOCKER
2727
BUILDKIT_PROGRESS=plain
28+
DOCKER_COMPOSE=docker compose
2829

2930
.MAIN: test
3031
.PHONY: all clean dependencies help list test outdated
@@ -81,34 +82,34 @@ build: env
8182
--exclude-task checkstyleTest
8283

8384
compose/build: env
84-
docker-compose --profile lint build
85-
docker-compose --profile testing build
86-
docker-compose --profile production build
85+
${DOCKER_COMPOSE} --profile lint build
86+
${DOCKER_COMPOSE} --profile testing build
87+
${DOCKER_COMPOSE} --profile production build
8788

8889
compose/rebuild: env
89-
docker-compose --profile lint build --no-cache
90-
docker-compose --profile testing build --no-cache
91-
docker-compose --profile production build --no-cache
90+
${DOCKER_COMPOSE} --profile lint build --no-cache
91+
${DOCKER_COMPOSE} --profile testing build --no-cache
92+
${DOCKER_COMPOSE} --profile production build --no-cache
9293

9394
compose/lint/markdown: compose/build
94-
docker-compose --profile lint run --rm algorithm-exercises-java-lint make lint/markdown
95+
${DOCKER_COMPOSE} --profile lint run --rm algorithm-exercises-java-lint make lint/markdown
9596

9697
compose/lint/yaml: compose/build
97-
docker-compose --profile lint run --rm algorithm-exercises-java-lint make lint/yaml
98+
${DOCKER_COMPOSE} --profile lint run --rm algorithm-exercises-java-lint make lint/yaml
9899

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

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

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

107108
compose/test: compose/build
108-
docker-compose --profile testing run --rm algorithm-exercises-java-test make test
109+
${DOCKER_COMPOSE} --profile testing run --rm algorithm-exercises-java-test make test
109110

110111
compose/run: compose/build
111-
docker-compose --profile testing run --rm algorithm-exercises-java make run
112+
${DOCKER_COMPOSE} --profile testing run --rm algorithm-exercises-java make run
112113
all: env dependencies lint test
113114

114115
run:

0 commit comments

Comments
 (0)