Merge pull request #18 from fatalbanana/noble2

Remove llvm stuff from Ubuntu images
rspamd · May 13, 2024 · ac223a5 · ac223a5
2 parents 1157248 + 3011270
commit ac223a5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/ubuntu-focal/Dockerfile b/ubuntu-focal/Dockerfile
@@ -11,14 +11,8 @@ SHELL ["/bin/bash", "-c"]
 
 RUN set -x; \
 	apt-get -q update && \
-	apt-get -qy --no-install-recommends install $pre_deps && \
+	apt-get -qy --no-install-recommends install $pre_deps $compiler_deps $build_deps && \
 	apt-get -qy upgrade && \
-  echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main" >> /etc/apt/sources.list && \
-  echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main" >> /etc/apt/sources.list && \
-  wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
-	apt-get -q update && \
-	apt-get -qy --no-install-recommends install $compiler_deps && \
-	apt-get -qy --no-install-recommends install $build_deps && \
 	rm -fr /luajit-src || true && \
 	rm -fr /luajit-build || true && \
 	git clone -b v2.1 https://luajit.org/git/luajit-2.0.git /luajit-src && \

diff --git a/ubuntu-jammy/Dockerfile b/ubuntu-jammy/Dockerfile
@@ -11,14 +11,8 @@ SHELL ["/bin/bash", "-c"]
 
 RUN set -x; \
 	apt-get -q update && \
-	apt-get -qy --no-install-recommends install $pre_deps && \
-  echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" >> /etc/apt/sources.list && \
-  echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" >> /etc/apt/sources.list && \
-  wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
-	apt-get -q update && \
+	apt-get -qy --no-install-recommends install $pre_deps $compiler_deps $build_deps && \
 	apt-get -qy upgrade && \
-	apt-get -qy --no-install-recommends install $compiler_deps && \
-	apt-get -qy --no-install-recommends install $build_deps && \
 	rm -fr /luajit-src || true && \
 	rm -fr /luajit-build || true && \
 	git clone -b v2.1 https://luajit.org/git/luajit-2.0.git /luajit-src && \

diff --git a/ubuntu-noble/Dockerfile b/ubuntu-noble/Dockerfile
@@ -11,14 +11,8 @@ SHELL ["/bin/bash", "-c"]
 
 RUN set -x; \
 	apt-get -q update && \
-	apt-get -qy --no-install-recommends install $pre_deps && \
-  echo "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-16 main" >> /etc/apt/sources.list && \
-  echo "deb-src http://apt.llvm.org/noble/ llvm-toolchain-noble-16 main" >> /etc/apt/sources.list && \
-  wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
-	apt-get -q update && \
+	apt-get -qy --no-install-recommends install $pre_deps $compiler_deps $build_deps && \
 	apt-get -qy upgrade && \
-	apt-get -qy --no-install-recommends install $compiler_deps && \
-	apt-get -qy --no-install-recommends install $build_deps && \
 	rm -fr /luajit-src || true && \
 	rm -fr /luajit-build || true && \
 	git clone -b v2.1 https://luajit.org/git/luajit-2.0.git /luajit-src && \