From d52c2b8a449727dd3b6c7a56f844b86c785111e8 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 23 Aug 2016 22:04:33 +0100 Subject: [PATCH 1/2] use build-base not alpine-sdk, it is smaller Signed-off-by: Justin Cormack --- alpine/packages/9pmount-vsock/Dockerfile | 2 +- alpine/packages/tap-vsockd/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine/packages/9pmount-vsock/Dockerfile b/alpine/packages/9pmount-vsock/Dockerfile index f7208cbba..5e7cdb5fb 100644 --- a/alpine/packages/9pmount-vsock/Dockerfile +++ b/alpine/packages/9pmount-vsock/Dockerfile @@ -1,6 +1,6 @@ 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 WORKDIR /9pmount-vsock diff --git a/alpine/packages/tap-vsockd/Dockerfile b/alpine/packages/tap-vsockd/Dockerfile index f9a1114c5..fc588e8a5 100644 --- a/alpine/packages/tap-vsockd/Dockerfile +++ b/alpine/packages/tap-vsockd/Dockerfile @@ -1,6 +1,6 @@ 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 WORKDIR /tap-vsockd From e03695bfa4e7b8af758646986b9f945413d6a21d Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 23 Aug 2016 22:14:03 +0100 Subject: [PATCH 2/2] switch to mobylinux hub org Signed-off-by: Justin Cormack --- alpine/Dockerfile | 2 +- alpine/base/Makefile | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 7104861ba..53c86092a 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM justincormack/moby-alpine-base:c31ad889c44f78974e8e04a5d489be3a07e77536 +FROM mobylinux/alpine-base:c31ad889c44f78974e8e04a5d489be3a07e77536 ENV ARCH=x86_64 diff --git a/alpine/base/Makefile b/alpine/base/Makefile index 90c4ea606..2933bb17a 100644 --- a/alpine/base/Makefile +++ b/alpine/base/Makefile @@ -4,22 +4,22 @@ default: push hash: 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 - 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 - docker pull justincormack/moby-alpine-base:$(shell cat hash) || \ - (docker tag justincormack/moby-alpine-base:build justincormack/moby-alpine-base:latest && \ - docker tag justincormack/moby-alpine-base:build justincormack/moby-alpine-base:$(shell cat hash) && \ - docker push justincormack/moby-alpine-base:$(shell cat hash) && \ - docker push justincormack/moby-alpine-base:latest) + docker pull mobylinux/alpine-base:$(shell cat hash) || \ + (docker tag mobylinux/alpine-base:build mobylinux/alpine-base:latest && \ + docker tag mobylinux/alpine-base:build mobylinux/alpine-base:$(shell cat hash) && \ + docker push mobylinux/alpine-base:$(shell cat hash) && \ + docker push mobylinux/alpine-base:latest) rm -f hash tag: hash - docker pull justincormack/moby-alpine-base:$(shell cat hash) || \ - (docker tag justincormack/moby-alpine-base:build justincormack/moby-alpine-base:latest && \ - docker tag justincormack/moby-alpine-base:build justincormack/moby-alpine-base:$(shell cat hash)) + docker pull mobylinux/alpine-base:$(shell cat hash) || \ + (docker tag mobylinux/alpine-base:build mobylinux/alpine-base:latest && \ + docker tag mobylinux/alpine-base:build mobylinux/alpine-base:$(shell cat hash)) rm -f hash clean: