Skip to content

Commit 7c4f583

Browse files
committed
Switch to rocker/tidyverse for multi-arch support
- rocker/tidyverse has pre-compiled packages for amd64 and arm64 - Eliminates source compilation issues under QEMU emulation - Only need to install RCurl since tidyverse includes dplyr, stringr, ggplot2, magrittr
1 parent 901a58d commit 7c4f583

1 file changed

Lines changed: 5 additions & 17 deletions

File tree

Dockerfile

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# List to Pathways (L2P) Single Comparison - Galaxy Tool Container
2-
# Based on rocker/r-ver with tidyverse dependencies
2+
# Use rocker/tidyverse which has pre-compiled packages for multiple architectures
33

4-
FROM rocker/r-ver:4.1.3
4+
FROM rocker/tidyverse:4.1.3
55

66
LABEL org.opencontainers.image.source="https://github.com/NIDAP-Community/l2p-galaxy-tool"
77
LABEL org.opencontainers.image.description="List to Pathways (L2P) enrichment analysis tool for Galaxy"
@@ -12,23 +12,11 @@ ENV LANG=en_US.UTF-8
1212

1313
# Install system dependencies
1414
RUN apt-get update && apt-get install -y --no-install-recommends \
15-
libcurl4-openssl-dev \
16-
libssl-dev \
17-
libxml2-dev \
18-
libfontconfig1-dev \
19-
libfreetype6-dev \
20-
libpng-dev \
21-
libtiff5-dev \
22-
libjpeg-dev \
23-
ca-certificates \
24-
wget \
25-
build-essential \
26-
gfortran \
27-
r-cran-curl \
15+
wget \
2816
&& rm -rf /var/lib/apt/lists/*
2917

30-
# Install R packages - use current CRAN since r-cran-curl provides compatible curl
31-
RUN R -q -e "options(repos = c(CRAN = 'https://cran.r-project.org'), Ncpus = 2); install.packages(c('magrittr', 'RCurl', 'dplyr', 'stringr', 'ggplot2'))"
18+
# Install R packages - tidyverse already included in base, just need RCurl
19+
RUN R -q -e "options(repos = c(CRAN = 'https://cran.r-project.org')); install.packages('RCurl')"
3220

3321
# Verify all packages installed successfully
3422
RUN R -q -e "required <- c('dplyr', 'magrittr', 'ggplot2', 'stringr', 'RCurl'); installed <- rownames(installed.packages()); missing <- setdiff(required, installed); if (length(missing) > 0) stop('Missing packages: ', paste(missing, collapse = ', ')); cat('All required packages installed successfully:\n'); cat(paste(required, collapse = ', '), '\n')"

0 commit comments

Comments
 (0)