diff --git a/docker-compose.yml b/docker-compose.yml index 7b3c7769..2babcd90 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -68,7 +68,7 @@ services: build: context: . args: - - IMAGE=fedora:39 + - IMAGE=fedora:36 dockerfile: tools/docker/fedora.dockerfile volumes: - .:/s2 diff --git a/tools/docker/debian.dockerfile b/tools/docker/debian.dockerfile index ee504142..0d4e436e 100644 --- a/tools/docker/debian.dockerfile +++ b/tools/docker/debian.dockerfile @@ -3,7 +3,6 @@ ARG IMAGE=debian:testing FROM ${IMAGE} -ENV TZ=UTC RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ r-base cmake libcurl4-openssl-dev libssl-dev diff --git a/tools/docker/fedora.dockerfile b/tools/docker/fedora.dockerfile index e861bc6e..b76573e9 100644 --- a/tools/docker/fedora.dockerfile +++ b/tools/docker/fedora.dockerfile @@ -3,10 +3,7 @@ ARG IMAGE=fedora:latest FROM ${IMAGE} -RUN dnf install -y R cmake openssl-devel - -# Only available on Fedora 39+ -RUN dnf install -y abseil-cpp-devel || true +RUN dnf install -y R cmake abseil-cpp-devel openssl-devel # Make sure we can use all cores to install things RUN mkdir ~/.R && echo "MAKEFLAGS = -j$(nproc)" > ~/.R/Makevars