From 87d8958b47e585c316c5090abecd08258c287cea Mon Sep 17 00:00:00 2001 From: pat-s Date: Thu, 5 Sep 2024 09:56:16 +0200 Subject: [PATCH] also install libgit2-dev --- docker/Dockerfile-alpine-320 | 4 ++-- docker/Dockerfile-redhat-8 | 2 +- docker/Dockerfile-redhat-9 | 2 +- docker/Dockerfile-ubuntu-2204 | 2 +- docker/Dockerfile-ubuntu-2404 | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile-alpine-320 b/docker/Dockerfile-alpine-320 index 260f405..01dd380 100644 --- a/docker/Dockerfile-alpine-320 +++ b/docker/Dockerfile-alpine-320 @@ -5,7 +5,7 @@ ENV TZ="Europe/Berlin" # Background: JAGS needs lapack & lapack-dev but these conflict with openblas-dev which is required by R-dev # Solution: first compile JAGS, then remove lapack & lapack-dev again -RUN apk add -q --no-cache curl tar make lapack lapack-dev blas blas-dev gcc gfortran g++ htop git libxml2-dev +RUN apk add -q --no-cache curl tar make lapack lapack-dev blas blas-dev gcc gfortran g++ htop git ### CUSTOM DEPENDENCIES # These usually are not packaged in OS repositories and need to be installed from source @@ -17,7 +17,7 @@ RUN apk del lapack lapack-dev # libxml2-dev: xml2 # libgit2-dev: gert # libpq-dev: RPostgres -RUN apk add -q --no-cache R-dev curl ca-certificates bash g++ tzdata openjdk17 tar sed patch openblas-dev pkgconfig linux-headers ccache +RUN apk add -q --no-cache R-dev curl ca-certificates bash g++ tzdata openjdk17 tar sed patch openblas-dev pkgconfig linux-headers ccache libxml2-dev libgit2-dev # https://github.com/RcppCore/Rcpp/issues/448#issuecomment-220148774 # LDFLAGS+=-fPIC -> arrow (https://github.com/r-hub/r-minimal/blob/main/examples/arrow/Dockerfile) diff --git a/docker/Dockerfile-redhat-8 b/docker/Dockerfile-redhat-8 index 878b6ce..d4c0ff7 100644 --- a/docker/Dockerfile-redhat-8 +++ b/docker/Dockerfile-redhat-8 @@ -6,7 +6,7 @@ ENV TZ="Europe/Berlin" RUN subscription-manager register --username mail@devxy.io --password "$RED_HAT_DEV_PW" && subscription-manager repos --enable codeready-builder-for-rhel-8-aarch64-rpms RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && dnf install -y epel-release -RUN dnf install -y -q make lapack-devel git gcc gcc-c++ fontconfig-devel fribidi-devel libjpeg-turbo-devel libtiff-devel postgresql-devel htop libgit2-devel libxml2-devel +RUN dnf install -y -q make lapack-devel git gcc gcc-c++ fontconfig-devel fribidi-devel libjpeg-turbo-devel libtiff-devel postgresql-devel htop libgit2-devel libxml2-devel RUN dnf install -y -q https://dl.fedoraproject.org/pub/epel/8/Everything/aarch64/Packages/h/hiredis-0.13.3-13.el8.aarch64.rpm && dnf install -y -q https://dl.fedoraproject.org/pub/epel/8/Everything/aarch64/Packages/c/ccache-3.7.7-1.el8.aarch64.rpm ### CUSTOM DEPENDENCIES diff --git a/docker/Dockerfile-redhat-9 b/docker/Dockerfile-redhat-9 index b77508c..1d1f375 100644 --- a/docker/Dockerfile-redhat-9 +++ b/docker/Dockerfile-redhat-9 @@ -7,7 +7,7 @@ ARG GITHUB_PAT RUN subscription-manager register --username devxy --password "$RED_HAT_DEV_PW" && subscription-manager repos --enable codeready-builder-for-rhel-9-aarch64-rpms RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && dnf install -y epel-release -RUN dnf install -y -q lapack-devel git gcc g++ fontconfig-devel fribidi-devel libjpeg-turbo-devel libtiff-devel htop libgit2-devel hiredis ccache libpq-devel libxml2-devel +RUN dnf install -y -q lapack-devel git gcc g++ fontconfig-devel fribidi-devel libjpeg-turbo-devel libtiff-devel htop libgit2-devel hiredis ccache libpq-devel libxml2-devel libgit2-devel ### CUSTOM DEPENDENCIES # These usually are not packaged in OS repositories and need to be installed from source diff --git a/docker/Dockerfile-ubuntu-2204 b/docker/Dockerfile-ubuntu-2204 index 1d42659..4d7a9cc 100644 --- a/docker/Dockerfile-ubuntu-2204 +++ b/docker/Dockerfile-ubuntu-2204 @@ -4,7 +4,7 @@ ENV PATH=/opt/R/4.4.1/bin:$PATH ENV TZ="Europe/Berlin" ENV DEBIAN_FRONTEND=noninteractive -RUN apt update && apt install -y --no-install-recommends gdebi-core g++ gfortran libbz2-dev libblas-dev libicu-dev liblapack-dev liblzma-dev libpaper-utils libpcre2-dev libtcl8.6 libtk8.6 libxt6 unzip zip zlib1g-dev libpcre3-dev libopenblas-dev curl ca-certificates make ccache htop libgit2-dev git libpq-dev libxml2-dev +RUN apt update && apt install -y --no-install-recommends gdebi-core g++ gfortran libbz2-dev libblas-dev libicu-dev liblapack-dev liblzma-dev libpaper-utils libpcre2-dev libtcl8.6 libtk8.6 libxt6 unzip zip zlib1g-dev libpcre3-dev libopenblas-dev curl ca-certificates make ccache htop libgit2-dev git libpq-dev libxml2-dev libgit2-dev ### CUSTOM DEPENDENCIES # These usually are not packaged in OS repositories and need to be installed from source diff --git a/docker/Dockerfile-ubuntu-2404 b/docker/Dockerfile-ubuntu-2404 index a687598..3382b49 100644 --- a/docker/Dockerfile-ubuntu-2404 +++ b/docker/Dockerfile-ubuntu-2404 @@ -4,7 +4,7 @@ ENV PATH=/opt/R/4.4.1/bin:$PATH ENV TZ="Europe/Berlin" ENV DEBIAN_FRONTEND=noninteractive -RUN apt update && apt install -y --no-install-recommends gdebi-core g++ gfortran libbz2-dev libblas-dev libicu-dev liblapack-dev liblzma-dev libpaper-utils libpcre2-dev libtcl8.6 libtk8.6 libxt6 unzip zip zlib1g-dev libpcre3-dev libopenblas-dev curl ca-certificates make ccache htop libgit2-dev git libpq-dev libxml2-dev +RUN apt update && apt install -y --no-install-recommends gdebi-core g++ gfortran libbz2-dev libblas-dev libicu-dev liblapack-dev liblzma-dev libpaper-utils libpcre2-dev libtcl8.6 libtk8.6 libxt6 unzip zip zlib1g-dev libpcre3-dev libopenblas-dev curl ca-certificates make ccache htop libgit2-dev git libpq-dev libxml2-dev libgit2-dev ### CUSTOM DEPENDENCIES # These usually are not packaged in OS repositories and need to be installed from source