Skip to content

Commit bc5c9ba

Browse files
authored
Use carpentries/lesson-docker for docker-serve make rule (#461)
1 parent b8fa0cd commit bc5c9ba

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ _site
1212
.bundle/
1313
.vendor/
1414
.docker-vendor/
15-
Gemfile.lock
15+
Gemfile.lock
16+
.*history

Makefile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ export SHELL = /bin/bash
66

77
# Settings
88
MAKEFILES=Makefile $(wildcard *.mk)
9-
JEKYLL_VERSION=3.8.5
109
JEKYLL=bundle install --path .vendor/bundle && bundle update && bundle exec jekyll
1110
PARSER=bin/markdown_ast.rb
1211
DST=_site
@@ -54,11 +53,14 @@ site : lesson-md
5453

5554
## * docker-serve : use Docker to serve the site
5655
docker-serve :
57-
docker run --rm -it --volume ${PWD}:/srv/jekyll \
58-
--volume=${PWD}/.docker-vendor/bundle:/usr/local/bundle \
59-
-p 127.0.0.1:4000:4000 \
60-
jekyll/jekyll:${JEKYLL_VERSION} \
61-
bin/run-make-docker-serve.sh
56+
docker pull carpentries/lesson-docker:latest
57+
docker run --rm -it \
58+
-v $${PWD}:/home/rstudio \
59+
-p 4000:4000 \
60+
-p 8787:8787 \
61+
-e USERID=$$(id -u) \
62+
-e GROUPID=$$(id -g) \
63+
carpentries/lesson-docker:latest
6264

6365
## * repo-check : check repository settings
6466
repo-check :

0 commit comments

Comments
 (0)