Skip to content

Commit

Permalink
Dockerfile: adding clang gpg public key
Browse files Browse the repository at this point in the history
Signed-off-by: André Martins <andre@cilium.io>
  • Loading branch information
aanm committed Mar 18, 2017
1 parent c59a9a0 commit 2095d94
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 3 deletions.
6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@ apt-get install -y --no-install-recommends gcc make libelf-dev bison flex git li
# clang-3.8.1-begin
apt-get install -y --no-install-recommends curl xz-utils && \
cd /tmp && \
gpg --import /tmp/cilium-net-build/src/github.com/cilium/cilium/contrib/packaging/docker/clang-3.8.1.key && \
curl -Ssl -o clang+llvm.tar.xz \
http://releases.llvm.org/3.8.1/clang+llvm-3.8.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz && \
curl -Ssl -o clang+llvm.tar.xz.sig \
http://releases.llvm.org/3.8.1/clang+llvm-3.8.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz.sig && \
gpg --verify clang+llvm.tar.xz.sig && \
mkdir -p /usr/local && \
tar -C /usr/local -xJf ./clang+llvm.tar.xz && \
mv /usr/local/clang+llvm-3.8.1-x86_64-linux-gnu-ubuntu-16.04 /usr/local/clang+llvm && \
Expand Down Expand Up @@ -49,7 +53,7 @@ make PKG_BUILD=1 install && \
#
apt-get purge --auto-remove -y gcc make bison flex git curl xz-utils && \
apt-get clean && \
rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/local/go && \
rm -fr /root /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/local/go && \
echo '#!/usr/bin/env bash\ncp /opt/cni/bin/cilium-cni /tmp/cni/bin && /usr/bin/cilium-agent $@' > /home/with-cni.sh && \
chmod +x /home/with-cni.sh

Expand Down
3 changes: 2 additions & 1 deletion contrib/packaging/cp-dirs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ cp -vR "${root_dir}/api" "${dest}"
cp -vR "${root_dir}/bpf" "${dest}"
cp -vR "${root_dir}/cilium" "${dest}"
cp -vR "${root_dir}/common" "${dest}"
mkdir -p "${dest}/contrib"
mkdir -p "${dest}/contrib/packaging/docker"
cp -v "${root_dir}/contrib/packaging/docker/clang-3.8.1.key" "${dest}/contrib/packaging/docker"
cp -vR "${root_dir}/contrib/systemd" "${dest}/contrib"
cp -vR "${root_dir}/contrib/upstart" "${dest}/contrib"
cp -vR "${root_dir}/daemon" "${dest}"
Expand Down
2 changes: 1 addition & 1 deletion contrib/packaging/docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ build: clean
docker build -t "cilium:cilium-ubuntu-16-04" $(BUILDDIR)

clean:
ls -d ./* | grep -vE Makefile | xargs rm -rf
ls -d ./* | grep -vE "Makefile|clang-3.8.1.key" | xargs rm -rf

.PHONY: clean build force
force :;
43 changes: 43 additions & 0 deletions contrib/packaging/docker/clang-3.8.1.key
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----

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
HEA0
=lNsd
-----END PGP PUBLIC KEY BLOCK-----

0 comments on commit 2095d94

Please sign in to comment.