Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dmitri Naumov
ogs
Commits
307ea28f
Commit
307ea28f
authored
6 years ago
by
Lars Bilke
Committed by
Dmitri Naumov
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[Docker] Update to clang-7.
parent
80d7206f
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Jenkinsfile
+1
-1
1 addition, 1 deletion
Jenkinsfile
scripts/docker/Dockerfile.clang.full
+16
-15
16 additions, 15 deletions
scripts/docker/Dockerfile.clang.full
scripts/docker/Dockerfile.clang.minimal
+9
-8
9 additions, 8 deletions
scripts/docker/Dockerfile.clang.minimal
with
26 additions
and
24 deletions
Jenkinsfile
+
1
−
1
View file @
307ea28f
...
@@ -447,7 +447,7 @@ pipeline {
...
@@ -447,7 +447,7 @@ pipeline {
cmakeOptions
=
cmakeOptions
=
"-DBUILD_SHARED_LIBS=${build_shared} "
+
"-DBUILD_SHARED_LIBS=${build_shared} "
+
'-DBUILD_TESTING=OFF '
+
'-DBUILD_TESTING=OFF '
+
'-DCMAKE_CXX_CLANG_TIDY=clang-tidy-
5.0
'
'-DCMAKE_CXX_CLANG_TIDY=clang-tidy-
7
'
}
}
build
{
log
=
'build.log'
}
build
{
log
=
'build.log'
}
}
}
...
...
This diff is collapsed.
Click to expand it.
scripts/docker/Dockerfile.clang.full
+
16
−
15
View file @
307ea28f
FROM ubuntu:1
7.10
FROM ubuntu:1
8.04
# Generated with https://github.com/ufz/ogs-container-maker/commit/
9f130d
9
# Generated with https://github.com/ufz/ogs-container-maker/commit/
779025
9
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 \
...
@@ -12,15 +12,15 @@ RUN apt-get update -y && \
...
@@ -12,15 +12,15 @@ RUN apt-get update -y && \
# LLVM compiler
# LLVM compiler
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-
5.0
&& \
clang-
7
&& \
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*
RUN update-alternatives --install /usr/bin/clang clang $(which clang-
5.0
) 30 && \
RUN update-alternatives --install /usr/bin/clang clang $(which clang-
7
) 30 && \
update-alternatives --install /usr/bin/clang++ clang++ $(which clang++-
5.0
) 30
update-alternatives --install /usr/bin/clang++ clang++ $(which clang++-
7
) 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-
7
\
clang-format-
5.0
&& \
clang-format-
7
&& \
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*
# OGS base building block
# OGS base building block
...
@@ -46,7 +46,8 @@ RUN apt-get update -y && \
...
@@ -46,7 +46,8 @@ RUN apt-get update -y && \
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://cmake.org/files/v3.13/cmake-3.13.4-Linux-x86_64.sh && \
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://cmake.org/files/v3.13/cmake-3.13.4-Linux-x86_64.sh && \
/bin/sh /var/tmp/cmake-3.13.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \
/bin/sh /var/tmp/cmake-3.13.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \
rm -rf /var/tmp/cmake-3.13.4-Linux-x86_64.sh
rm -rf /var/tmp/cmake-3.13.4-Linux-x86_64.sh
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
RUN apt-get update && \
curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
RUN apt-get update -y && \
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common && \
apt-add-repository ppa:git-core/ppa -y && \
apt-add-repository ppa:git-core/ppa -y && \
...
@@ -76,19 +77,19 @@ LABEL org.opengeosys.pm=conan \
...
@@ -76,19 +77,19 @@ LABEL org.opengeosys.pm=conan \
org.opengeosys.pm.conan.user_home=/opt/conan \
org.opengeosys.pm.conan.user_home=/opt/conan \
org.opengeosys.pm.conan.version=1.12.2
org.opengeosys.pm.conan.version=1.12.2
# Include-what-you-use for clang version
5.0
# Include-what-you-use for clang version
7
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 \
libncurses5-dev \
libncurses5-dev \
zlib1g-dev \
zlib1g-dev \
llvm-
5.0
-dev \
llvm-
7
-dev \
libclang-
5.0
-dev && \
libclang-
7
-dev && \
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/include-what-you-use/include-what-you-use/archive/clang_
5
.0.tar.gz && \
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/include-what-you-use/include-what-you-use/archive/clang_
7
.0.tar.gz && \
mkdir -p /var/tmp && tar -x -f /var/tmp/clang_
5
.0.tar.gz -C /var/tmp -z && \
mkdir -p /var/tmp && tar -x -f /var/tmp/clang_
7
.0.tar.gz -C /var/tmp -z && \
mkdir -p /var/tmp/build && cd /var/tmp/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/iwyy -DIWYU_LLVM_ROOT_PATH=/usr/lib/llvm-
5.0
/var/tmp/include-what-you-use-clang_
5
.0 && \
mkdir -p /var/tmp/build && cd /var/tmp/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/iwyy -DIWYU_LLVM_ROOT_PATH=/usr/lib/llvm-
7
/var/tmp/include-what-you-use-clang_
7
.0 && \
cmake --build /var/tmp/build --target install -- -j$(nproc) && \
cmake --build /var/tmp/build --target install -- -j$(nproc) && \
rm -rf /var/tmp/clang_
5
.0.tar.gz /var/tmp/build /var/tmp/include-what-you-use-clang_
5
.0
rm -rf /var/tmp/clang_
7
.0.tar.gz /var/tmp/build /var/tmp/include-what-you-use-clang_
7
.0
ENV PATH=/usr/local/iwyy/bin:$PATH
ENV PATH=/usr/local/iwyy/bin:$PATH
# Package manager Conan building block
# Package manager Conan building block
...
...
This diff is collapsed.
Click to expand it.
scripts/docker/Dockerfile.clang.minimal
+
9
−
8
View file @
307ea28f
FROM ubuntu:1
7.10
FROM ubuntu:1
8.04
# Generated with https://github.com/ufz/ogs-container-maker/commit/
9f130d
9
# Generated with https://github.com/ufz/ogs-container-maker/commit/
779025
9
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 \
...
@@ -12,15 +12,15 @@ RUN apt-get update -y && \
...
@@ -12,15 +12,15 @@ RUN apt-get update -y && \
# LLVM compiler
# LLVM compiler
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-
5.0
&& \
clang-
7
&& \
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*
RUN update-alternatives --install /usr/bin/clang clang $(which clang-
5.0
) 30 && \
RUN update-alternatives --install /usr/bin/clang clang $(which clang-
7
) 30 && \
update-alternatives --install /usr/bin/clang++ clang++ $(which clang++-
5.0
) 30
update-alternatives --install /usr/bin/clang++ clang++ $(which clang++-
7
) 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-
7
\
clang-format-
5.0
&& \
clang-format-
7
&& \
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*
# OGS base building block
# OGS base building block
...
@@ -46,7 +46,8 @@ RUN apt-get update -y && \
...
@@ -46,7 +46,8 @@ RUN apt-get update -y && \
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://cmake.org/files/v3.13/cmake-3.13.4-Linux-x86_64.sh && \
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://cmake.org/files/v3.13/cmake-3.13.4-Linux-x86_64.sh && \
/bin/sh /var/tmp/cmake-3.13.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \
/bin/sh /var/tmp/cmake-3.13.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \
rm -rf /var/tmp/cmake-3.13.4-Linux-x86_64.sh
rm -rf /var/tmp/cmake-3.13.4-Linux-x86_64.sh
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
RUN apt-get update && \
curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
RUN apt-get update -y && \
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common && \
apt-add-repository ppa:git-core/ppa -y && \
apt-add-repository ppa:git-core/ppa -y && \
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment