From c2e3a433fc8fc70f852d1d28bcbfd3fdc5ce7bc4 Mon Sep 17 00:00:00 2001 From: pat-s Date: Mon, 26 Aug 2024 18:40:30 +0200 Subject: [PATCH] images --- .woodpecker/images.yaml | 53 ++++++++++++++++++++++++++++++++--- docker/Dockerfile-redhat-8 | 2 +- docker/Dockerfile-redhat-9 | 4 +-- docker/Dockerfile-ubuntu-2204 | 2 +- docker/Dockerfile-ubuntu-2404 | 2 +- 5 files changed, 54 insertions(+), 9 deletions(-) diff --git a/.woodpecker/images.yaml b/.woodpecker/images.yaml index b70c4f4..3ff3a43 100644 --- a/.woodpecker/images.yaml +++ b/.woodpecker/images.yaml @@ -2,16 +2,22 @@ when: - event: cron cron: images +matrix: + include: + - PLATFORM: redhat-9 + # - PLATFORM: redhat-8 + # - PLATFORM: ubuntu-2404 + # - PLATFORM: ubuntu-2204 + steps: 'Build image': - image: woodpeckerci/plugin-docker-buildx:4.2.0 + image: woodpeckerci/plugin-docker-buildx:latest secrets: [RED_HAT_DEV_PW] settings: platforms: linux/arm64 - Dockerfile: docker/Dockerfile-redhat-9 - squash: true + Dockerfile: docker/Dockerfile-${PLATFORM} experimental: true - repo: devxygmbh/arm-binaries-r-redhat-9 + repo: devxygmbh/arm-binaries-${PLATFORM} username: devxygmbh password: from_secret: dockerhub_token_devxygmbh @@ -28,3 +34,42 @@ steps: cpu: 1000m nodeSelector: kubernetes.io/arch: 'arm64' + + + # - name: Build + # # image: library/docker:26.1.4-dind-alpine3.20 # agent on k8s + # image: alpine:3.20 # agent on VM + # privileged: true + # environment: + # DOCKER_HOST: tcp://docker:2375 + # commands: | + # apk add -q --no-cache ca-certificates py3-pip make just docker-compose docker-cli-buildx + # just image ${PLATFORM} + # backend_options: + # kubernetes: + # resources: + # requests: + # memory: 500Mi + # cpu: 1000m + # limits: + # memory: 800Mi + # cpu: 1000m + # nodeSelector: + # kubernetes.io/arch: 'arm64' + +# services: +# docker: +# environment: +# DOCKER_TLS_CERTDIR: "" +# image: docker:26-dind +# commands: dockerd --tls=false --host=tcp://0.0.0.0:2375 +# privileged: true +# ports: +# - 2375 +# # volumes: +# # - ci-tmp-rwx:/tmp # agent on k8s +# backend_options: +# kubernetes: +# nodeSelector: +# kubernetes.io/arch: "arm64" +# topology.kubernetes.io/region: fsn1 diff --git a/docker/Dockerfile-redhat-8 b/docker/Dockerfile-redhat-8 index 5472a93..84427eb 100644 --- a/docker/Dockerfile-redhat-8 +++ b/docker/Dockerfile-redhat-8 @@ -10,7 +10,7 @@ RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.n 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 -RUN curl -O https://f003.backblazeb2.com/file/devxy-r-builds/el8/R-4.4.1-1-1.aarch64.rpm +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 e2e3ede..3428a69 100644 --- a/docker/Dockerfile-redhat-9 +++ b/docker/Dockerfile-redhat-9 @@ -5,7 +5,7 @@ ENV PATH=/opt/R/4.4.1/bin:$PATH 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-9-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 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 RUN dnf install -y -q https://dl.fedoraproject.org/pub/epel/9/Everything/aarch64/Packages/h/hiredis-1.0.2-2.el9.aarch64.rpm && dnf install -y -q https://dl.fedoraproject.org/pub/epel/9/Everything/aarch64/Packages/c/ccache-4.5.1-2.el9.aarch64.rpm @@ -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 -O https://f003.backblazeb2.com/file/devxy-r-builds/el9/R-4.4.1-1-1.aarch64.rpm +RUN curl -v -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 140073e..414edff 100644 --- a/docker/Dockerfile-ubuntu-2204 +++ b/docker/Dockerfile-ubuntu-2204 @@ -7,7 +7,7 @@ ENV TZ="Europe/Berlin" 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 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 curl -O https://f003.backblazeb2.com/file/devxy-r-builds/2204/r-4.4.1_1_arm64.deb +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 c9f651c..652028b 100644 --- a/docker/Dockerfile-ubuntu-2404 +++ b/docker/Dockerfile-ubuntu-2404 @@ -7,7 +7,7 @@ ENV TZ="Europe/Berlin" 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 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 curl -O https://f003.backblazeb2.com/file/devxy-r-builds/2404/r-4.4.1_1_arm64.deb +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))'