From 62e6f662ac37fa05e82e1a120eb5b90a95b02afe Mon Sep 17 00:00:00 2001 From: pat-s Date: Wed, 11 Jun 2025 19:35:59 +0200 Subject: [PATCH] refactor: use docker compose --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 6c6cdb4..a8f78fc 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ deps: npm install docker-build: - @cd builder && docker-compose build --parallel + @cd builder && docker compose build --parallel AWS_ACCOUNT_ID:=$(shell aws sts get-caller-identity --output text --query 'Account') AWS_REGION := us-east-1 @@ -16,13 +16,13 @@ docker-push: ecr-login docker-build done docker-down: - @cd builder && docker-compose down + @cd builder && docker compose down docker-build-r: docker-build - @cd builder && docker-compose up + @cd builder && docker compose up docker-shell-r-env: - @cd builder && docker-compose run --entrypoint /bin/bash ubuntu-2004 + @cd builder && docker compose run --entrypoint /bin/bash ubuntu-2004 ecr-login: (aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com) @@ -41,13 +41,13 @@ serverless-deploy.%: deps fetch-serverless-custom-file define GEN_TARGETS docker-build-$(platform): - @cd builder && docker-compose build $(platform) + @cd builder && docker compose build $(platform) build-r-$(platform): - @cd builder && R_VERSION=$(R_VERSION) docker-compose run --rm $(platform) + @cd builder && R_VERSION=$(R_VERSION) docker compose run --rm $(platform) test-r-$(platform): - @cd test && R_VERSION=$(R_VERSION) docker-compose run --rm $(platform) + @cd test && R_VERSION=$(R_VERSION) docker compose run --rm $(platform) bash-$(platform): docker run -it --rm --entrypoint /bin/bash -v $(CURDIR):/r-builds r-builds:$(platform)