From f86331596f90f1d6d2474aaca75d6bb1b4f82596 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 18 Feb 2019 11:30:41 +0100
Subject: [PATCH] [Docker] Install clang-format.
---
scripts/docker/Dockerfile.clang.full | 10 ++++++++--
scripts/docker/Dockerfile.clang.minimal | 10 ++++++++--
scripts/docker/Dockerfile.gcc.full | 10 +++++++---
scripts/docker/Dockerfile.gcc.gui | 7 ++++++-
4 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/scripts/docker/Dockerfile.clang.full b/scripts/docker/Dockerfile.clang.full
index ea6ed90e842..cbd0a78e6b7 100644
--- a/scripts/docker/Dockerfile.clang.full
+++ b/scripts/docker/Dockerfile.clang.full
@@ -1,6 +1,6 @@
FROM ubuntu:17.10
-# Generated with https://github.com/ufz/ogs-container-maker/commit/0930f12
+# Generated with https://github.com/ufz/ogs-container-maker/commit/9f130d9
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -19,7 +19,8 @@ RUN update-alternatives --install /usr/bin/clang clang $(which clang-5.0) 30 &&
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
- clang-tidy-5.0 && \
+ clang-tidy-5.0 \
+ clang-format-5.0 && \
rm -rf /var/lib/apt/lists/*
# OGS base building block
@@ -102,6 +103,11 @@ ENV CCACHE_DIR=/opt/cache \
LABEL ccache.dir=/opt/cache \
ccache.size=15G
+RUN apt-get update -y && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ sudo && \
+ rm -rf /var/lib/apt/lists/*
+
# Jenkins node
RUN groupadd --gid 1001 jenkins && \
adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \
diff --git a/scripts/docker/Dockerfile.clang.minimal b/scripts/docker/Dockerfile.clang.minimal
index 82f4eb825da..90fe6ad8814 100644
--- a/scripts/docker/Dockerfile.clang.minimal
+++ b/scripts/docker/Dockerfile.clang.minimal
@@ -1,6 +1,6 @@
FROM ubuntu:17.10
-# Generated with https://github.com/ufz/ogs-container-maker/commit/0930f12
+# Generated with https://github.com/ufz/ogs-container-maker/commit/9f130d9
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -19,7 +19,8 @@ RUN update-alternatives --install /usr/bin/clang clang $(which clang-5.0) 30 &&
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
- clang-tidy-5.0 && \
+ clang-tidy-5.0 \
+ clang-format-5.0 && \
rm -rf /var/lib/apt/lists/*
# OGS base building block
@@ -87,6 +88,11 @@ ENV CCACHE_DIR=/opt/cache \
LABEL ccache.dir=/opt/cache \
ccache.size=15G
+RUN apt-get update -y && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ sudo && \
+ rm -rf /var/lib/apt/lists/*
+
# Jenkins node
RUN groupadd --gid 1001 jenkins && \
adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \
diff --git a/scripts/docker/Dockerfile.gcc.full b/scripts/docker/Dockerfile.gcc.full
index 9f0bc50aaac..88040137147 100644
--- a/scripts/docker/Dockerfile.gcc.full
+++ b/scripts/docker/Dockerfile.gcc.full
@@ -1,6 +1,6 @@
FROM ubuntu:17.10
-# Generated with https://github.com/ufz/ogs-container-maker/commit/0930f12
+# Generated with https://github.com/ufz/ogs-container-maker/commit/9f130d9
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -99,8 +99,7 @@ RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
doxygen \
graphviz \
- texlive-base \
- sudo && \
+ texlive-base && \
rm -rf /var/lib/apt/lists/*
# pip
@@ -124,6 +123,11 @@ ENV CCACHE_DIR=/opt/cache \
LABEL ccache.dir=/opt/cache \
ccache.size=15G
+RUN apt-get update -y && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ sudo && \
+ rm -rf /var/lib/apt/lists/*
+
# Jenkins node
RUN groupadd --gid 1001 jenkins && \
adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \
diff --git a/scripts/docker/Dockerfile.gcc.gui b/scripts/docker/Dockerfile.gcc.gui
index 486b6b5dc92..99712f98e31 100644
--- a/scripts/docker/Dockerfile.gcc.gui
+++ b/scripts/docker/Dockerfile.gcc.gui
@@ -1,6 +1,6 @@
FROM ubuntu:17.10
-# Generated with https://github.com/ufz/ogs-container-maker/commit/0930f12
+# Generated with https://github.com/ufz/ogs-container-maker/commit/9f130d9
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -96,6 +96,11 @@ ENV CCACHE_DIR=/opt/cache \
LABEL ccache.dir=/opt/cache \
ccache.size=15G
+RUN apt-get update -y && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ sudo && \
+ rm -rf /var/lib/apt/lists/*
+
# Jenkins node
RUN groupadd --gid 1001 jenkins && \
adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \
--
GitLab