clean up checks

r-spatial · Oct 10, 2024 · 3ad97d9 · 3ad97d9
1 parent 76f8acd
commit 3ad97d9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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