Skip to content

ci: fix, update, and clean up alpine docker image #1941

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

Open
jpnurmi wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −21
Open

ci: fix, update, and clean up alpine docker image #1941

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
28 changes: 12 additions & 16 deletions .github/docker/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# docker build --build-arg BASE=alpine:3.21
# docker build --build-arg BASE=alpine:3.24
ARG BASE=alpine:latest
FROM ${BASE}

ARG PIP_INSTALL=
ARG BPF_LINKER_VERSION=v0.10.4
COPY requirements.txt /tmp/requirements.txt

RUN apk add --no-cache \
Expand Down Expand Up @@ -32,21 +32,17 @@ RUN apk add --no-cache \
sudo \
tar \
tree \
wget
wget \
zstd

# 3.23+
RUN if awk -F. '{ exit !($1 > 3 || ($1 == 3 && $2 >= 23)) }' /etc/alpine-release; then \
(apk add --no-cache llvm22-libs || \
apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/main llvm22-libs) && \
cargo install --locked --git https://github.com/aya-rs/bpf-linker --root /usr/local bpf-linker && \
RUSTUP_INIT_SKIP_PATH_CHECK=yes rustup-init -y --profile minimal --default-toolchain none && \
. /root/.cargo/env && \
rustup toolchain install nightly --profile minimal --component rust-src && \
ln -s /root/.cargo/bin/rustup /usr/local/bin/rustup && \
if [ -n "${PIP_INSTALL}" ]; then \
python3 -m pip install --break-system-packages --upgrade --constraint /tmp/requirements.txt ${PIP_INSTALL}; \
fi; \
fi
# mitmproxy-linux builds eBPF code for bpfel-unknown-none and needs bpf-linker plus nightly rust-src.
RUN curl -sSL --retry 5 "https://github.com/aya-rs/bpf-linker/releases/download/${BPF_LINKER_VERSION}/bpf-linker-$(uname -m)-unknown-linux-musl.tar.zst" | \
tar --zstd -xpf - -C /usr/local/bin && \
Comment thread
jpnurmi marked this conversation as resolved.
RUSTUP_INIT_SKIP_PATH_CHECK=yes rustup-init -y --profile minimal --default-toolchain none && \
. /root/.cargo/env && \
rustup toolchain install nightly --profile minimal --component rust-src && \
ln -s /root/.cargo/bin/rustup /usr/local/bin/rustup && \
python3 -m pip install --break-system-packages --upgrade --constraint /tmp/requirements.txt mitmproxy
ENV CARGO_HOME=/root/.cargo
ENV RUSTUP_HOME=/root/.rustup

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,14 @@ jobs:
RUN_ANALYZER: code-checker,valgrind
- name: Linux (GCC + musl + libunwind)
os: ubuntu-latest
container: ghcr.io/getsentry/sentry-native-alpine:3.23
container: ghcr.io/getsentry/sentry-native-alpine:3.24
CC: gcc
CXX: g++
SYSTEM_PYTHON: 1
CMAKE_DEFINES: -DSENTRY_LIBUNWIND_SYSTEM=ON
- name: Linux (clang + musl + libunwind)
os: ubuntu-latest
container: ghcr.io/getsentry/sentry-native-alpine:3.23
container: ghcr.io/getsentry/sentry-native-alpine:3.24
CC: clang
CXX: clang++
SYSTEM_PYTHON: 1
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ jobs:
fail-fast: false
matrix:
version:
- '3.21'
- '3.23'
- '3.24'

permissions:
contents: read
Expand Down Expand Up @@ -53,4 +52,3 @@ jobs:
context: .github/docker/alpine
build-args: |
BASE=alpine:${{ matrix.version }}
PIP_INSTALL=${{ matrix.version == '3.23' && 'mitmproxy' || '' }}
Loading