From aa50a8bc984b9d7ce8d1b18c5e5ddbc47d9be46f Mon Sep 17 00:00:00 2001 From: Satoshi Terasaki Date: Sat, 15 May 2021 22:00:59 +0900 Subject: [PATCH 1/2] write a - at the beginning of the lines text --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 3873c6da..2e1f438a 100644 --- a/Makefile +++ b/Makefile @@ -16,13 +16,13 @@ endif all: build pull: - rm -f Manifest.toml + -rm -f Manifest.toml docker pull ${REMOTE_DOCKER_REPOSITORY} docker tag ${REMOTE_DOCKER_REPOSITORY} ${DOCKERIMAGE} docker-compose run --rm julia julia --project=/work -e 'using Pkg; Pkg.instantiate()' build: - rm -f Manifest.toml + -rm -f Manifest.toml docker build -t ${DOCKERIMAGE} . docker-compose build docker-compose run --rm julia julia --project=/work -e 'using Pkg; Pkg.instantiate()' @@ -50,9 +50,9 @@ test: build clean: docker-compose down - rm -f docs/src/weavesample.md - rm -f playgound/notebook/*.ipynb - rm -rf playgound/notebook/*.gif - rm -f Manifest.toml docs/Manifest.toml - rm -rf docs/build + -rm -f docs/src/weavesample.md + -rm -f playgound/notebook/*.ipynb + -rm -rf playgound/notebook/*.gif + -rm -f Manifest.toml docs/Manifest.toml + -rm -rf docs/build From f15ef1287fa42585a47fe66dee553b1b7421b31c Mon Sep 17 00:00:00 2001 From: Satoshi Terasaki Date: Sat, 15 May 2021 22:01:29 +0900 Subject: [PATCH 2/2] update README for Windows users --- README.md | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7d8b8b8a..fc52c73d 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ $ docker run --rm -it julia # some staff happens ... ``` -- It will initialize the fresh Julia environment even if you do not have a Julia on your (host) machine. +- It will initialize a fresh Julia environment even if you do not have a Julia on your (host) machine. ## Buiding Docker image @@ -137,6 +137,25 @@ $ docker-compose build $ docker-compose run --rm julia julia --project=/work -e 'using Pkg; Pkg.instantiate()' ``` +### Tips for Windows Users + +- You can install `make` command via [winget](https://github.com/microsoft/winget-cli). + +```ps +PS> # open powershell NOT `cmd.exe` +PS> winget install "Make for Windows" # install `make` command +PS> make +``` + +- Or try the following procedure: + +```ps +PS> Remove-Item -Path Manifest.toml -ErrorAction Ignore +PS> docker build -t myworkflowjl . +PS> docker-compose build +PS> docker-compose run --rm julia julia --project=/work -e 'using Pkg; Pkg.instantiate()' +``` + ## Pull Docker image (Optional) - Running `make build` may take much time to build our Docker image. Please use `make pull` instead.