From 9c5337be1e6042bb10d5d91f189cdddc90fa70bb Mon Sep 17 00:00:00 2001 From: pat-s Date: Thu, 5 Sep 2024 10:44:25 +0200 Subject: [PATCH] try fixing images build_args --- .woodpecker/images.yaml | 21 +++++++++++---------- docker/Dockerfile-alpine-320 | 4 +++- docker/Dockerfile-redhat-8 | 2 ++ docker/Dockerfile-redhat-9 | 1 + docker/Dockerfile-ubuntu-2204 | 2 ++ docker/Dockerfile-ubuntu-2404 | 2 ++ 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.woodpecker/images.yaml b/.woodpecker/images.yaml index b4b6490..b08486d 100644 --- a/.woodpecker/images.yaml +++ b/.woodpecker/images.yaml @@ -6,16 +6,16 @@ matrix: include: - PLATFORM: redhat-9 ARCH: arm64 - - PLATFORM: redhat-8 - ARCH: arm64 - - PLATFORM: ubuntu-2404 - ARCH: arm64 - - PLATFORM: ubuntu-2204 - ARCH: arm64 - - PLATFORM: alpine-320 - ARCH: arm64 - - PLATFORM: alpine-320 - ARCH: amd64 + # - PLATFORM: redhat-8 + # ARCH: arm64 + # - PLATFORM: ubuntu-2404 + # ARCH: arm64 + # - PLATFORM: ubuntu-2204 + # ARCH: arm64 + # - PLATFORM: alpine-320 + # ARCH: arm64 + # - PLATFORM: alpine-320 + # ARCH: amd64 steps: - name: 'Build image' @@ -31,6 +31,7 @@ steps: from_secret: dockerhub_token_devxygmbh build_args_from_env: - RED_HAT_DEV_PW + - GITHUB_PAT backend_options: kubernetes: resources: diff --git a/docker/Dockerfile-alpine-320 b/docker/Dockerfile-alpine-320 index 01dd380..e856785 100644 --- a/docker/Dockerfile-alpine-320 +++ b/docker/Dockerfile-alpine-320 @@ -3,6 +3,8 @@ FROM alpine:3.20 ENV PATH=/opt/R/4.4.1/bin:$PATH ENV TZ="Europe/Berlin" +ARG GITHUB_PAT + # 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 @@ -17,7 +19,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 libxml2-dev libgit2-dev +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 libpq-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 d4c0ff7..d387b7f 100644 --- a/docker/Dockerfile-redhat-8 +++ b/docker/Dockerfile-redhat-8 @@ -4,6 +4,8 @@ ARG RED_HAT_DEV_PW ENV PATH=/opt/R/4.4.1/bin:$PATH ENV TZ="Europe/Berlin" +ARG GITHUB_PAT + 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 diff --git a/docker/Dockerfile-redhat-9 b/docker/Dockerfile-redhat-9 index 1d1f375..5b4097a 100644 --- a/docker/Dockerfile-redhat-9 +++ b/docker/Dockerfile-redhat-9 @@ -3,6 +3,7 @@ FROM redhat/ubi9 ARG RED_HAT_DEV_PW ENV PATH=/opt/R/4.4.1/bin:$PATH ENV TZ="Europe/Berlin" + 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 diff --git a/docker/Dockerfile-ubuntu-2204 b/docker/Dockerfile-ubuntu-2204 index 4d7a9cc..de2edad 100644 --- a/docker/Dockerfile-ubuntu-2204 +++ b/docker/Dockerfile-ubuntu-2204 @@ -4,6 +4,8 @@ ENV PATH=/opt/R/4.4.1/bin:$PATH ENV TZ="Europe/Berlin" ENV DEBIAN_FRONTEND=noninteractive +ARG GITHUB_PAT + 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 diff --git a/docker/Dockerfile-ubuntu-2404 b/docker/Dockerfile-ubuntu-2404 index 3382b49..fdd48f4 100644 --- a/docker/Dockerfile-ubuntu-2404 +++ b/docker/Dockerfile-ubuntu-2404 @@ -4,6 +4,8 @@ ENV PATH=/opt/R/4.4.1/bin:$PATH ENV TZ="Europe/Berlin" ENV DEBIAN_FRONTEND=noninteractive +ARG GITHUB_PAT + 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