From 18666a57e3a5c6b5ead01435ac34d4124f9a07e8 Mon Sep 17 00:00:00 2001 From: luofucong Date: Mon, 16 Oct 2023 10:01:50 +0800 Subject: [PATCH] Revert "ci: downgrade builder version: ubuntu 22.04 -> ubuntu 20.04 for compatible with older version glibc(>=2.31) (#2592)" This reverts commit 0a23b403212ed4d30be8fe2625d1c557f431a146. --- docker/buildx/ubuntu/Dockerfile | 7 +------ docker/dev-builder/ubuntu/Dockerfile | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/docker/buildx/ubuntu/Dockerfile b/docker/buildx/ubuntu/Dockerfile index 8d6fc8b1fbb2..e005a0015e9a 100644 --- a/docker/buildx/ubuntu/Dockerfile +++ b/docker/buildx/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 as builder +FROM ubuntu:22.04 as builder ARG CARGO_PROFILE ARG FEATURES @@ -7,11 +7,6 @@ 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 b117d6f0f409..afefe2a20a93 100644 --- a/docker/dev-builder/ubuntu/Dockerfile +++ b/docker/dev-builder/ubuntu/Dockerfile @@ -1,13 +1,8 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.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 \