From 123c206460dd232dda0eecffc87cc83cbf257758 Mon Sep 17 00:00:00 2001 From: pat-s Date: Mon, 26 Aug 2024 20:49:37 +0200 Subject: [PATCH] build all images in ci --- .woodpecker/images.yaml | 8 ++++---- Justfile | 4 ++-- docker/Dockerfile-redhat-8 | 9 +++++++-- docker/Dockerfile-redhat-9 | 2 +- docker/Dockerfile-ubuntu-2204 | 6 +++++- docker/Dockerfile-ubuntu-2404 | 6 +++++- 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/.woodpecker/images.yaml b/.woodpecker/images.yaml index 3ff3a43..d99aa1d 100644 --- a/.woodpecker/images.yaml +++ b/.woodpecker/images.yaml @@ -5,13 +5,13 @@ when: matrix: include: - PLATFORM: redhat-9 - # - PLATFORM: redhat-8 - # - PLATFORM: ubuntu-2404 - # - PLATFORM: ubuntu-2204 + - PLATFORM: redhat-8 + - PLATFORM: ubuntu-2404 + - PLATFORM: ubuntu-2204 steps: 'Build image': - image: woodpeckerci/plugin-docker-buildx:latest + image: woodpeckerci/plugin-docker-buildx:4.2.0 secrets: [RED_HAT_DEV_PW] settings: platforms: linux/arm64 diff --git a/Justfile b/Justfile index 4788eba..e192a04 100644 --- a/Justfile +++ b/Justfile @@ -1,6 +1,6 @@ image OS: if echo "{{OS}}" | grep -qi "redhat"; then \ - docker buildx build --build-arg RED_HAT_DEV_PW='ujF@4A^yn$6utRhb&UooGH#w' -f docker/Dockerfile-{{OS}} -t pats22/arm-binaries-r-{{OS}}:latest --push .; \ + docker buildx build --build-arg RED_HAT_DEV_PW='ujF@4A^yn$6utRhb&UooGH#w' -f docker/Dockerfile-{{OS}} -t devxygmbh/arm-binaries-r-{{OS}}:latest --push .; \ else \ - docker buildx build -f docker/Dockerfile-{{OS}} -t pats22/arm-binaries-r-{{OS}}:latest --push .; \ + docker buildx build -f docker/Dockerfile-{{OS}} -t devxygmbh/arm-binaries-r-{{OS}}:latest --push .; \ fi \ No newline at end of file diff --git a/docker/Dockerfile-redhat-8 b/docker/Dockerfile-redhat-8 index 84427eb..f4342c1 100644 --- a/docker/Dockerfile-redhat-8 +++ b/docker/Dockerfile-redhat-8 @@ -6,10 +6,15 @@ 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 -### install JAGS (needed for runjags which itself is again a dependency of many packages) RUN dnf install -y -q make lapack-devel git gcc gcc-c++ fontconfig-devel fribidi-devel libjpeg-turbo-devel libtiff-devel postgresql-devel htop -RUN curl -L -O https://sourceforge.net/projects/mcmc-jags/files/JAGS/4.x/Source/JAGS-4.3.2.tar.gz && tar -xzf JAGS-4.3.2.tar.gz && cd JAGS-4.3.2 && ./configure && make && make install && rm -rf JAGS-4.3.2.tar.gz JAGS-4.3.2 && cd .. 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 +# These usually are not packaged in OS repositories and need to be installed from source +# - JAGS (needed for runjags which itself is again a dependency of many packages) +RUN curl -L -O https://sourceforge.net/projects/mcmc-jags/files/JAGS/4.x/Source/JAGS-4.3.2.tar.gz && tar -xzf JAGS-4.3.2.tar.gz && cd JAGS-4.3.2 && ./configure && make && make install && rm -rf JAGS-4.3.2.tar.gz JAGS-4.3.2 && cd .. + +### INSTALL R RUN curl -O https://devxy-rbuilds.s3.eu-central-2.amazonaws.com/el8/R-4.4.1-1-1.aarch64.rpm RUN dnf install -q -y R-4.4.1-1-1.aarch64.rpm RUN R -q -e 'install.packages("pak", repos = sprintf("https://r-lib.github.io/p/pak/stable/%s/%s/%s", .Platform$pkgType, R.Version()$os, R.Version()$arch))' diff --git a/docker/Dockerfile-redhat-9 b/docker/Dockerfile-redhat-9 index 3428a69..e5ddfe1 100644 --- a/docker/Dockerfile-redhat-9 +++ b/docker/Dockerfile-redhat-9 @@ -15,7 +15,7 @@ RUN dnf install -y -q https://dl.fedoraproject.org/pub/epel/9/Everything/aarch64 RUN curl -L -O https://sourceforge.net/projects/mcmc-jags/files/JAGS/4.x/Source/JAGS-4.3.2.tar.gz && tar -xzf JAGS-4.3.2.tar.gz && cd JAGS-4.3.2 && ./configure && make && make install && rm -rf JAGS-4.3.2.tar.gz JAGS-4.3.2 && cd .. ### INSTALL R -RUN curl -v -O https://devxy-rbuilds.s3.eu-central-2.amazonaws.com/el9/R-4.4.1-1-1.aarch64.rpm +RUN curl -O https://devxy-rbuilds.s3.eu-central-2.amazonaws.com/el9/R-4.4.1-1-1.aarch64.rpm RUN dnf install -q -y R-4.4.1-1-1.aarch64.rpm RUN R -q -e 'install.packages("pak", repos = sprintf("https://r-lib.github.io/p/pak/stable/%s/%s/%s", .Platform$pkgType, R.Version()$os, R.Version()$arch))' diff --git a/docker/Dockerfile-ubuntu-2204 b/docker/Dockerfile-ubuntu-2204 index 414edff..63dce48 100644 --- a/docker/Dockerfile-ubuntu-2204 +++ b/docker/Dockerfile-ubuntu-2204 @@ -3,10 +3,14 @@ FROM ubuntu:jammy-20240808 ENV PATH=/opt/R/4.4.1/bin:$PATH ENV TZ="Europe/Berlin" -### install JAGS (needed for runjags which itself is again a dependency of many packages) 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 +### CUSTOM DEPENDENCIES +# These usually are not packaged in OS repositories and need to be installed from source +# - JAGS (needed for runjags which itself is again a dependency of many packages) RUN curl -L -O https://sourceforge.net/projects/mcmc-jags/files/JAGS/4.x/Source/JAGS-4.3.2.tar.gz && tar -xzf JAGS-4.3.2.tar.gz && cd JAGS-4.3.2 && ./configure && make && make install && rm -rf JAGS-4.3.2.tar.gz JAGS-4.3.2 && cd .. + +### INSTALL R RUN curl -O https://devxy-rbuilds.s3.eu-central-2.amazonaws.com/2204/r-4.4.1_1_arm64.deb RUN gdebi -n -qq r-4.4.1_1_arm64.deb && rm r-4.4.1_1_arm64.deb RUN R -q -e 'install.packages("pak", repos = sprintf("https://r-lib.github.io/p/pak/stable/%s/%s/%s", .Platform$pkgType, R.Version()$os, R.Version()$arch))' diff --git a/docker/Dockerfile-ubuntu-2404 b/docker/Dockerfile-ubuntu-2404 index 652028b..baafb98 100644 --- a/docker/Dockerfile-ubuntu-2404 +++ b/docker/Dockerfile-ubuntu-2404 @@ -3,10 +3,14 @@ FROM ubuntu:noble-20240605 ENV PATH=/opt/R/4.4.1/bin:$PATH ENV TZ="Europe/Berlin" -### install JAGS (needed for runjags which itself is again a dependency of many packages) 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 +### CUSTOM DEPENDENCIES +# These usually are not packaged in OS repositories and need to be installed from source +# - JAGS (needed for runjags which itself is again a dependency of many packages) RUN curl -L -O https://sourceforge.net/projects/mcmc-jags/files/JAGS/4.x/Source/JAGS-4.3.2.tar.gz && tar -xzf JAGS-4.3.2.tar.gz && cd JAGS-4.3.2 && ./configure && make && make install && rm -rf JAGS-4.3.2.tar.gz JAGS-4.3.2 && cd .. + +### INSTALL R RUN curl -O https://devxy-rbuilds.s3.eu-central-2.amazonaws.com/2404/r-4.4.1_1_arm64.deb RUN gdebi -n -qq r-4.4.1_1_arm64.deb && rm r-4.4.1_1_arm64.deb RUN R -q -e 'install.packages("pak", repos = sprintf("https://r-lib.github.io/p/pak/stable/%s/%s/%s", .Platform$pkgType, R.Version()$os, R.Version()$arch))'