Skip to content

Commit 2f50553

Browse files
committed
Build amd64 only with CRAN source packages - ARM64 needs investigation
1 parent 7c4f583 commit 2f50553

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

.github/workflows/docker-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
uses: docker/build-push-action@v5
5555
with:
5656
context: .
57-
platforms: linux/amd64,linux/arm64
57+
platforms: linux/amd64
5858
push: ${{ github.event_name != 'pull_request' }}
5959
tags: ${{ steps.meta.outputs.tags }}
6060
labels: ${{ steps.meta.outputs.labels }}

Dockerfile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# List to Pathways (L2P) Single Comparison - Galaxy Tool Container
2-
# Use rocker/tidyverse which has pre-compiled packages for multiple architectures
2+
# Use rocker/r-ver and install from RStudio Package Manager (RSPM) binaries
33

4-
FROM rocker/tidyverse:4.1.3
4+
FROM rocker/r-ver: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,11 +12,19 @@ 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 \
1523
wget \
1624
&& rm -rf /var/lib/apt/lists/*
1725

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')"
26+
# Install R packages from CRAN source
27+
RUN R -q -e "options(repos = c(CRAN = 'https://cran.r-project.org'), Ncpus = 2); install.packages(c('magrittr', 'RCurl', 'dplyr', 'stringr', 'ggplot2'))"
2028

2129
# Verify all packages installed successfully
2230
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)