From e25ee0b142b0862ad9458040a930abe25ea58a1a Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 13 Feb 2017 16:16:49 +0000 Subject: [PATCH] alpine-build-c is only used for kernel builds so rename Also remove some unecessary packages. Signed-off-by: Justin Cormack --- .../Dockerfile | 16 +++------------- .../Makefile | 2 +- kernel/Dockerfile | 2 +- kernel/Dockerfile.4.4 | 2 +- kernel/Dockerfile.aufs | 2 +- 5 files changed, 7 insertions(+), 17 deletions(-) rename base/{alpine-build-c => alpine-build-kernel}/Dockerfile (63%) rename base/{alpine-build-c => alpine-build-kernel}/Makefile (96%) diff --git a/base/alpine-build-c/Dockerfile b/base/alpine-build-kernel/Dockerfile similarity index 63% rename from base/alpine-build-c/Dockerfile rename to base/alpine-build-kernel/Dockerfile index 704aa3334..f0c85c883 100644 --- a/base/alpine-build-c/Dockerfile +++ b/base/alpine-build-kernel/Dockerfile @@ -2,33 +2,23 @@ FROM alpine:3.5 RUN \ apk update && apk upgrade && \ apk add \ - alpine-sdk \ + build-base \ argp-standalone \ automake \ bash \ bc \ binutils-dev \ - bison \ - cmake \ curl \ - flex \ + git \ gmp-dev \ - gtk+2.0-dev \ - gtk+-dev \ - groff \ installkernel \ kmod \ libelf-dev \ linux-headers \ ncurses-dev \ - perl-dev \ - python-dev \ sed \ - slang-dev \ squashfs-tools \ syslinux \ - unzip \ - util-linux-dev \ - vim \ + tar \ xz \ && true diff --git a/base/alpine-build-c/Makefile b/base/alpine-build-kernel/Makefile similarity index 96% rename from base/alpine-build-c/Makefile rename to base/alpine-build-kernel/Makefile index 6d91c65e3..ea4ce5751 100644 --- a/base/alpine-build-c/Makefile +++ b/base/alpine-build-kernel/Makefile @@ -1,7 +1,7 @@ .PHONY: tag push BASE=alpine:3.5 -IMAGE=alpine-build-c +IMAGE=alpine-build-kernel default: push diff --git a/kernel/Dockerfile b/kernel/Dockerfile index ae25c0710..04103c692 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-c:b77cfc4ad0033d4366df830ed697afc7bab458a2@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c +FROM mobylinux/alpine-build-kernel:0e893fbf6fa7638d2f23354de03ea11017bb8065@sha256:3ef3f9d11f0802b759dbd9c43a7706cf0ec37263c99ae90e2b10c29ea85739fa ARG KERNEL_VERSION=4.9.9 diff --git a/kernel/Dockerfile.4.4 b/kernel/Dockerfile.4.4 index 38ec18a41..d60b1b750 100644 --- a/kernel/Dockerfile.4.4 +++ b/kernel/Dockerfile.4.4 @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-c:b77cfc4ad0033d4366df830ed697afc7bab458a2@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c +FROM mobylinux/alpine-build-kernel:0e893fbf6fa7638d2f23354de03ea11017bb8065@sha256:3ef3f9d11f0802b759dbd9c43a7706cf0ec37263c99ae90e2b10c29ea85739fa ARG KERNEL_VERSION=4.4.48 diff --git a/kernel/Dockerfile.aufs b/kernel/Dockerfile.aufs index 6838d3d1c..4389a1d10 100644 --- a/kernel/Dockerfile.aufs +++ b/kernel/Dockerfile.aufs @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-c:b77cfc4ad0033d4366df830ed697afc7bab458a2@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c +FROM mobylinux/alpine-build-kernel:0e893fbf6fa7638d2f23354de03ea11017bb8065@sha256:3ef3f9d11f0802b759dbd9c43a7706cf0ec37263c99ae90e2b10c29ea85739fa ARG KERNEL_VERSION=4.9.9