Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 0 additions & 17 deletions .github/docker/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
ARG BASE=alpine:latest
FROM ${BASE}

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

RUN apk add --no-cache \
bash \
build-base \
Expand All @@ -17,8 +14,6 @@ RUN apk add --no-cache \
icu \
linux-headers \
lsb-release-minimal \
llvm \
mitmproxy \
moreutils \
nodejs \
npm \
Expand All @@ -28,24 +23,12 @@ RUN apk add --no-cache \
python3 \
python3-dev \
py3-pip \
rustup \
sudo \
tar \
tree \
wget \
zstd

# 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 && \
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

RUN curl -sSL --retry 5 https://dot.net/v1/dotnet-install.sh | bash -eo pipefail /dev/stdin --channel 10.0 --install-dir /usr/share/dotnet
RUN ln -s /usr/share/dotnet/dotnet /usr/local/bin/dotnet

Expand Down
1 change: 0 additions & 1 deletion .github/docker/alpine/requirements.txt

This file was deleted.

6 changes: 0 additions & 6 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:
- master
paths:
- '.github/docker/**'
- 'tests/requirements.txt'
workflow_dispatch:

jobs:
Expand All @@ -29,11 +28,6 @@ jobs:
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # pin@v7.0.1

- name: Copy test requirements
run: |
git update-index --assume-unchanged .github/docker/alpine/requirements.txt
cp tests/requirements.txt .github/docker/alpine/requirements.txt

- uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # pin@v4.6.0
with:
registry: ghcr.io
Expand Down
Loading