diff --git a/Dockerfile.buildtests b/Dockerfile.buildtests index 3a55c1c..3e5b7d3 100644 --- a/Dockerfile.buildtests +++ b/Dockerfile.buildtests @@ -1,11 +1,11 @@ -FROM alpine:3.8 AS buildtest-alpine38-static -RUN apk add --no-cache git build-base autoconf automake libtool linux-headers glib-dev glib-static +FROM alpine:3.10 AS buildtest-alpine310-static +RUN apk add --no-cache git build-base autoconf automake libtool linux-headers glib-dev glib-static libcap-static libcap-dev COPY . /src WORKDIR /src RUN ./autogen.sh && ./configure LDFLAGS="-static" && make && cp -f slirp4netns / FROM ubuntu:18.04 AS buildtest-ubuntu1804-common -RUN apt update && apt install -y automake autotools-dev make gcc libglib2.0-dev +RUN apt update && apt install -y automake autotools-dev make gcc libglib2.0-dev libcap-dev COPY . /src WORKDIR /src RUN ./autogen.sh @@ -17,6 +17,6 @@ FROM buildtest-ubuntu1804-common AS buildtest-ubuntu1804-static RUN ./configure LDFLAGS="-static" && make && cp -f slirp4netns / FROM scratch AS buildtest-final-stage -COPY --from=buildtest-alpine38-static /slirp4netns /buildtest-alpine38-static +COPY --from=buildtest-alpine310-static /slirp4netns /buildtest-alpine310-static COPY --from=buildtest-ubuntu1804-dynamic /slirp4netns /buildtest-ubuntu1804-dynamic COPY --from=buildtest-ubuntu1804-static /slirp4netns /buildtest-ubuntu1804-static diff --git a/Dockerfile.tests b/Dockerfile.tests index 618c852..ad04194 100644 --- a/Dockerfile.tests +++ b/Dockerfile.tests @@ -1,5 +1,5 @@ FROM ubuntu:18.04 AS build -RUN apt update && apt install -y automake autotools-dev make gcc libglib2.0-dev +RUN apt update && apt install -y automake autotools-dev make gcc libglib2.0-dev libcap-dev COPY . /slirp4netns WORKDIR /slirp4netns RUN chown -R 1000:1000 /slirp4netns