Skip to content

Commit

Permalink
remove tidyverse deps (#7)
Browse files Browse the repository at this point in the history
fix linting
  • Loading branch information
sorinvoicu authored Apr 16, 2024
1 parent 96ed294 commit a04b794
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .lintr
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
linters: linters_with_defaults(
line_length_linter = line_length_linter(120),
object_usage_linter = NULL
)
8 changes: 6 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@ FROM ${OS_NAME}:${OS_VERSION}

ARG R_VERSION=latest
ARG CRAN=https://packagemanager.posit.co/cran/__linux__/jammy/latest

# https://github.com/jgm/pandoc/tags
ARG PANDOC_VERSION=2.9.2.1
# https://github.com/quarto-dev/quarto-cli/tags
ARG QUARTO_VERSION=1.3.450
# https://github.com/lycheeverse/lychee-action/tags
ARG LYCHEE_VERSION=0.14.3

# Set up environment
ENV R_HOME=/usr/local/lib/R
Expand All @@ -21,8 +26,7 @@ RUN /rocker_scripts/install_R_source.sh && \
/rocker_scripts/setup_R.sh && \
/rocker_scripts/install_pandoc.sh && \
/rocker_scripts/install_quarto.sh && \
/rocker_scripts/install_texlive.sh && \
/rocker_scripts/install_tidyverse.sh
/rocker_scripts/install_texlive.sh

COPY scripts /scripts
RUN /scripts/install_sys_deps.sh && \
Expand Down
12 changes: 11 additions & 1 deletion scripts/install_r_pkgs.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,15 @@ install.packages("pak")

# Packages to install
install_pkgs <- c(
"shinytest2",
"boehringer-ingelheim/davinci",
"rcmdcheck",
"roxygen2",
"lintr",
"pkgdown",
"rmarkdown",
"devtools",
"pharmaverseadam",
"shinytest2",
"golem",
"shinymeta",
"shinyjs",
Expand All @@ -24,3 +31,6 @@ pak::pak(
ask = FALSE,
upgrade = FALSE
)

# Remove DaVinci packages from image
grep("^dv.", rownames(installed.packages()), value = TRUE) |> sapply(remove.packages)
3 changes: 2 additions & 1 deletion scripts/install_sys_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ curl \
lbzip2 \
rsync \
qpdf \
wget \
"
apt-get update -y
# shellcheck disable=SC2086
Expand All @@ -18,4 +19,4 @@ apt-get autoclean -y
rm -rf /var/lib/apt/lists/*

# Install lychee URL checker
curl -sL "https://github.com/lycheeverse/lychee/releases/download/v0.14.3/lychee-v0.14.3-x86_64-unknown-linux-gnu.tar.gz" | tar -xvzf - -C "/usr/local/bin"
curl -Ls https://github.com/lycheeverse/lychee/releases/download/v"${LYCHEE_VERSION}"/lychee-v"${LYCHEE_VERSION}"-"$(arch)"-unknown-linux-gnu.tar.gz | tar xz -C /usr/local/bin

0 comments on commit a04b794

Please sign in to comment.