Skip to content

Commit

Permalink
update dependencies (#12)
Browse files Browse the repository at this point in the history
* update dependencies

* update lychee version
  • Loading branch information
sorinvoicu authored Aug 27, 2024
1 parent 1ac28bd commit 9863ab8
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 29 deletions.
34 changes: 11 additions & 23 deletions .github/workflows/build_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,37 +11,25 @@ on:
workflow_dispatch:
inputs:
r_version:
description: R Version
description: R Version (X.Y.Z)
required: true
type: choice
default: "4.3.2"
options:
- "4.3.2"
- "latest"
default: ""
type: string
quarto_version:
description: Quarto version
description: Quarto version (X.Y.Z)
required: true
type: choice
default: "1.3.450"
options:
- "1.3.450"
- "latest"
default: "latest"
type: string
pandoc_version:
description: Pandoc version
description: Pandoc version (X.Y.Z)
required: true
type: choice
default: "2.9.2.1"
options:
- "2.9.2.1"
- "latest"
default: "latest"
type: string
cran_snapshot_date:
description: CRAN packages snapshot date (YYYY-MM-DD)
required: true
type: choice
default: "2024-01-12"
options:
- "2024-01-12"
- "latest"
default: ""
type: string
custom_tag:
description: Custom image tag
required: false
Expand Down
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ ARG CRAN=https://packagemanager.posit.co/cran/__linux__/jammy/latest
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
# https://github.com/lycheeverse/lychee/releases/
ARG LYCHEE_VERSION=0.15.1

# Set up environment
ENV R_HOME=/usr/local/lib/R
Expand All @@ -25,8 +25,7 @@ COPY rocker_scripts/scripts /rocker_scripts
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_quarto.sh

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

# Packages to install
install_pkgs <- c(
"boehringer-ingelheim/davinci",
"tinytex",
"rcmdcheck",
"roxygen2",
"lintr",
Expand All @@ -32,5 +32,8 @@ pak::pak(
upgrade = FALSE
)

# Install tinytex
tinytex::install_tinytex()

# Remove DaVinci packages from image
grep("^dv.", rownames(installed.packages()), value = TRUE) |> sapply(remove.packages)
2 changes: 1 addition & 1 deletion scripts/install_sys_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ apt-get autoclean -y
rm -rf /var/lib/apt/lists/*

# Install lychee URL checker
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
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 9863ab8

Please sign in to comment.