diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index a7bd0fc..c6da278 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - libslirp_commit: [master, v4.7.0, v4.6.1, v4.1.0] + libslirp_commit: [master, v4.8.0, v4.7.0, v4.1.0] steps: - uses: actions/checkout@v2 - run: docker build -t slirp4netns-tests --build-arg LIBSLIRP_COMMIT -f Dockerfile.tests . diff --git a/Dockerfile.artifact b/Dockerfile.artifact index 6091c75..fe351a0 100644 --- a/Dockerfile.artifact +++ b/Dockerfile.artifact @@ -5,7 +5,7 @@ # --platform=amd64,arm64,arm,s390x,ppc64le,riscv64 \ # -f Dockerfile.artifact . -ARG LIBSLIRP_COMMIT=v4.7.0 +ARG LIBSLIRP_COMMIT=v4.8.0 ARG UBUNTU_VERSION=jammy-20240125 ARG XX_VERSION=1.2.1@sha256:8879a398dedf0aadaacfbd332b29ff2f84bc39ae6d4e9c0a1109db27ac5ba012 ARG REPRO_SOURCES_LIST_VERSION=v0.1.0 @@ -26,7 +26,7 @@ RUN \ apt-get install -y apt-utils automake autotools-dev file make git ninja-build meson # Set SOURCE_DATE_EPOCH after running repro-sources-list.sh, for cache efficiency ARG SOURCE_DATE_EPOCH -RUN git clone https://git.qemu.org/libslirp.git /libslirp +RUN git clone https://gitlab.freedesktop.org/slirp/libslirp.git /libslirp WORKDIR /libslirp ARG LIBSLIRP_COMMIT RUN git pull && git checkout ${LIBSLIRP_COMMIT} diff --git a/Dockerfile.buildtests b/Dockerfile.buildtests index badf6e6..23e8f3f 100644 --- a/Dockerfile.buildtests +++ b/Dockerfile.buildtests @@ -1,9 +1,9 @@ -ARG LIBSLIRP_COMMIT=v4.7.0 +ARG LIBSLIRP_COMMIT=v4.8.0 # Alpine FROM alpine:3 AS buildtest-alpine3-static RUN apk add --no-cache git build-base autoconf automake libtool linux-headers glib-dev glib-static libcap-static libcap-dev libseccomp-dev libseccomp-static git meson -RUN git clone https://git.qemu.org/libslirp.git /libslirp +RUN git clone https://gitlab.freedesktop.org/slirp/libslirp.git /libslirp WORKDIR /libslirp ARG LIBSLIRP_COMMIT RUN git pull && git checkout ${LIBSLIRP_COMMIT} && meson setup --default-library=both build && ninja -C build install @@ -16,7 +16,7 @@ FROM ubuntu:18.04 AS buildtest-ubuntu1804-common ENV DEBIAN_FRONTEND=noninteractive RUN apt update && apt install -y automake autotools-dev make gcc libglib2.0-dev libcap-dev libseccomp-dev git ninja-build python3-pip RUN pip3 install meson -RUN git clone https://git.qemu.org/libslirp.git /libslirp +RUN git clone https://gitlab.freedesktop.org/slirp/libslirp.git /libslirp WORKDIR /libslirp ARG LIBSLIRP_COMMIT RUN git pull && git checkout ${LIBSLIRP_COMMIT} && meson setup build && ninja -C build install @@ -33,7 +33,7 @@ RUN ./configure && make && cp -f slirp4netns / FROM opensuse/leap:15 AS buildtest-opensuse15-common RUN zypper install -y --no-recommends autoconf automake gcc glib2-devel git make libcap-devel libseccomp-devel ninja python3-pip RUN pip3 install meson -RUN git clone https://git.qemu.org/libslirp.git /libslirp +RUN git clone https://gitlab.freedesktop.org/slirp/libslirp.git /libslirp WORKDIR /libslirp ARG LIBSLIRP_COMMIT RUN git pull && git checkout ${LIBSLIRP_COMMIT} && meson setup --default-library=both build && ninja -C build install diff --git a/Dockerfile.tests b/Dockerfile.tests index e12d3b9..728c284 100644 --- a/Dockerfile.tests +++ b/Dockerfile.tests @@ -1,10 +1,10 @@ -ARG LIBSLIRP_COMMIT=v4.7.0 +ARG LIBSLIRP_COMMIT=v4.8.0 FROM ubuntu:22.04 AS build ENV DEBIAN_FRONTEND=noninteractive RUN apt update && apt install -y automake autotools-dev make gcc libglib2.0-dev libcap-dev libseccomp-dev git ninja-build python3-pip RUN pip3 install meson -RUN git clone https://git.qemu.org/libslirp.git /libslirp +RUN git clone https://gitlab.freedesktop.org/slirp/libslirp.git /libslirp WORKDIR /libslirp ARG LIBSLIRP_COMMIT RUN git pull && git checkout ${LIBSLIRP_COMMIT} && meson setup build && ninja -C build install