github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-05-11 06:12:05 +00:00
Code Issues Projects Releases Wiki Activity

Update to docker 1.12-dev plus proxy patches, close to what will be rc1

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack
2016-06-14 14:13:36 +01:00
parent 9d3483736e
commit dd5fe0455b
6 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
alpine/packages/proxy/.gitignore vendored
View File

@@ -1,2 +1,2 @@
/proxy
/vendor
/slirp-proxy
/vendor

6
alpine/packages/proxy/Makefile
View File

@@ -7,9 +7,9 @@ vendor:
proxy: Dockerfile main.go proxy.go vendor
docker build --build-arg GOOS=$(OS) --build-arg GOARCH=$(ARCH) -t proxy:build .
docker run --rm proxy:build cat /go/bin/proxy > proxy
chmod 755 proxy
docker run --rm proxy:build cat /go/bin/proxy > slirp-proxy
chmod 755 slirp-proxy
clean:
rm -rf proxy vendor
rm -rf slirp-proxy vendor
docker images -q proxy:build | xargs docker rmi -f || true