github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 19:54:38 +00:00
Code Issues Projects Releases Wiki Activity

pkg: Fix docker-ce package

Browse Source 
As of commit b2439251dd ("blueprints: update docker-for-mac.yml
to latest vpnkit packages") the docker-ce package does not need
the vpnkit-expose-port binary anymore. It was also removed from
the linuxkit/vpnkit-forwarder forwarder package with commit
f48a2bfe12 ("pkg: update vpnkit-forwarder") causing the docker-ce
package build to fail.

This commit fixes this by removing the linuxkit/vpnkit-forwarder
package from the docker-ce package build.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-07-01 12:11:03 +01:00
parent 4a9c00a5e0
commit a148a8aa45
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/docker-ce/Dockerfile
View File

@ -17,10 +17,8 @@ RUN apk add --no-cache --initdb -p /out \
xz xz
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
FROM linuxkit/vpnkit-forwarder:e2776b82ddfe82ed7f90e55d7a2b424e62e9a279 AS vpnkit
FROM scratch FROM scratch
COPY --from=mirror /out/ / COPY --from=mirror /out/ /
COPY --from=vpnkit /vpnkit-expose-port /usr/bin/vpnkit-expose-port
# set up Docker group # set up Docker group
# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box # set up subuid/subgid so that "--userns-remap=default" works out-of-the-box