Skip to content

Commit

Permalink
tests: install libcap-dev
Browse files Browse the repository at this point in the history
Signed-off-by: Giuseppe Scrivano <[email protected]>
  • Loading branch information
giuseppe committed Jul 26, 2019
1 parent 10c0ee5 commit 56404f7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Dockerfile.buildtests
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion Dockerfile.tests
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 56404f7

Please sign in to comment.