Skip to content

Commit 1e2c3ab

Browse files
committed
docker/debian: Remove LLVM
this was added for testing purposes, and for mobile before it was switched to using the hermetic toolchain Signed-off-by: Ryan Northey <ryan@synca.io>
1 parent 4e642a1 commit 1e2c3ab

File tree

5 files changed

+1
-56
lines changed

5 files changed

+1
-56
lines changed

.github/config.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,6 @@ debian:
7979
- amd64
8080
- arm64
8181
artifact-pattern: oci-debian-{arch}/debian-test-{sha}-{arch}.tar
82-
# llvm
83-
- name: envoy-build
84-
tag: llvm-{sha}
85-
registry: docker.io/envoyproxy
86-
architectures:
87-
- amd64
88-
artifact-pattern: oci-debian-{arch}/debian-llvm-{sha}-{arch}.tar
8982
# mobile
9083
- name: envoy-build
9184
tag: mobile-{sha}

docker/linux/debian/Dockerfile

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,6 @@ RUN --mount=type=tmpfs,target=/var/cache/apt \
7575
&& install_devel
7676

7777

78-
FROM devtools-base AS llvm-base
79-
ARG LLVM_VERSION=18.1.8 \
80-
LLVM_DISTRO=ubuntu-18.04
81-
RUN --mount=type=tmpfs,target=/var/cache/apt \
82-
--mount=type=tmpfs,target=/var/lib/apt/lists \
83-
--mount=type=bind,source=/common_fun.sh,target=/common_fun.sh \
84-
--mount=type=bind,source=/debian/fun.sh,target=/debian/fun.sh \
85-
. ./debian/fun.sh \
86-
&& install_llvm
87-
COPY debian/llvm-entrypoint.sh /entrypoint.sh
88-
89-
9078
FROM devtools-base AS test
9179
RUN --mount=type=tmpfs,target=/var/cache/apt \
9280
--mount=type=tmpfs,target=/var/lib/apt/lists \
@@ -145,13 +133,6 @@ RUN --mount=type=bind,source=/common_fun.sh,target=/common_fun.sh \
145133
. ./debian/fun.sh \
146134
&& stamp_build devtools "$CONTAINER_TAG"
147135

148-
FROM llvm-base AS llvm
149-
ARG CONTAINER_TAG
150-
RUN --mount=type=bind,source=/common_fun.sh,target=/common_fun.sh \
151-
--mount=type=bind,source=/debian/fun.sh,target=/debian/fun.sh \
152-
. ./debian/fun.sh \
153-
&& stamp_build llvm "$CONTAINER_TAG"
154-
155136
FROM mobile-base AS mobile
156137
ARG CONTAINER_TAG
157138
RUN --mount=type=bind,source=/common_fun.sh,target=/common_fun.sh \

docker/linux/debian/fun.sh

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -233,19 +233,6 @@ install_docker () {
233233
apt-get -qq upgrade -y
234234
}
235235

236-
install_llvm () {
237-
apt-get update -qq
238-
apt-get install --no-install-recommends -y -qq curl xz-utils
239-
mkdir /tmp/llvm
240-
mkdir /opt/llvm
241-
cd /tmp/llvm
242-
curl -sL --output llvm.tar.xz "https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-${LLVM_DISTRO}.tar.xz"
243-
tar Jxf llvm.tar.xz --strip-components=1 -C /opt/llvm
244-
LLVM_HOST_TARGET="$(/opt/llvm/bin/llvm-config --host-target)"
245-
echo "/opt/llvm/lib/${LLVM_HOST_TARGET}" > /etc/ld.so.conf.d/llvm.conf
246-
rm -rf /tmp/llvm
247-
}
248-
249236
create_user () {
250237
groupadd -g "$GROUP_ID" "$USER_NAME"
251238
useradd \

docker/linux/debian/llvm-entrypoint.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

docker/linux/debian_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -o pipefail
44

55
# Debian-specific build configuration
6-
DEBIAN_DOCKER_VARIANTS=("worker" "ci" "gcc" "devtools" "docker" "llvm" "mobile" "test")
6+
DEBIAN_DOCKER_VARIANTS=("worker" "ci" "gcc" "devtools" "docker" "mobile" "test")
77
IMAGE_TAGS=${IMAGE_TAGS:-}
88
OS_DISTRO="debian"
99

0 commit comments

Comments
 (0)