diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2eb3caea15158426cc32319bd3696c472036b52c..cc87129d05a2094def7a58781430327f64a29ee0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ pages: stage: deploy - image: rocker/tidyverse + image: carinerey/r_for_beginners script: - make artifacts: diff --git a/Makefile b/Makefile index 9192ae6fb4d3da6e2afa9cf9f452a8b5e7b6a726..916d2ccd4fa62c680f18527f454d2859e893ac04 100644 --- a/Makefile +++ b/Makefile @@ -46,11 +46,11 @@ local/www/*.ttf: local/ www/Raleway-Regular.ttf www/YanoneKaffeesatz-Bold.ttf cp www/*ttf local/www/ local/session_1.html: local/ session_1/session_1.Rmd local/www/style_Rmd.css - docker run --rm -ti -v ${PWD}:/work -w /work rocker/tidyverse \ -Rscript -e 'install.packages("rmdformats"); rmarkdown::render("session_1/session_1.Rmd", output_dir = "local/")' + docker run --rm -ti -v ${PWD}:/work -w /work carinerey/r_for_beginners \ +Rscript -e 'rmarkdown::render("session_1/session_1.Rmd", output_dir = "local/")' local/index.html: local/ index.md local/www/github-pandoc.css - docker run --rm -ti -v ${PWD}:/work -w /work rocker/tidyverse \ + docker run --rm -ti -v ${PWD}:/work -w /work carinerey/r_for_beginners \ pandoc -s -c www/github-pandoc.css index.md -o local/index.html clean: