Skip to content

Commit

Permalink
Merge pull request #15 from terasakisatoshi/use-compose-subcommand
Browse files Browse the repository at this point in the history
use `docker compose` rather than `docker-compose`
  • Loading branch information
terasakisatoshi authored Apr 28, 2023
2 parents ee6c2c4 + 7c95898 commit 344e4b1
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions templates/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ all: build
build:
-rm -f Manifest.toml docs/Manifest.toml
docker build -t ${DOCKER_IMAGE} . --build-arg NB_UID=`id -u`
docker-compose build
docker-compose run --rm shell julia --project=@. -e 'using Pkg; Pkg.instantiate()'
docker-compose run --rm shell julia --project=docs -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
docker compose build
docker compose run --rm shell julia --project=@. -e 'using Pkg; Pkg.instantiate()'
docker compose run --rm shell julia --project=docs -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'

# Excecute in docker container
web: docs
Expand All @@ -19,10 +19,10 @@ web: docs
'

test: build
docker-compose run --rm shell julia -e 'using Pkg; Pkg.activate("."); Pkg.test()'
docker compose run --rm shell julia -e 'using Pkg; Pkg.activate("."); Pkg.test()'

clean:
docker-compose down
docker compose down
-find $(CURDIR) -name "*.ipynb" -type f -delete
-find $(CURDIR) -name "*.html" -type f -delete
-find $(CURDIR) -name "*.gif" -type f -delete
Expand Down

0 comments on commit 344e4b1

Please sign in to comment.