From d9d8088222777deb07d28089e744d90aaaebd2b7 Mon Sep 17 00:00:00 2001 From: Dennis schafroth Date: Fri, 8 May 2020 12:10:11 +0200 Subject: [PATCH 1/2] Dockerfile for Debian 10/buster --- swift-ci/master/debian/10/Dockerfile | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 swift-ci/master/debian/10/Dockerfile diff --git a/swift-ci/master/debian/10/Dockerfile b/swift-ci/master/debian/10/Dockerfile new file mode 100644 index 00000000..b287193c --- /dev/null +++ b/swift-ci/master/debian/10/Dockerfile @@ -0,0 +1,37 @@ +FROM debian:10 + +RUN groupadd -g 998 build-user && \ + useradd -m -r -u 998 -g build-user build-user + +ENV DEBIAN_FRONTEND="noninteractive" + +RUN apt-get update + +RUN apt-get --no-install-recommends install -y \ + build-essential \ + clang \ + cmake \ + git \ + icu-devtools \ + libcurl4-openssl-dev \ + libedit-dev \ + libicu-dev \ + libncurses5-dev \ + libsqlite3-dev \ + libxml2-dev \ + ninja-build \ + python \ + python-dev \ + python-six \ + pkg-config \ + rsync \ + swig \ + systemtap-sdt-dev \ + tzdata \ + unzip \ + vim \ + uuid-dev + +USER build-user + +WORKDIR /home/build-user \ No newline at end of file From 715370ab4ace18310500695e56e44d7433bf4a8e Mon Sep 17 00:00:00 2001 From: Dennis schafroth Date: Sat, 9 May 2020 13:29:48 +0200 Subject: [PATCH 2/2] Fix: missing CA certificates --- swift-ci/master/debian/10/Dockerfile | 5 +++-- swift-ci/master/debian/9/Dockerfile | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/swift-ci/master/debian/10/Dockerfile b/swift-ci/master/debian/10/Dockerfile index b287193c..c24dbbbe 100644 --- a/swift-ci/master/debian/10/Dockerfile +++ b/swift-ci/master/debian/10/Dockerfile @@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND="noninteractive" RUN apt-get update -RUN apt-get --no-install-recommends install -y \ +RUN apt-get -y --no-install-recommends install \ build-essential \ clang \ cmake \ @@ -30,7 +30,8 @@ RUN apt-get --no-install-recommends install -y \ tzdata \ unzip \ vim \ - uuid-dev + uuid-dev \ + ca-certificates USER build-user diff --git a/swift-ci/master/debian/9/Dockerfile b/swift-ci/master/debian/9/Dockerfile index d6ca825c..b4e77e2f 100644 --- a/swift-ci/master/debian/9/Dockerfile +++ b/swift-ci/master/debian/9/Dockerfile @@ -5,9 +5,9 @@ RUN groupadd -g 998 build-user && \ ENV DEBIAN_FRONTEND="noninteractive" -RUN apt update +RUN apt-get update -RUN apt -y install \ +RUN apt-get -y --no-install-recommends install \ build-essential \ clang \ cmake \ @@ -30,7 +30,8 @@ RUN apt -y install \ tzdata \ unzip \ vim \ - uuid-dev + uuid-dev \ + ca-certificates USER build-user