Skip to content

Commit 0123212

Browse files
committed
docker: bump tarantool builder to Ubuntu 20.04
Related to tarantool/tarantool#12167
1 parent d0369d6 commit 0123212

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

cli/install/Dockerfile.tnt.build

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22

33
WORKDIR /work
4-
RUN apt-get update && apt-get install -y git wget make build-essential zlib1g-dev \
4+
5+
# Avoid interactive configuration of tzdata package
6+
ENV DEBIAN_FRONTEND="noninteractive"
7+
8+
RUN apt update && apt install -y git wget make build-essential zlib1g-dev \
59
libreadline-dev libncurses5-dev libssl-dev libunwind-dev libicu-dev autoconf libtool
610
RUN wget https://cmake.org/files/v3.28/cmake-3.28.6-linux-x86_64.tar.gz -qO- | \
711
tar -xz -C /usr/local --strip-components=1

cli/pack/templates/Dockerfile.pack.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@ RUN apt-get update && apt-get install -y tt={{ .tt_version }} || \
99
apt-get install -y tt
1010

1111
# Install Tarantool
12-
FROM --platform=linux/amd64 ubuntu:18.04 as tarantool-builder
12+
FROM --platform=linux/amd64 ubuntu:20.04 as tarantool-builder
1313

1414
COPY --from=tt-builder /usr/bin/tt /usr/bin
1515

1616
WORKDIR /usr/src/tarantool
1717

1818
RUN apt update
1919

20+
ENV DEBIAN_FRONTEND="noninteractive"
21+
2022
RUN apt install -y git build-essential cmake make zlib1g-dev \
2123
libreadline-dev libncurses5-dev libssl-dev libunwind-dev libicu-dev \
2224
python3 python3-yaml python3-six python3-gevent autoconf libtool
@@ -36,6 +38,4 @@ COPY --from=tarantool-builder /usr/src/tarantool/include /usr/local/
3638

3739
WORKDIR /usr/src/{{ .env_dir }}
3840

39-
ENV DEBIAN_FRONTEND="noninteractive"
40-
4141
RUN apt update && apt install -y git build-essential cmake make cpio binutils curl unzip

test/integration/install/test_install.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ def test_install_tarantool_in_docker(tt_cmd, tmp_path):
379379
+ os.path.join(tmp_path, "bin", "tarantool")
380380
+ " | grep -o -E 'GLIBC_[.0-9]+' | sort -V | tail -n1",
381381
)
382-
assert out == "GLIBC_2.27"
382+
assert out == "GLIBC_2.29"
383383

384384
assert os.path.exists(os.path.join(tmp_path, "my_inc", "include", "tarantool"))
385385

0 commit comments

Comments
 (0)