Skip to content

docker/debian: Remove LLVM #499

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

Merged
phlax merged 1 commit into from
Nov 25, 2025
Merged

docker/debian: Remove LLVM #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions .github/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,6 @@ debian:
- amd64
- arm64
artifact-pattern: oci-debian-{arch}/debian-test-{sha}-{arch}.tar
# llvm
- name: envoy-build
tag: llvm-{sha}
registry: docker.io/envoyproxy
architectures:
- amd64
artifact-pattern: oci-debian-{arch}/debian-llvm-{sha}-{arch}.tar
# mobile
- name: envoy-build
tag: mobile-{sha}
Expand Down
19 changes: 0 additions & 19 deletions docker/linux/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,6 @@ RUN --mount=type=tmpfs,target=/var/cache/apt \
&& install_devel


FROM devtools-base AS llvm-base
ARG LLVM_VERSION=18.1.8 \
LLVM_DISTRO=ubuntu-18.04
RUN --mount=type=tmpfs,target=/var/cache/apt \
--mount=type=tmpfs,target=/var/lib/apt/lists \
--mount=type=bind,source=/common_fun.sh,target=/common_fun.sh \
--mount=type=bind,source=/debian/fun.sh,target=/debian/fun.sh \
. ./debian/fun.sh \
&& install_llvm
COPY debian/llvm-entrypoint.sh /entrypoint.sh


FROM devtools-base AS test
RUN --mount=type=tmpfs,target=/var/cache/apt \
--mount=type=tmpfs,target=/var/lib/apt/lists \
Expand Down Expand Up @@ -145,13 +133,6 @@ RUN --mount=type=bind,source=/common_fun.sh,target=/common_fun.sh \
. ./debian/fun.sh \
&& stamp_build devtools "$CONTAINER_TAG"

FROM llvm-base AS llvm
ARG CONTAINER_TAG
RUN --mount=type=bind,source=/common_fun.sh,target=/common_fun.sh \
--mount=type=bind,source=/debian/fun.sh,target=/debian/fun.sh \
. ./debian/fun.sh \
&& stamp_build llvm "$CONTAINER_TAG"

FROM mobile-base AS mobile
ARG CONTAINER_TAG
RUN --mount=type=bind,source=/common_fun.sh,target=/common_fun.sh \
Expand Down
13 changes: 0 additions & 13 deletions docker/linux/debian/fun.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,19 +233,6 @@ install_docker () {
apt-get -qq upgrade -y
}

install_llvm () {
apt-get update -qq
apt-get install --no-install-recommends -y -qq curl xz-utils
mkdir /tmp/llvm
mkdir /opt/llvm
cd /tmp/llvm
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"
tar Jxf llvm.tar.xz --strip-components=1 -C /opt/llvm
LLVM_HOST_TARGET="$(/opt/llvm/bin/llvm-config --host-target)"
echo "/opt/llvm/lib/${LLVM_HOST_TARGET}" > /etc/ld.so.conf.d/llvm.conf
rm -rf /tmp/llvm
}

create_user () {
groupadd -g "$GROUP_ID" "$USER_NAME"
useradd \
Expand Down
16 changes: 0 additions & 16 deletions docker/linux/debian/llvm-entrypoint.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion docker/linux/debian_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -o pipefail

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

Expand Down