From 21de21d86421761fde5409fb48dd26c81ff987de Mon Sep 17 00:00:00 2001
From: Carine Rey <carine.rey@ens-lyon.fr>
Date: Tue, 6 Sep 2022 11:45:47 +0200
Subject: [PATCH] use a dedicated image
---
.gitlab-ci.yml | 2 +-
Makefile | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2eb3cae..cc87129 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 9192ae6..916d2cc 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:
--
GitLab