projects
/
rnaseq-cwl-training.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b8fa0cd
)
Use carpentries/lesson-docker for docker-serve make rule (#461)
author
Zhian N. Kamvar <zkamvar@gmail.com>
Thu, 28 May 2020 09:18:22 +0000
(
02:18
-0700)
committer
GitHub <noreply@github.com>
Thu, 28 May 2020 09:18:22 +0000
(
05:18
-0400)
.gitignore
patch
|
blob
|
history
Makefile
patch
|
blob
|
history
diff --git
a/.gitignore
b/.gitignore
index a27efc97e450c9c96d1e217873d1de5127ffda5a..d717a12ae6fb8b617730778786da74441ddd3657 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-12,4
+12,5
@@
_site
.bundle/
.vendor/
.docker-vendor/
.bundle/
.vendor/
.docker-vendor/
-Gemfile.lock
\ No newline at end of file
+Gemfile.lock
+.*history
diff --git
a/Makefile
b/Makefile
index c2b18534cc155a4964100b80ccd2f18ada282fb0..366840ec9c7a62bbdcb8623cae0513a3e8cdf420 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-6,7
+6,6
@@
export SHELL = /bin/bash
# Settings
MAKEFILES=Makefile $(wildcard *.mk)
# Settings
MAKEFILES=Makefile $(wildcard *.mk)
-JEKYLL_VERSION=3.8.5
JEKYLL=bundle install --path .vendor/bundle && bundle update && bundle exec jekyll
PARSER=bin/markdown_ast.rb
DST=_site
JEKYLL=bundle install --path .vendor/bundle && bundle update && bundle exec jekyll
PARSER=bin/markdown_ast.rb
DST=_site
@@
-54,11
+53,14
@@
site : lesson-md
## * docker-serve : use Docker to serve the site
docker-serve :
## * docker-serve : use Docker to serve the site
docker-serve :
- docker run --rm -it --volume ${PWD}:/srv/jekyll \
- --volume=${PWD}/.docker-vendor/bundle:/usr/local/bundle \
- -p 127.0.0.1:4000:4000 \
- jekyll/jekyll:${JEKYLL_VERSION} \
- bin/run-make-docker-serve.sh
+ docker pull carpentries/lesson-docker:latest
+ docker run --rm -it \
+ -v $${PWD}:/home/rstudio \
+ -p 4000:4000 \
+ -p 8787:8787 \
+ -e USERID=$$(id -u) \
+ -e GROUPID=$$(id -g) \
+ carpentries/lesson-docker:latest
## * repo-check : check repository settings
repo-check :
## * repo-check : check repository settings
repo-check :