From 0a23b403212ed4d30be8fe2625d1c557f431a146 Mon Sep 17 00:00:00 2001 From: zyy17 Date: Thu, 12 Oct 2023 16:46:25 +0800 Subject: [PATCH] ci: downgrade builder version: ubuntu 22.04 -> ubuntu 20.04 for compatible with older version glibc(>=2.31) (#2592) --- docker/buildx/ubuntu/Dockerfile | 7 ++++++- docker/dev-builder/ubuntu/Dockerfile | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docker/buildx/ubuntu/Dockerfile b/docker/buildx/ubuntu/Dockerfile index e005a0015e9a..8d6fc8b1fbb2 100644 --- a/docker/buildx/ubuntu/Dockerfile +++ b/docker/buildx/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 as builder +FROM ubuntu:20.04 as builder ARG CARGO_PROFILE ARG FEATURES @@ -7,6 +7,11 @@ ARG OUTPUT_DIR ENV LANG en_US.utf8 WORKDIR /greptimedb +# Add PPA for Python 3.10. +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common && \ + add-apt-repository ppa:deadsnakes/ppa -y + # Install dependencies. RUN --mount=type=cache,target=/var/cache/apt \ apt-get update && apt-get install -y \ diff --git a/docker/dev-builder/ubuntu/Dockerfile b/docker/dev-builder/ubuntu/Dockerfile index afefe2a20a93..b117d6f0f409 100644 --- a/docker/dev-builder/ubuntu/Dockerfile +++ b/docker/dev-builder/ubuntu/Dockerfile @@ -1,8 +1,13 @@ -FROM ubuntu:22.04 +FROM ubuntu:20.04 ENV LANG en_US.utf8 WORKDIR /greptimedb +# Add PPA for Python 3.10. +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common && \ + add-apt-repository ppa:deadsnakes/ppa -y + # Install dependencies. RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libssl-dev \