Skip to content

Commit

Permalink
Revert "ci: downgrade builder version: ubuntu 22.04 -> ubuntu 20.04 f… (
Browse files Browse the repository at this point in the history
#2607)

Revert "ci: downgrade builder version: ubuntu 22.04 -> ubuntu 20.04 for compatible with older version glibc(>=2.31) (#2592)"

This reverts commit 0a23b40.
  • Loading branch information
MichaelScofield authored Oct 16, 2023
1 parent 6e87ac0 commit fadd289
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
7 changes: 1 addition & 6 deletions docker/buildx/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as builder
FROM ubuntu:22.04 as builder

ARG CARGO_PROFILE
ARG FEATURES
Expand All @@ -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 \
Expand Down
7 changes: 1 addition & 6 deletions docker/dev-builder/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down

0 comments on commit fadd289

Please sign in to comment.