From 19e704876fd46e33169c56f9785bf41f4fb542ca Mon Sep 17 00:00:00 2001 From: Rune Date: Fri, 5 Aug 2016 18:55:22 +0000 Subject: [PATCH] alpine-docker --- Makefile | 7 ++++--- alpine-docker.conf.mk | 7 +++++++ alpine-docker.packages | 10 ++++++++++ repositories | 3 +++ 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 alpine-docker.conf.mk create mode 100644 alpine-docker.packages create mode 100644 repositories diff --git a/Makefile b/Makefile index f88a6a9..545964e 100755 --- a/Makefile +++ b/Makefile @@ -25,7 +25,8 @@ ISO_PKGDIR := $(ISO_DIR)/apks/$(ALPINE_ARCH) APKS ?= $(shell sed 's/\#.*//; s/\*/\\*/g' $(PROFILE).packages) APK_KEYS ?= /etc/apk/keys -APK_OPTS := $(addprefix --repository ,$(APK_REPOS)) --keys-dir $(APK_KEYS) --repositories-file /etc/apk/repositories +#APK_OPTS := $(addprefix --repository ,$(APK_REPOS)) --keys-dir $(APK_KEYS) --repositories-file /etc/apk/repositories +APK_OPTS := $(addprefix --repository ,$(APK_REPOS)) --keys-dir $(APK_KEYS) --repositories-file $(shell pwd)/repositories APK_FETCH_STDOUT := apk fetch $(APK_OPTS) --stdout --quiet @@ -503,7 +504,7 @@ ifeq ($(ALPINE_ARCH),armhf) profiles ?= alpine-rpi alpine-uboot else ifeq ($(ALPINE_ARCH),x86_64) -profiles ?= alpine alpine-extended alpine-vanilla alpine-virt alpine-xen +profiles ?= alpine alpine-docker alpine-extended alpine-vanilla alpine-virt alpine-xen else profiles ?= alpine alpine-extended alpine-vanilla alpine-virt endif @@ -529,7 +530,7 @@ all-release: current $(addsuffix .conf.mk, $(profiles)) PROFILE=$$i release || break; \ done -edge desktop extended xen vanilla rpi uboot virt: current +edge desktop docker extended xen vanilla rpi uboot virt: current @fakeroot $(MAKE) ALPINE_RELEASE=$(current) PROFILE=alpine-$@ sha1 .PRECIOUS: $(MODLOOP_KERNELSTAMP) $(MODLOOP_DIRSTAMP) $(INITFS_DIRSTAMP) $(INITFS) $(ISO_KERNEL_STAMP) diff --git a/alpine-docker.conf.mk b/alpine-docker.conf.mk new file mode 100644 index 0000000..5599ebf --- /dev/null +++ b/alpine-docker.conf.mk @@ -0,0 +1,7 @@ +ALPINE_NAME := alpine-docker +MODLOOP_EXTRA := +KERNEL_FLAVOR := grsec +KERNEL_FLAVOR_DEFAULT := grsec +BOOT_OPTS := nomodeset console=tty0 console=ttyS0,115200 +SYSLINUX_SERIAL := serial 0 115200 + diff --git a/alpine-docker.packages b/alpine-docker.packages new file mode 100644 index 0000000..a29912e --- /dev/null +++ b/alpine-docker.packages @@ -0,0 +1,10 @@ +bkeymaps +alpine-base +alpine-mirrors +btrfs-progs-extra +vim +docker +openssl +openssh +chrony +tzdata diff --git a/repositories b/repositories new file mode 100644 index 0000000..03de900 --- /dev/null +++ b/repositories @@ -0,0 +1,3 @@ +http://dl-cdn.alpinelinux.org/alpine/edge/testing +http://dl-cdn.alpinelinux.org/alpine/edge/community +http://dl-cdn.alpinelinux.org/alpine/edge/main