Skip to content

Commit

Permalink
[REFACTOR] [CONFIG] [DOCKER] docker-compose calls replaced by new "do…
Browse files Browse the repository at this point in the history
…cker compose".

- Command not found: docker-compose after docker 4.32.0 update: https://stackoverflow.com/a/78788716/6366150
  • Loading branch information
Gonzalo Diaz committed Aug 14, 2024
1 parent 02ae48e commit c55e663
Showing 1 changed file with 14 additions and 13 deletions.
27 changes: 14 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ NPM_UPDATABLE_MODULES = $(shell npm outdated | cut -d' ' -f 1 | sed '1d' | xargs

# DOCKER
BUILDKIT_PROGRESS=plain
DOCKER_COMPOSE=docker compose

.MAIN: test
.PHONY: all clean dependencies help list test outdated
Expand Down Expand Up @@ -95,35 +96,35 @@ update: dependencies outdated
upgrade: update

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 build
docker-compose --profile lint run --rm algorithm-exercises-ts-lint make lint/markdown
${DOCKER_COMPOSE} --profile lint build
${DOCKER_COMPOSE} --profile lint run --rm algorithm-exercises-ts-lint make lint/markdown

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

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

compose/test/static: compose/build
docker-compose --profile lint run --rm algorithm-exercises-ts-lint make test/static
${DOCKER_COMPOSE} --profile lint run --rm algorithm-exercises-ts-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-ts-test make test
${DOCKER_COMPOSE} --profile testing run --rm algorithm-exercises-ts-test make test

compose/run: compose/build
docker-compose --profile production run --rm algorithm-exercises-ts make run
${DOCKER_COMPOSE} --profile production run --rm algorithm-exercises-ts make run

all: env dependencies test

Expand Down

0 comments on commit c55e663

Please sign in to comment.