Retire cxx-common Docker build path

The root Dockerfile built remill via scripts/build.sh against cxx-common
v0.6.0, which pins Intel XED v2022.04.17. lib/Arch/X86/Arch.cpp now
references AVX-512 ISA-set enums that only exist in newer XED, so that
build path fails to compile (issue #780). cxx-common is no longer
supported.

Remove the cxx-common Dockerfile and rename Dockerfile.llvm to Dockerfile
so the only Docker build uses the dependencies/ superbuild, matching
build.yml and the README (XED v2025.06.08). Delete the now-unused
scripts/build.sh and scripts/travis.bat, and point docker-publish.yml at
the renamed Dockerfile.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: 2 people

.github/workflows/docker-publish.yml

@@ -57,7 +57,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./Dockerfile.llvm
+          file: ./Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -73,7 +73,7 @@ jobs:
           docker build \
             --build-arg LLVM_VERSION=${{ matrix.llvm }} \
             --build-arg UBUNTU_VERSION=24.04 \
-            -f Dockerfile.llvm \
+            -f Dockerfile \
             -t test-image .
           docker run --rm test-image --version
           docker run --rm test-image --arch amd64 --ir_out /dev/stdout --bytes c704ba01000000

Dockerfile

@@ -1,56 +1,110 @@
-# Choose your LLVM version
-ARG LLVM_VERSION=17
-ARG UBUNTU_VERSION=24.04
-ARG DISTRO_BASE=ubuntu${UBUNTU_VERSION}
-ARG BUILD_BASE=ubuntu:${UBUNTU_VERSION}
-ARG LIBRARIES=/opt/trailofbits
+# Dockerfile for building remill with specific LLVM versions from apt.llvm.org
+# This approach supports newer LLVM versions (19, 22, etc.)
 
+ARG LLVM_VERSION=22
+ARG UBUNTU_VERSION=24.04
 
-# Run-time dependencies go here
-FROM ${BUILD_BASE} as base
+FROM ubuntu:${UBUNTU_VERSION} AS builder
 
-# Build-time dependencies go here
-# See here for full list of those dependencies
-# https://github.com/lifting-bits/cxx-common/blob/master/docker/Dockerfile.ubuntu.vcpkg
-FROM ghcr.io/lifting-bits/cxx-common/vcpkg-builder-ubuntu-v2:${UBUNTU_VERSION} as deps
-ARG UBUNTU_VERSION
 ARG LLVM_VERSION
-ARG LIBRARIES
+ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && \
-    apt-get install -qqy python3 python3-pip libc6-dev wget liblzma-dev zlib1g-dev curl git build-essential ninja-build libselinux1-dev libbsd-dev ccache pixz xz-utils make rpm && \
-    if [ "$(uname -m)" = "x86_64" ]; then dpkg --add-architecture i386 && apt-get update && apt-get install -qqy gcc-multilib g++-multilib zip zlib1g-dev:i386; fi && \
-    rm -rf /var/lib/apt/lists/*
+# Install build dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    lsb-release \
+    wget \
+    software-properties-common \
+    gnupg \
+    cmake \
+    ninja-build \
+    python-is-python3 \
+    python3-pip \
+    python3-setuptools \
+    python3-venv \
+    git \
+    ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
 
-# Source code build
-FROM deps as build
-ARG LLVM_VERSION
+# Install LLVM from apt.llvm.org
+RUN wget https://apt.llvm.org/llvm.sh && \
+    chmod +x llvm.sh && \
+    ./llvm.sh ${LLVM_VERSION} && \
+    apt-get install -y --no-install-recommends llvm-${LLVM_VERSION}-dev && \
+    rm -rf /var/lib/apt/lists/* llvm.sh
+
+# Set environment variables for build
+ENV LLVM_VERSION=${LLVM_VERSION}
+ENV CC=clang-${LLVM_VERSION}
+ENV CXX=clang++-${LLVM_VERSION}
 
 WORKDIR /remill
-COPY ./ ./
 
-RUN git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" && git config --global user.name "github-actions[bot]"
+# Copy source code
+COPY . .
+
+# Configure git (needed for version detection)
+RUN git config --global user.email "docker@remill.local" && \
+    git config --global user.name "Docker Build" && \
+    git config --global --add safe.directory /remill
+
+# Get LLVM prefix
+RUN echo "LLVM_PREFIX=$(llvm-config-${LLVM_VERSION} --prefix)" > /tmp/llvm_env
+
+# Build dependencies (XED, etc.)
+RUN . /tmp/llvm_env && \
+    cmake -G Ninja -S dependencies -B dependencies/build \
+        -DUSE_EXTERNAL_LLVM=ON \
+        "-DCMAKE_PREFIX_PATH=${LLVM_PREFIX}" && \
+    cmake --build dependencies/build
 
-RUN ./scripts/build.sh \
-    --llvm-version ${LLVM_VERSION} \
-    --prefix /opt/trailofbits \
-    --extra-cmake-args "-DCMAKE_BUILD_TYPE=Release" \
-    --disable-package
+# Setup Python venv for tests
+RUN python3 -m venv /opt/venv && \
+    /opt/venv/bin/pip install --no-cache-dir scripts/diff_tester_export_insns
 
-RUN pip3 install ./scripts/diff_tester_export_insns
+# Build remill
+RUN . /tmp/llvm_env && \
+    . /opt/venv/bin/activate && \
+    cmake -G Ninja -B build \
+        "-DCMAKE_PREFIX_PATH=${LLVM_PREFIX};/remill/dependencies/install" \
+        "-DCMAKE_INSTALL_PREFIX=/opt/remill" \
+        -DCMAKE_BUILD_TYPE=Release && \
+    cmake --build build
 
-# NOTE: At time of writing, tests only pass on x86_64 architecture
-RUN cd remill-build && \
-    cmake --build . --target test_dependencies -- -j $(nproc) && \
-    CTEST_OUTPUT_ON_FAILURE=1 cmake --build . --verbose --target test -- -j $(nproc) || [ "$(uname -m)" != "x86_64" ] && \
-    cmake --build . --target install
+# Run tests
+RUN cmake --build build --target test_dependencies && \
+    env CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test
+
+# Install
+RUN cmake --install build
+
+# Runtime image
+FROM ubuntu:${UBUNTU_VERSION} AS runtime
 
-# Small installation image
-FROM base as install
 ARG LLVM_VERSION
+ARG DEBIAN_FRONTEND=noninteractive
+
+# Install runtime dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    wget \
+    gnupg \
+    lsb-release \
+    software-properties-common \
+    ca-certificates \
+    && wget https://apt.llvm.org/llvm.sh \
+    && chmod +x llvm.sh \
+    && ./llvm.sh ${LLVM_VERSION} \
+    && apt-get install -y --no-install-recommends llvm-${LLVM_VERSION} \
+    && rm -rf /var/lib/apt/lists/* llvm.sh
+
+# Copy remill installation
+COPY --from=builder /opt/remill /opt/remill
+
+# Set environment
+ENV LLVM_VERSION=${LLVM_VERSION}
+ENV PATH="/opt/remill/bin:${PATH}"
+
+# Create entrypoint script
+RUN echo '#!/bin/sh\nexec remill-lift-'${LLVM_VERSION}' "$@"' > /usr/local/bin/entrypoint.sh && \
+    chmod +x /usr/local/bin/entrypoint.sh
 
-COPY --from=build /opt/trailofbits /opt/trailofbits
-COPY scripts/docker-lifter-entrypoint.sh /opt/trailofbits
-ENV LLVM_VERSION=llvm${LLVM_VERSION} \
-    PATH=/opt/trailofbits/bin
-ENTRYPOINT ["/opt/trailofbits/docker-lifter-entrypoint.sh"]
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]