From a0147e0157ffbc70b30c19a451c40db41a724876 Mon Sep 17 00:00:00 2001 From: Houssem Ben Ali Date: Thu, 22 Jun 2023 10:33:45 +0200 Subject: [PATCH 1/2] Add glibc support to alpine image WIP --- base-alpine/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/base-alpine/Dockerfile b/base-alpine/Dockerfile index bcea6ed..6215007 100644 --- a/base-alpine/Dockerfile +++ b/base-alpine/Dockerfile @@ -9,10 +9,15 @@ FROM alpine:3.18 LABEL MAINTAINER "eXo Platform " +RUN wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub +RUN wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r1/glibc-2.35-r1.apk +RUN wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r1/glibc-bin-2.35-r1.apk + # Install some useful or needed tools RUN apk update && \ apk upgrade && \ - apk add --no-cache xmlstarlet jq bash wget curl htop unzip git git-lfs make python3 sudo xterm github-cli expect busybox sed grep yq gnupg openssh openssl msttcorefonts-installer fontconfig + apk add --no-cache xmlstarlet jq bash curl htop unzip git git-lfs make python3 sudo xterm github-cli expect busybox sed grep yq \ + gnupg openssh openssl msttcorefonts-installer fontconfig ca-certificates libcurl build-base openssl1.1-compat glibc-2.35-r1.apk glibc-bin-2.35-r1.apk RUN update-ms-fonts From 3b5eb0c9e994c9a8668006e35083520e870bd0d8 Mon Sep 17 00:00:00 2001 From: Houssem Ben Ali Date: Thu, 22 Jun 2023 18:33:16 +0200 Subject: [PATCH 2/2] Fallback to 3.17 with glibc native support --- base-alpine/Dockerfile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/base-alpine/Dockerfile b/base-alpine/Dockerfile index 6215007..1cb9d10 100644 --- a/base-alpine/Dockerfile +++ b/base-alpine/Dockerfile @@ -1,23 +1,19 @@ # Dockerizing a base images with: # -# - alpine 3.18 +# - alpine 3.17 # - Base eXo CI Configuration # # build : docker build -t exoplatform/ci:base-alpine . # -FROM alpine:3.18 +FROM frolvlad/alpine-glibc:alpine-3.17 LABEL MAINTAINER "eXo Platform " -RUN wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -RUN wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r1/glibc-2.35-r1.apk -RUN wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r1/glibc-bin-2.35-r1.apk - # Install some useful or needed tools RUN apk update && \ apk upgrade && \ apk add --no-cache xmlstarlet jq bash curl htop unzip git git-lfs make python3 sudo xterm github-cli expect busybox sed grep yq \ - gnupg openssh openssl msttcorefonts-installer fontconfig ca-certificates libcurl build-base openssl1.1-compat glibc-2.35-r1.apk glibc-bin-2.35-r1.apk + gnupg openssh openssl msttcorefonts-installer fontconfig ca-certificates libcurl build-base openssl1.1-compat RUN update-ms-fonts