Skip to content
Snippets Groups Projects
Commit f8633159 authored by Lars Bilke's avatar Lars Bilke Committed by Dmitri Naumov
Browse files

[Docker] Install clang-format.

parent 1bff8ae5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
scripts/docker/Dockerfile.clang.full
+ 8
− 2
View file @ f8633159
FROM ubuntu:17.10 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 && \ RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ 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 && ...@@ -19,7 +19,8 @@ RUN update-alternatives --install /usr/bin/clang clang $(which clang-5.0) 30 &&
RUN apt-get update -y && \ RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ 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/* rm -rf /var/lib/apt/lists/*
# OGS base building block # OGS base building block
...@@ -102,6 +103,11 @@ ENV CCACHE_DIR=/opt/cache \ ...@@ -102,6 +103,11 @@ ENV CCACHE_DIR=/opt/cache \
LABEL ccache.dir=/opt/cache \ LABEL ccache.dir=/opt/cache \
ccache.size=15G 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 # Jenkins node
RUN groupadd --gid 1001 jenkins && \ RUN groupadd --gid 1001 jenkins && \
adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \ adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \
......
scripts/docker/Dockerfile.clang.minimal
+ 8
− 2
View file @ f8633159
FROM ubuntu:17.10 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 && \ RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ 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 && ...@@ -19,7 +19,8 @@ RUN update-alternatives --install /usr/bin/clang clang $(which clang-5.0) 30 &&
RUN apt-get update -y && \ RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ 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/* rm -rf /var/lib/apt/lists/*
# OGS base building block # OGS base building block
...@@ -87,6 +88,11 @@ ENV CCACHE_DIR=/opt/cache \ ...@@ -87,6 +88,11 @@ ENV CCACHE_DIR=/opt/cache \
LABEL ccache.dir=/opt/cache \ LABEL ccache.dir=/opt/cache \
ccache.size=15G 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 # Jenkins node
RUN groupadd --gid 1001 jenkins && \ RUN groupadd --gid 1001 jenkins && \
adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \ adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \
......
scripts/docker/Dockerfile.gcc.full
+ 7
− 3
View file @ f8633159
FROM ubuntu:17.10 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 && \ RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
...@@ -99,8 +99,7 @@ RUN apt-get update -y && \ ...@@ -99,8 +99,7 @@ RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
doxygen \ doxygen \
graphviz \ graphviz \
texlive-base \ texlive-base && \
sudo && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# pip # pip
...@@ -124,6 +123,11 @@ ENV CCACHE_DIR=/opt/cache \ ...@@ -124,6 +123,11 @@ ENV CCACHE_DIR=/opt/cache \
LABEL ccache.dir=/opt/cache \ LABEL ccache.dir=/opt/cache \
ccache.size=15G 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 # Jenkins node
RUN groupadd --gid 1001 jenkins && \ RUN groupadd --gid 1001 jenkins && \
adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \ adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \
......
scripts/docker/Dockerfile.gcc.gui
+ 6
− 1
View file @ f8633159
FROM ubuntu:17.10 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 && \ RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
...@@ -96,6 +96,11 @@ ENV CCACHE_DIR=/opt/cache \ ...@@ -96,6 +96,11 @@ ENV CCACHE_DIR=/opt/cache \
LABEL ccache.dir=/opt/cache \ LABEL ccache.dir=/opt/cache \
ccache.size=15G 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 # Jenkins node
RUN groupadd --gid 1001 jenkins && \ RUN groupadd --gid 1001 jenkins && \
adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \ adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment