refactor: use docker compose
All checks were successful
ci/crow/cron/build/5 Pipeline was successful
ci/crow/cron/build/12 Pipeline was successful
ci/crow/cron/build/11 Pipeline was successful
ci/crow/cron/build/1 Pipeline was successful
ci/crow/cron/build/7 Pipeline was successful
ci/crow/cron/build/14 Pipeline was successful
ci/crow/cron/build/6 Pipeline was successful
ci/crow/cron/build/15 Pipeline was successful
ci/crow/cron/build/2 Pipeline was successful
ci/crow/cron/build/10 Pipeline was successful
ci/crow/cron/build/13 Pipeline was successful
ci/crow/cron/build/3 Pipeline was successful
ci/crow/cron/build/4 Pipeline was successful
ci/crow/cron/build/9 Pipeline was successful
ci/crow/cron/build/8 Pipeline was successful
All checks were successful
ci/crow/cron/build/5 Pipeline was successful
ci/crow/cron/build/12 Pipeline was successful
ci/crow/cron/build/11 Pipeline was successful
ci/crow/cron/build/1 Pipeline was successful
ci/crow/cron/build/7 Pipeline was successful
ci/crow/cron/build/14 Pipeline was successful
ci/crow/cron/build/6 Pipeline was successful
ci/crow/cron/build/15 Pipeline was successful
ci/crow/cron/build/2 Pipeline was successful
ci/crow/cron/build/10 Pipeline was successful
ci/crow/cron/build/13 Pipeline was successful
ci/crow/cron/build/3 Pipeline was successful
ci/crow/cron/build/4 Pipeline was successful
ci/crow/cron/build/9 Pipeline was successful
ci/crow/cron/build/8 Pipeline was successful
This commit is contained in:
parent
12c221c14f
commit
62e6f662ac
1 changed files with 7 additions and 7 deletions
14
Makefile
14
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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue