Merge pull request #24 from jhudsl/cansavvy/simplify

Let's kill ottr_quarto
jhudsl · Jun 28, 2024 · 8d87295 · 8d87295
2 parents 4f702fd + a79e706
commit 8d87295
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 84 deletions.
diff --git a/base_ottr/Dockerfile b/base_ottr/Dockerfile
@@ -35,12 +35,20 @@ RUN apt-get update -qq && apt-get -y --no-install-recommends install \
     bzip2 \
     curl
 
-# Install pip3 and installation tools
-RUN apt-get -y --no-install-recommends install \
-    python3-pip  python3-dev
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    pandoc \
+    pandoc-citeproc \
+    curl \
+    gdebi-core \
+    python3-pip \
+    python3-dev \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN Rscript -e "remove.packages('rlang')"
 
+RUN curl -LO https://quarto.org/download/latest/quarto-linux-amd64.deb
+RUN gdebi --non-interactive quarto-linux-amd64.deb
+
 # Commonly used R packages
 RUN Rscript -e  "options(warn = 2);install.packages( \
     c('rlang', \
@@ -61,7 +69,8 @@ RUN Rscript -e  "options(warn = 2);install.packages( \
       'reticulate', \
       'gh', \
       'tibble', \
-      'config'), \
+      'config', \
+      'quarto'), \
       repos = 'https://cloud.r-project.org/')"
 
 # cow needs this dependency:

diff --git a/ottr_quarto/Dockerfile b/ottr_quarto/Dockerfile
diff --git a/ottr_quarto/Random_Keys_for_DataTrail_Data_Analysis.numbers b/ottr_quarto/Random_Keys_for_DataTrail_Data_Analysis.numbers
diff --git a/ottr_quarto/github_package_list.tsv b/ottr_quarto/github_package_list.tsv
diff --git a/ottr_quarto/install_github.R b/ottr_quarto/install_github.R