From fba8a986b9e220a0ee1e55f32514e9fe61b016b7 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 14 Apr 2016 19:00:30 +0100 Subject: [PATCH] alpine: create source tarballs for hvtools and llmnrd Add them to the initrd under /usr/share/src Signed-off-by: Rolf Neugebauer --- alpine/Dockerfile | 2 ++ alpine/packages/hvtools/.gitignore | 7 ++++--- alpine/packages/hvtools/Dockerfile | 3 ++- alpine/packages/hvtools/Makefile | 1 + alpine/packages/llmnrd/.gitignore | 1 + alpine/packages/llmnrd/Dockerfile | 3 ++- alpine/packages/llmnrd/Makefile | 5 +++-- 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index f44c21055..f7e8e1900 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -35,6 +35,7 @@ COPY packages/mdnstool/mdnstool /sbin/ COPY packages/mdnstool/etc /etc/ COPY packages/llmnrd/llmnrd /sbin/ COPY packages/llmnrd/etc /etc/ +COPY packages/llmnrd/llmnrd.tar.gz /usr/share/src/ COPY packages/docker/bin/* /usr/bin/ COPY packages/docker/etc /etc/ COPY packages/diagnostics/diagnostics /usr/bin/ @@ -54,6 +55,7 @@ COPY packages/hvtools/etc /etc/ COPY packages/hvtools/hv_get_dhcp_info /sbin/ COPY packages/hvtools/hv_get_dns_info /sbin/ COPY packages/hvtools/hv_set_ifconfig /sbin/ +COPY packages/hvtools/hvtools.tar.gz /usr/share/src/ COPY packages/chronyd/etc /etc/ COPY packages/userns/etc /etc/ COPY packages/userns/groupadd /usr/sbin diff --git a/alpine/packages/hvtools/.gitignore b/alpine/packages/hvtools/.gitignore index 88b05e35a..c69db8318 100644 --- a/alpine/packages/hvtools/.gitignore +++ b/alpine/packages/hvtools/.gitignore @@ -1,3 +1,4 @@ -hv_fcopy_daemon -hv_kvp_daemon -hv_vss_daemon +/hv_fcopy_daemon +/hv_kvp_daemon +/hv_vss_daemon +/hvtools.tar.gz diff --git a/alpine/packages/hvtools/Dockerfile b/alpine/packages/hvtools/Dockerfile index 2299cc8c0..08c4c2793 100644 --- a/alpine/packages/hvtools/Dockerfile +++ b/alpine/packages/hvtools/Dockerfile @@ -3,8 +3,9 @@ FROM alpine:3.3 RUN apk update && apk upgrade && apk add build-base linux-headers RUN mkdir -p /hvtools -WORKDIR /hvtools COPY src /hvtools/ +RUN tar czvf /hvtools.tar.gz hvtools +WORKDIR /hvtools RUN make diff --git a/alpine/packages/hvtools/Makefile b/alpine/packages/hvtools/Makefile index cb7fb1c4d..aab255b5b 100644 --- a/alpine/packages/hvtools/Makefile +++ b/alpine/packages/hvtools/Makefile @@ -2,6 +2,7 @@ all: hvtools hvtools: Dockerfile src/* docker build -t hvtools:build . + docker run --rm hvtools:build cat /hvtools.tar.gz > hvtools.tar.gz docker run --rm hvtools:build cat /hvtools/hv_fcopy_daemon > hv_fcopy_daemon docker run --rm hvtools:build cat /hvtools/hv_kvp_daemon > hv_kvp_daemon docker run --rm hvtools:build cat /hvtools/hv_vss_daemon > hv_vss_daemon diff --git a/alpine/packages/llmnrd/.gitignore b/alpine/packages/llmnrd/.gitignore index 2cf76fbd9..b115d4acd 100644 --- a/alpine/packages/llmnrd/.gitignore +++ b/alpine/packages/llmnrd/.gitignore @@ -1 +1,2 @@ /llmnrd +/llmnrd.tar.gz diff --git a/alpine/packages/llmnrd/Dockerfile b/alpine/packages/llmnrd/Dockerfile index c1852b9b6..ecb1f4f25 100644 --- a/alpine/packages/llmnrd/Dockerfile +++ b/alpine/packages/llmnrd/Dockerfile @@ -3,8 +3,9 @@ FROM alpine:3.3 RUN apk update && apk upgrade && apk add alpine-sdk linux-headers RUN mkdir -p /llmnrd -WORKDIR /llmnrd COPY src /llmnrd/ +RUN tar czvf /llmnrd.tar.gz llmnrd +WORKDIR /llmnrd RUN make diff --git a/alpine/packages/llmnrd/Makefile b/alpine/packages/llmnrd/Makefile index 0d27f44f5..a1042a252 100644 --- a/alpine/packages/llmnrd/Makefile +++ b/alpine/packages/llmnrd/Makefile @@ -2,9 +2,10 @@ all: llmnrd llmnrd: Dockerfile src/* docker build -t llmnrd:build . - docker run llmnrd:build cat /llmnrd/llmnrd > llmnrd + docker run --rm llmnrd:build cat /llmnrd.tar.gz > llmnrd.tar.gz + docker run --rm llmnrd:build cat /llmnrd/llmnrd > llmnrd chmod 755 llmnrd clean: - rm -f llmnrd + rm -f llmnrd llmnrd.tar.gz docker images -q llmnrd:build | xargs docker rmi -f