Refactored some Docker images, added gpg

boostorg · Mar 11, 2024 · 1593da4 · 1593da4
1 parent e21ccac
commit 1593da4
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 22 deletions.
diff --git a/tools/docker/build-clang3_6.dockerfile b/tools/docker/build-clang3_6.dockerfile
@@ -10,17 +10,16 @@ FROM ubuntu:16.04
 RUN \
     apt-get update && \
     apt-get --no-install-recommends -y install \
-        software-properties-common \
-        ca-certificates \
+        clang-3.6 \
         libssl-dev \
         git \
+        ca-certificates \
         python3 \
         python3-requests \
-        # Workaround for https://github.com/bfgroup/b2/issues/354
-        g++ \
+        cmake \
+        ninja-build \
+        valgrind \
         mysql-client && \
-    add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
-    apt-get --no-install-recommends -y install clang-3.6 && \
     ln -s /usr/bin/clang++-3.6 /usr/bin/clang++ && \
     ln -s /usr/bin/clang-3.6 /usr/bin/clang && \
     ln -s /usr/bin/python3 /usr/bin/python
diff --git a/tools/docker/build-gcc11.dockerfile b/tools/docker/build-gcc11.dockerfile
@@ -10,19 +10,19 @@ FROM ubuntu:22.04
 RUN \
     apt-get update && \
     apt-get --no-install-recommends -y install \
-        ca-certificates \
         gcc-11 \
         g++-11 \
         libssl-dev \
-        wget \
+        git \
+        ca-certificates \
         python3 \
         python3-requests \
         python-is-python3 \
+        cmake \
         ninja-build \
         valgrind \
-        git \
-        cmake \
+        gpg \
+        gpg-agent \
         mysql-client && \
-    unlink /usr/bin/gcc && \
     ln -s /usr/bin/g++-11 /usr/bin/g++ && \
     ln -s /usr/bin/gcc-11 /usr/bin/gcc
diff --git a/tools/docker/build-gcc13.dockerfile b/tools/docker/build-gcc13.dockerfile
@@ -10,16 +10,19 @@ FROM ubuntu:23.04
 RUN \
     apt-get update && \
     apt-get --no-install-recommends -y install \
-        ca-certificates \
         gcc-13 \
         g++-13 \
         libssl-dev \
+        git \
+        ca-certificates \
         python3 \
         python3-requests \
         python-is-python3 \
-        ninja-build \
-        git \
         cmake \
+        ninja-build \
+        valgrind \
+        gpg \
+        gpg-agent \
         mysql-client && \
     ln -s /usr/bin/g++-13 /usr/bin/g++ && \
     ln -s /usr/bin/gcc-13 /usr/bin/gcc
diff --git a/tools/docker/build-gcc5.dockerfile b/tools/docker/build-gcc5.dockerfile
@@ -10,15 +10,17 @@ FROM ubuntu:16.04
 RUN \
     apt-get update && \
     apt-get --no-install-recommends -y install \
-        software-properties-common \
-        ca-certificates \
+        gcc-5 \
+        g++-5 \
         libssl-dev \
         git \
+        ca-certificates \
         python3 \
         python3-requests \
+        cmake \
+        ninja-build \
+        valgrind \
         mysql-client && \
-    add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
-    apt-get --no-install-recommends -y install gcc-5 g++-5 && \
     ln -s /usr/bin/g++-5 /usr/bin/g++ && \
     ln -s /usr/bin/gcc-5 /usr/bin/gcc && \
     ln -s /usr/bin/python3 /usr/bin/python
diff --git a/tools/docker/build-gcc6.dockerfile b/tools/docker/build-gcc6.dockerfile
@@ -10,15 +10,19 @@ FROM ubuntu:18.04
 RUN \
     apt-get update && \
     apt-get --no-install-recommends -y install \
-        software-properties-common \
-        ca-certificates \
+        gcc-6 \
+        g++-6 \
         libssl-dev \
         git \
+        ca-certificates \
         python3 \
         python3-requests \
+        cmake \
+        ninja-build \
+        valgrind \
+        gpg \
+        gpg-agent \
         mysql-client && \
-    add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
-    apt-get --no-install-recommends -y install gcc-6 g++-6 && \
     ln -s /usr/bin/g++-6 /usr/bin/g++ && \
     ln -s /usr/bin/gcc-6 /usr/bin/gcc && \
     ln -s /usr/bin/python3 /usr/bin/python