Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add clang-format 7.0.1 to CI image #1719

Merged
merged 3 commits into from
Feb 2, 2019
Merged

Add clang-format 7.0.1 to CI image #1719

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3a0a7d
Make Dockerfile build again
palmerlao Jan 27, 2019
b3200aa
Download clang-format
palmerlao Jan 27, 2019
0d4cb0c
Merge branch 'master' into palmerlao/update-ci-image
palmerlao Feb 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .pipelines/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
FROM ubuntu:14.04 AS build

# Upgrade cmake to 3.2
RUN apt-get update
RUN apt-get install -y software-properties-common python-software-properties debconf-utils
RUN apt-get update && apt-get install -y software-properties-common python-software-properties debconf-utils
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand very well why this change was necessary, but without it, running docker build - < .pipelines/Dockerfile gave me an error on this step that looked like apt-get update hadn't been run. Combining the two lines made it work again.

The Docker documentation indicates that this seems to be the preferable way to run apt-get update.

RUN add-apt-repository -y ppa:george-edison55/cmake-3.x
RUN apt-get update

Expand Down Expand Up @@ -62,3 +61,9 @@ RUN apt-get clean autoclean && \
# Set environment variables used by build
ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
ENV JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64/"

# Download clang-format 7.0
RUN wget http://releases.llvm.org/7.0.1/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-14.04.tar.xz && \
tar xvf clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-14.04.tar.xz && \
mv clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang-format /usr/local/bin && \
rm -rf clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-14.04/