github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-08-06 09:13:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #442 from justincormack/buildfix

Browse Source 
Cleanup, move to mobylinux org
This commit is contained in:
Justin Cormack 2016-08-30 10:45:39 +01:00 committed by GitHub
commit d388b40d07
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM justincormack/moby-alpine-base:c31ad889c44f78974e8e04a5d489be3a07e77536 FROM mobylinux/alpine-base:c31ad889c44f78974e8e04a5d489be3a07e77536
ENV ARCH=x86_64 ENV ARCH=x86_64

20
alpine/base/Makefile
View File

@ -4,22 +4,22 @@ default: push
hash: hash:
docker pull alpine:3.4 docker pull alpine:3.4
tar cf - Dockerfile | docker build --no-cache -t justincormack/moby-alpine-base:build - tar cf - Dockerfile | docker build --no-cache -t mobylinux/alpine-base:build -
rm -f hash rm -f hash
docker run justincormack/moby-alpine-base:build sha1sum /lib/apk/db/installed | sed 's/ .*//' > hash docker run mobylinux/alpine-base:build sha1sum /lib/apk/db/installed | sed 's/ .*//' > hash
push: hash push: hash
docker pull justincormack/moby-alpine-base:$(shell cat hash) || \ docker pull mobylinux/alpine-base:$(shell cat hash) || \
(docker tag justincormack/moby-alpine-base:build justincormack/moby-alpine-base:latest && \ (docker tag mobylinux/alpine-base:build mobylinux/alpine-base:latest && \
docker tag justincormack/moby-alpine-base:build justincormack/moby-alpine-base:$(shell cat hash) && \ docker tag mobylinux/alpine-base:build mobylinux/alpine-base:$(shell cat hash) && \
docker push justincormack/moby-alpine-base:$(shell cat hash) && \ docker push mobylinux/alpine-base:$(shell cat hash) && \
docker push justincormack/moby-alpine-base:latest) docker push mobylinux/alpine-base:latest)
rm -f hash rm -f hash
tag: hash tag: hash
docker pull justincormack/moby-alpine-base:$(shell cat hash) || \ docker pull mobylinux/alpine-base:$(shell cat hash) || \
(docker tag justincormack/moby-alpine-base:build justincormack/moby-alpine-base:latest && \ (docker tag mobylinux/alpine-base:build mobylinux/alpine-base:latest && \
docker tag justincormack/moby-alpine-base:build justincormack/moby-alpine-base:$(shell cat hash)) docker tag mobylinux/alpine-base:build mobylinux/alpine-base:$(shell cat hash))
rm -f hash rm -f hash
clean: clean:

2
alpine/packages/9pmount-vsock/Dockerfile
View File

@ -1,6 +1,6 @@
FROM alpine:3.4 FROM alpine:3.4
RUN apk update && apk upgrade && apk add alpine-sdk util-linux-dev linux-headers RUN apk update && apk upgrade && apk add build-base util-linux-dev linux-headers
RUN mkdir -p /9pmount-vsock RUN mkdir -p /9pmount-vsock
WORKDIR /9pmount-vsock WORKDIR /9pmount-vsock

2
alpine/packages/tap-vsockd/Dockerfile
View File

@ -1,6 +1,6 @@
FROM alpine:3.4 FROM alpine:3.4
RUN apk update && apk upgrade && apk add alpine-sdk util-linux-dev linux-headers RUN apk update && apk upgrade && apk add build-base util-linux-dev linux-headers
RUN mkdir -p /tap-vsockd RUN mkdir -p /tap-vsockd
WORKDIR /tap-vsockd WORKDIR /tap-vsockd