This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git
The following commit(s) were added to refs/heads/main by this push:
new 55d1036 cmake for ubuntu 22.04 (#242)
55d1036 is described below
commit 55d10368ff7e673acdbbfd8836917617212ec3e3
Author: Brian Neradt <[email protected]>
AuthorDate: Tue Oct 17 13:36:00 2023 -0500
cmake for ubuntu 22.04 (#242)
Also fix up the dockerfiles for 22.04 and 23.04
---
docker/ubuntu2204/Dockerfile | 18 +++++++++++-------
docker/ubuntu2304/Dockerfile | 14 +++++++++-----
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/docker/ubuntu2204/Dockerfile b/docker/ubuntu2204/Dockerfile
index c50fd84..eccf131 100644
--- a/docker/ubuntu2204/Dockerfile
+++ b/docker/ubuntu2204/Dockerfile
@@ -2,17 +2,21 @@ FROM ubuntu:22.04
ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update; \
- apt-get -y install build-essential llvm ccache \
+RUN <<EOF
+ set -e
+
+ apt-get update
+
+ apt-get -y install build-essential llvm lld ccache \
make pkgconf bison flex g++ clang gettext libc++-dev autoconf automake \
libtool autotools-dev git distcc file wget openssl hwloc intltool-debian \
- clang-tools-14 clang-14 ; \
-\
+ clang-tools-14 clang-14 cmake ninja-build
+
apt-get -y install libssl-dev libexpat1-dev \
libpcre3-dev libcap-dev libhwloc-dev libunwind8 libunwind-dev zlib1g-dev \
libjemalloc-dev libluajit-5.1-dev liblzma-dev \
libhiredis-dev libbrotli-dev libncurses-dev libgeoip-dev libmagick++-dev \
- libmaxminddb-dev libcjose-dev libcjose0 libjansson-dev; \
-\
- apt-get -y autoremove; apt-get -y clean;
+ libmaxminddb-dev libcjose-dev libcjose0 libjansson-dev
+ apt-get -y autoremove; apt-get -y clean
+EOF
diff --git a/docker/ubuntu2304/Dockerfile b/docker/ubuntu2304/Dockerfile
index e2042f9..330656d 100644
--- a/docker/ubuntu2304/Dockerfile
+++ b/docker/ubuntu2304/Dockerfile
@@ -2,17 +2,21 @@ FROM ubuntu:23.04
ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update; \
+RUN <<EOF
+ set -e
+
+ apt-get update
+
apt-get -y install build-essential llvm lld ccache \
make pkgconf bison flex g++ clang gettext libc++-dev autoconf automake \
libtool autotools-dev git distcc file wget openssl hwloc intltool-debian \
- clang-tools-14 clang-14 cmake ninja-build; \
+ clang-tools-14 clang-14 cmake ninja-build
apt-get -y install libssl-dev libexpat1-dev \
libpcre3-dev libcap-dev libhwloc-dev libunwind8 libunwind-dev zlib1g-dev \
libjemalloc-dev libluajit-5.1-dev liblzma-dev \
libhiredis-dev libbrotli-dev libncurses-dev libgeoip-dev libmagick++-dev \
- libmaxminddb-dev libcjose-dev libcjose0 libjansson-dev; \
-
- apt-get -y autoremove; apt-get -y clean;
+ libmaxminddb-dev libcjose-dev libcjose0 libjansson-dev
+ apt-get -y autoremove; apt-get -y clean
+EOF
