Skip to content

Commit

Permalink
Merge 'docker: update LLVM debian repo for Ubuntu Orcular migration' …
Browse files Browse the repository at this point in the history
…from Kefu Chai

When migrating from Ubuntu Matis to Orcular in afea41b, the LLVM debian package repository configuration wasn't updated accordingly. This caused Docker builds to fail.

This commit updates the repository configuration to match the new Ubuntu Orcular base image.

Fixes #2656

Closes #2658

* https://github.com/scylladb/seastar:
  github:  add Docker build verification workflow
  docker: update LLVM debian repo for Ubuntu Orcular migration
  • Loading branch information
xemul committed Feb 26, 2025
2 parents fb4a7b6 + 8d2bd15 commit 1a53503
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 2 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Verify Dockerfile Build

on:
pull_request:
paths:
- 'docker/dev/Dockerfile'
- 'install-dependencies.sh'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}

jobs:
build:
timeout-minutes: 20
runs-on: ubuntu-24.04
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
sparse-checkout: |
docker/dev/Dockerfile
install-dependencies.sh
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Build Docker image
uses: docker/build-push-action@v6
with:
context: .
file: docker/dev/Dockerfile
push: false
cache-from: type=gha
cache-to: type=gha,mode=max
4 changes: 2 additions & 2 deletions docker/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ RUN --mount=type=bind,source=./install-dependencies.sh,target=/install-dependenc
apt-get update && apt-get install -y \
curl \
gnupg \
&& echo "deb http://apt.llvm.org/mantic/ llvm-toolchain-oracular-18 main" \
&& echo "deb http://apt.llvm.org/oracular/ llvm-toolchain-oracular-18 main" \
>> /etc/apt/sources.list.d/llvm.list \
&& echo "deb http://apt.llvm.org/mantic/ llvm-toolchain-oracular-19 main" \
&& echo "deb http://apt.llvm.org/oracular/ llvm-toolchain-oracular-19 main" \
>> /etc/apt/sources.list.d/llvm.list \
&& curl -sSL https://apt.llvm.org/llvm-snapshot.gpg.key -o /etc/apt/trusted.gpg.d/apt.llvm.org.asc \
&& apt-get update && apt-get install -y \
Expand Down

0 comments on commit 1a53503

Please sign in to comment.