@@ -25,6 +25,7 @@ GRADLE=gradle
25
25
26
26
# DOCKER
27
27
BUILDKIT_PROGRESS =plain
28
+ DOCKER_COMPOSE =docker compose
28
29
29
30
.MAIN : test
30
31
.PHONY : all clean dependencies help list test outdated
@@ -81,34 +82,34 @@ build: env
81
82
--exclude-task checkstyleTest
82
83
83
84
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
87
88
88
89
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
92
93
93
94
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
95
96
96
97
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
98
99
99
100
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
101
102
102
103
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
104
105
105
106
compose/lint : compose/lint/markdown compose/lint/yaml compose/test/styling compose/test/static
106
107
107
108
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
109
110
110
111
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
112
113
all : env dependencies lint test
113
114
114
115
run :
0 commit comments