xZero707/dockerfiles
1
0
Fork 0
mirror of https://github.com/jessfraz/dockerfiles.git synced 2024-11-23 11:31:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix wireguard build, change to sid-slim (#516)

Browse Source
This commit is contained in:
ps 2020-05-15 07:47:39 +02:00 committed by GitHub
parent bc03c7e52e
commit 2e08384858
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
wireguard/install/Dockerfile
View File

@ -8,29 +8,34 @@
# -v /usr/src:/usr/src:ro \ # -v /usr/src:/usr/src:ro \
# r.j3ss.co/wireguard:install # r.j3ss.co/wireguard:install
# #
FROM alpine:latest FROM debian:sid-slim
LABEL maintainer "Jessie Frazelle <jess@linux.com>" LABEL maintainer "Jessie Frazelle <jess@linux.com>"
RUN apk add --no-cache \ RUN apt update && apt -y install \
build-base \ build-essential \
ca-certificates \ ca-certificates \
elfutils-libelf \ git \
libmnl-dev kmod \
libelf-dev \
libmnl-dev \
pkg-config \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*
# https://git.zx2c4.com/WireGuard/refs/ # https://git.zx2c4.com/wireguard-linux-compat/
ENV WIREGUARD_VERSION 0.0.20191205 ENV WIREGUARD_VERSION v0.0.20200128
# https://git.zx2c4.com/wireguard-tools
ENV WIREGUARD_TOOLS_VERSION v1.0.20200121
RUN set -x \ RUN set -x \
&& apk add --no-cache --virtual .build-deps \ && git clone --depth 1 --branch "${WIREGUARD_VERSION}" https://git.zx2c4.com/wireguard-linux-compat.git /wireguard \
git \ && git clone --depth 1 --branch "${WIREGUARD_TOOLS_VERSION}" https://git.zx2c4.com/wireguard-tools.git /wireguard-tools \
&& git clone --depth 1 --branch "${WIREGUARD_VERSION}" https://git.zx2c4.com/WireGuard.git /wireguard \
&& ( \ && ( \
cd /wireguard/src \ cd /wireguard-tools/src \
&& make tools \ && make -j$(nproc) \
&& make -C tools install \ && make install \
&& make -C tools clean \ && make clean \
) \ )
&& apk del .build-deps
COPY entrypoint.sh /usr/local/bin/entrypoint.sh COPY entrypoint.sh /usr/local/bin/entrypoint.sh

8
wireguard/tools/Dockerfile
View File

@ -1,10 +1,12 @@
FROM alpine:latest FROM debian:sid-slim
LABEL maintainer "Jessie Frazelle <jess@linux.com>" LABEL maintainer "Jessie Frazelle <jess@linux.com>"
RUN apk add --no-cache \ RUN apt update && apt -y install \
ca-certificates \ ca-certificates \
libmnl libmnl-dev \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*
COPY --from=r.j3ss.co/wireguard:install /usr/bin/wg /usr/bin/wg COPY --from=r.j3ss.co/wireguard:install /usr/bin/wg /usr/bin/wg
COPY --from=r.j3ss.co/wireguard:install /usr/share/man/man8/wg.8 /usr/share/man/man8/wg.8 COPY --from=r.j3ss.co/wireguard:install /usr/share/man/man8/wg.8 /usr/share/man/man8/wg.8