Skip to content

Commit

Permalink
Switch deprecated docker-compose commands to docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
glin committed Jul 31, 2024
1 parent 6a3114d commit e33b562
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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)
Expand Down

0 comments on commit e33b562

Please sign in to comment.