From 2ac354c4fecc51a0a54e0c89fd0c8c675b106c0d Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Thu, 10 Oct 2024 14:12:23 -0500 Subject: [PATCH] check alpine --- docker-compose.yml | 7 +++++++ tools/docker/alpine.dockerfile | 12 ++++++++++++ tools/docker/debian.dockerfile | 6 ++---- tools/docker/fedora.dockerfile | 2 +- 4 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 tools/docker/alpine.dockerfile diff --git a/docker-compose.yml b/docker-compose.yml index be9ade3a..7b3c7769 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -82,3 +82,10 @@ services: dockerfile: tools/docker/fedora.dockerfile volumes: - .:/s2 + + alpine: + build: + context: . + dockerfile: tools/docker/alpine.dockerfile + volumes: + - .:/s2 diff --git a/tools/docker/alpine.dockerfile b/tools/docker/alpine.dockerfile new file mode 100644 index 00000000..cbeedb0b --- /dev/null +++ b/tools/docker/alpine.dockerfile @@ -0,0 +1,12 @@ + +ARG IMAGE=alpine:latest + +FROM ${IMAGE} + +RUN apk add bash R R-dev abseil-cpp-dev + +# Make sure we can use all cores to install things +RUN mkdir ~/.R && echo "MAKEFLAGS = -j$(nproc)" > ~/.R/Makevars +RUN R -e 'install.packages(c("wk", "bit64", "Rcpp", "testthat"), repos = "https://cloud.r-project.org")' + +CMD R CMD INSTALL /s2 --preclean && R -e 'testthat::test_local("/s2")' diff --git a/tools/docker/debian.dockerfile b/tools/docker/debian.dockerfile index 79d5c37b..ee504142 100644 --- a/tools/docker/debian.dockerfile +++ b/tools/docker/debian.dockerfile @@ -5,15 +5,13 @@ FROM ${IMAGE} ENV TZ=UTC RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - r-base cmake \ - libudunits2-dev libgdal-dev libgeos-dev libproj-dev \ - libcurl4-openssl-dev libssl-dev + r-base cmake libcurl4-openssl-dev libssl-dev # Not all versions of ubuntu/debian have libabsl-dev RUN apt-get install -y libabsl-dev || true # Make sure we can use all cores to install things RUN mkdir ~/.R && echo "MAKEFLAGS = -j$(nproc)" > ~/.R/Makevars -RUN R -e 'install.packages(c("wk", "Rcpp", "testthat"), repos = "https://cloud.r-project.org")' +RUN R -e 'install.packages(c("wk", "bit64", "Rcpp", "testthat"), repos = "https://cloud.r-project.org")' CMD R CMD INSTALL /s2 --preclean && R -e 'testthat::test_local("/s2")' diff --git a/tools/docker/fedora.dockerfile b/tools/docker/fedora.dockerfile index 04694001..e861bc6e 100644 --- a/tools/docker/fedora.dockerfile +++ b/tools/docker/fedora.dockerfile @@ -10,6 +10,6 @@ RUN dnf install -y abseil-cpp-devel || true # Make sure we can use all cores to install things RUN mkdir ~/.R && echo "MAKEFLAGS = -j$(nproc)" > ~/.R/Makevars -RUN R -e 'install.packages(c("wk", "Rcpp", "testthat"), repos = "https://cloud.r-project.org")' +RUN R -e 'install.packages(c("wk", "bit64", "Rcpp", "testthat"), repos = "https://cloud.r-project.org")' CMD R CMD INSTALL /s2 --preclean && R -e 'testthat::test_local("/s2")'