Skip to content

Commit

Permalink
Merge pull request #355 from terasakisatoshi/enable-to-run-on-windows
Browse files Browse the repository at this point in the history
Enable to run on windows
  • Loading branch information
terasakisatoshi committed May 15, 2021
2 parents ee63490 + f15ef12 commit 1ef8230
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 8 deletions.
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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()'
Expand Down Expand Up @@ -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

21 changes: 20 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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.
Expand Down

0 comments on commit 1ef8230

Please sign in to comment.