From 1a26a1b4e1d4aac25214602b6f0913b5dfba1805 Mon Sep 17 00:00:00 2001
From: Erick Hitter <gitlab-s@mxs.ethitter.com>
Date: Thu, 15 Aug 2019 05:16:37 +0000
Subject: [PATCH] Use clang available in Buster
---
golang/latest/Dockerfile | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/golang/latest/Dockerfile b/golang/latest/Dockerfile
index 7f47d7d..ae77f54 100644
--- a/golang/latest/Dockerfile
+++ b/golang/latest/Dockerfile
@@ -9,28 +9,13 @@ ENV GOPATH /go
ENV PATH ${GOPATH}/bin:$PATH
RUN go get -u golang.org/x/lint/golint
-# Install requirement to import LLVM key
+# Install clang
RUN apt-get update && apt-get install -y --no-install-recommends \
- gnupg2 \
- wget \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-# Add apt key for LLVM repository
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-
-# Add LLVM apt repository
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN echo "deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch-5.0 main" | tee -a /etc/apt/sources.list
-
-# Install clang from LLVM repository
-RUN apt-get update && apt-get install -y --no-install-recommends \
- clang-5.0 \
+ clang-7.0 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# Set Clang as default CC
ENV set_clang /etc/profile.d/set-clang-cc.sh
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN echo "export CC=clang-5.0" | tee -a ${set_clang} && chmod a+x ${set_clang}
+RUN echo "export CC=clang-7.0" | tee -a ${set_clang} && chmod a+x ${set_clang}
--
GitLab