mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-20 09:39:08 +00:00
Merge pull request #2923 from rn/kernel
Make 4.14.x the default and reduce number of kernels build
This commit is contained in:
commit
f5d7b33986
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
@ -22,7 +22,7 @@ services:
|
|||||||
binds:
|
binds:
|
||||||
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
|
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
|
||||||
- name: nginx
|
- name: nginx
|
||||||
image: nginx:alpine
|
image: nginx:1.13.8-alpine
|
||||||
capabilities:
|
capabilities:
|
||||||
- CAP_NET_BIND_SERVICE
|
- CAP_NET_BIND_SERVICE
|
||||||
- CAP_CHOWN
|
- CAP_CHOWN
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# This is an example for building the open source components of Docker for Mac
|
# This is an example for building the open source components of Docker for Mac
|
||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 page_poison=1"
|
cmdline: "console=ttyS0 page_poison=1"
|
||||||
init:
|
init:
|
||||||
- linuxkit/vpnkit-expose-port:v0.2 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
|
- linuxkit/vpnkit-expose-port:v0.2 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
@ -26,7 +26,7 @@ services:
|
|||||||
binds:
|
binds:
|
||||||
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
|
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
|
||||||
- name: nginx
|
- name: nginx
|
||||||
image: nginx:alpine
|
image: nginx:1.13.8-alpine
|
||||||
capabilities:
|
capabilities:
|
||||||
- CAP_NET_BIND_SERVICE
|
- CAP_NET_BIND_SERVICE
|
||||||
- CAP_CHOWN
|
- CAP_CHOWN
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
@ -32,7 +32,7 @@ services:
|
|||||||
- name: rngd
|
- name: rngd
|
||||||
image: linuxkit/rngd:v0.2
|
image: linuxkit/rngd:v0.2
|
||||||
- name: nginx
|
- name: nginx
|
||||||
image: nginx:alpine
|
image: nginx:1.13.8-alpine
|
||||||
capabilities:
|
capabilities:
|
||||||
- CAP_NET_BIND_SERVICE
|
- CAP_NET_BIND_SERVICE
|
||||||
- CAP_CHOWN
|
- CAP_CHOWN
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=tty0 console=ttyS0"
|
cmdline: "console=tty0 console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
@ -23,7 +23,7 @@ services:
|
|||||||
binds:
|
binds:
|
||||||
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
|
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
|
||||||
- name: nginx
|
- name: nginx
|
||||||
image: nginx:alpine
|
image: nginx:1.13.8-alpine
|
||||||
capabilities:
|
capabilities:
|
||||||
- CAP_NET_BIND_SERVICE
|
- CAP_NET_BIND_SERVICE
|
||||||
- CAP_CHOWN
|
- CAP_CHOWN
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
# for arm64 then the 'ucode' line in the kernel section can be left
|
# for arm64 then the 'ucode' line in the kernel section can be left
|
||||||
# out.
|
# out.
|
||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyAMA0"
|
cmdline: "console=ttyAMA0"
|
||||||
ucode: ""
|
ucode: ""
|
||||||
onboot:
|
onboot:
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: console=ttyS1
|
cmdline: console=ttyS1
|
||||||
ucode: intel-ucode.cpio
|
ucode: intel-ucode.cpio
|
||||||
init:
|
init:
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Minimal YAML to run a redis server (used at DockerCon'17)
|
# Minimal YAML to run a redis server (used at DockerCon'17)
|
||||||
# connect: nc localhost 6379
|
# connect: nc localhost 6379
|
||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=tty0"
|
cmdline: "console=tty0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
@ -19,7 +19,7 @@ services:
|
|||||||
- name: dhcpcd
|
- name: dhcpcd
|
||||||
image: linuxkit/dhcpcd:v0.2
|
image: linuxkit/dhcpcd:v0.2
|
||||||
- name: nginx
|
- name: nginx
|
||||||
image: nginx:alpine
|
image: nginx:1.13.8-alpine
|
||||||
capabilities:
|
capabilities:
|
||||||
- CAP_NET_BIND_SERVICE
|
- CAP_NET_BIND_SERVICE
|
||||||
- CAP_CHOWN
|
- CAP_CHOWN
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
@ -26,7 +26,7 @@ services:
|
|||||||
binds:
|
binds:
|
||||||
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
|
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
|
||||||
- name: nginx
|
- name: nginx
|
||||||
image: nginx:alpine
|
image: nginx:1.13.8-alpine
|
||||||
capabilities:
|
capabilities:
|
||||||
- CAP_NET_BIND_SERVICE
|
- CAP_NET_BIND_SERVICE
|
||||||
- CAP_CHOWN
|
- CAP_CHOWN
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
@ -47,7 +47,7 @@ services:
|
|||||||
- name: rngd
|
- name: rngd
|
||||||
image: linuxkit/rngd:v0.2
|
image: linuxkit/rngd:v0.2
|
||||||
- name: nginx
|
- name: nginx
|
||||||
image: nginx:alpine
|
image: nginx:1.13.8-alpine
|
||||||
net: /run/netns/wg0
|
net: /run/netns/wg0
|
||||||
capabilities:
|
capabilities:
|
||||||
- CAP_NET_BIND_SERVICE
|
- CAP_NET_BIND_SERVICE
|
||||||
|
@ -28,14 +28,14 @@ RUN set -e && \
|
|||||||
SERIES=${VERSION%.*}.x && \
|
SERIES=${VERSION%.*}.x && \
|
||||||
echo "Patching $VERSION $SERIES" && \
|
echo "Patching $VERSION $SERIES" && \
|
||||||
cd /linux-${VERSION} && \
|
cd /linux-${VERSION} && \
|
||||||
if [ -d /patches-${SERIES} ]; then \
|
if [ -d /patches-${SERIES} ]; then \
|
||||||
for patch in /patches-${SERIES}/*.patch; do \
|
for patch in /patches-${SERIES}/*.patch; do \
|
||||||
echo "Applying $patch" && \
|
echo "Applying $patch" && \
|
||||||
patch -t -F0 -N -u -p1 < "$patch"; \
|
patch -t -F0 -N -u -p1 < "$patch"; \
|
||||||
done; \
|
done; \
|
||||||
fi && \
|
fi && \
|
||||||
mv /config-${SERIES}-x86_64 arch/x86/configs/x86_64_defconfig && \
|
[ ! -f /config-${SERIES}-x86_64 ] || mv /config-${SERIES}-x86_64 arch/x86/configs/x86_64_defconfig && \
|
||||||
mv /config-${SERIES}-aarch64 arch/arm64/configs/defconfig; \
|
[ ! -f /config-${SERIES}-aarch64 ] || mv /config-${SERIES}-aarch64 arch/arm64/configs/defconfig ; \
|
||||||
done
|
done
|
||||||
|
|
||||||
ENTRYPOINT ["/bin/sh"]
|
ENTRYPOINT ["/bin/sh"]
|
||||||
|
@ -41,10 +41,10 @@ endif
|
|||||||
PUSH_MANIFEST:=$(shell git rev-parse --show-toplevel)/scripts/push-manifest.sh
|
PUSH_MANIFEST:=$(shell git rev-parse --show-toplevel)/scripts/push-manifest.sh
|
||||||
|
|
||||||
ARCH := $(shell uname -m)
|
ARCH := $(shell uname -m)
|
||||||
ifeq ($(ARCH), x86_64)
|
ifeq ($(ARCH),x86_64)
|
||||||
SUFFIX=-amd64
|
SUFFIX=-amd64
|
||||||
endif
|
endif
|
||||||
ifeq ($(ARCH), aarch64)
|
ifeq ($(ARCH),aarch64)
|
||||||
SUFFIX=-arm64
|
SUFFIX=-arm64
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -218,10 +218,11 @@ $(eval $(call kernel,4.15.4,4.15.x,$(EXTRA),$(DEBUG)))
|
|||||||
$(eval $(call kernel,4.14.20,4.14.x,$(EXTRA),$(DEBUG)))
|
$(eval $(call kernel,4.14.20,4.14.x,$(EXTRA),$(DEBUG)))
|
||||||
$(eval $(call kernel,4.14.20,4.14.x,,-dbg))
|
$(eval $(call kernel,4.14.20,4.14.x,,-dbg))
|
||||||
$(eval $(call kernel,4.14.18,4.14.x,-rt,))
|
$(eval $(call kernel,4.14.18,4.14.x,-rt,))
|
||||||
$(eval $(call kernel,4.14.18,4.14.x,-rt,-dbg))
|
|
||||||
$(eval $(call kernel,4.9.82,4.9.x,$(EXTRA),$(DEBUG)))
|
$(eval $(call kernel,4.9.82,4.9.x,$(EXTRA),$(DEBUG)))
|
||||||
$(eval $(call kernel,4.9.82,4.9.x,,-dbg))
|
|
||||||
|
ifeq ($(ARCH),x86_64)
|
||||||
$(eval $(call kernel,4.4.116,4.4.x,$(EXTRA),$(DEBUG)))
|
$(eval $(call kernel,4.4.116,4.4.x,$(EXTRA),$(DEBUG)))
|
||||||
|
endif
|
||||||
|
|
||||||
# Target for kernel config
|
# Target for kernel config
|
||||||
kconfig: | sources
|
kconfig: | sources
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
@ -24,7 +24,7 @@ services:
|
|||||||
- name: rngd
|
- name: rngd
|
||||||
image: linuxkit/rngd:v0.2
|
image: linuxkit/rngd:v0.2
|
||||||
- name: nginx
|
- name: nginx
|
||||||
image: nginx:alpine
|
image: nginx:1.13.8-alpine
|
||||||
capabilities:
|
capabilities:
|
||||||
- CAP_NET_BIND_SERVICE
|
- CAP_NET_BIND_SERVICE
|
||||||
- CAP_CHOWN
|
- CAP_CHOWN
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 page_poison=1"
|
cmdline: "console=ttyS0 page_poison=1"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 page_poison=1"
|
cmdline: "console=ttyS0 page_poison=1"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -17,7 +17,7 @@ services:
|
|||||||
- name: rngd
|
- name: rngd
|
||||||
image: linuxkit/rngd:v0.2
|
image: linuxkit/rngd:v0.2
|
||||||
- name: nginx
|
- name: nginx
|
||||||
image: nginx:alpine
|
image: nginx:1.13.8-alpine
|
||||||
capabilities:
|
capabilities:
|
||||||
- CAP_NET_BIND_SERVICE
|
- CAP_NET_BIND_SERVICE
|
||||||
- CAP_CHOWN
|
- CAP_CHOWN
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=tty0 page_poison=1"
|
cmdline: "console=ttyS0 console=tty0 page_poison=1"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 # with runc, logwrite, startmemlogd
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 # with runc, logwrite, startmemlogd
|
||||||
@ -17,7 +17,7 @@ services:
|
|||||||
- name: rngd
|
- name: rngd
|
||||||
image: linuxkit/rngd:v0.2
|
image: linuxkit/rngd:v0.2
|
||||||
- name: nginx
|
- name: nginx
|
||||||
image: nginx:alpine
|
image: nginx:1.13.8-alpine
|
||||||
capabilities:
|
capabilities:
|
||||||
- CAP_NET_BIND_SERVICE
|
- CAP_NET_BIND_SERVICE
|
||||||
- CAP_CHOWN
|
- CAP_CHOWN
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 page_poison=1"
|
cmdline: "console=ttyS0 page_poison=1"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -20,7 +20,7 @@ services:
|
|||||||
- name: rngd
|
- name: rngd
|
||||||
image: linuxkit/rngd:v0.2
|
image: linuxkit/rngd:v0.2
|
||||||
- name: nginx
|
- name: nginx
|
||||||
image: nginx:alpine
|
image: nginx:1.13.8-alpine
|
||||||
capabilities:
|
capabilities:
|
||||||
- CAP_NET_BIND_SERVICE
|
- CAP_NET_BIND_SERVICE
|
||||||
- CAP_CHOWN
|
- CAP_CHOWN
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -19,7 +19,7 @@ clean_up() {
|
|||||||
trap clean_up EXIT
|
trap clean_up EXIT
|
||||||
|
|
||||||
# Make sure we have the latest kernel image
|
# Make sure we have the latest kernel image
|
||||||
docker pull linuxkit/kernel:4.9.82
|
docker pull linuxkit/kernel:4.4.116
|
||||||
# Build a package
|
# Build a package
|
||||||
docker build -t ${IMAGE_NAME} .
|
docker build -t ${IMAGE_NAME} .
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ clean_up() {
|
|||||||
trap clean_up EXIT
|
trap clean_up EXIT
|
||||||
|
|
||||||
# Make sure we have the latest kernel image
|
# Make sure we have the latest kernel image
|
||||||
docker pull linuxkit/kernel:4.9.82
|
docker pull linuxkit/kernel:4.14.20
|
||||||
# Build a package
|
# Build a package
|
||||||
docker build -t ${IMAGE_NAME} .
|
docker build -t ${IMAGE_NAME} .
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ clean_up() {
|
|||||||
trap clean_up EXIT
|
trap clean_up EXIT
|
||||||
|
|
||||||
# Make sure we have the latest kernel image
|
# Make sure we have the latest kernel image
|
||||||
docker pull linuxkit/kernel:4.9.82
|
docker pull linuxkit/kernel:4.15.4
|
||||||
# Build a package
|
# Build a package
|
||||||
docker build -t ${IMAGE_NAME} .
|
docker build -t ${IMAGE_NAME} .
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 page_poison=1"
|
cmdline: "console=ttyS0 page_poison=1"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0 console=ttyAMA0"
|
cmdline: "console=ttyS0 console=ttyAMA0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# FIXME: This should use the minimal example
|
# FIXME: This should use the minimal example
|
||||||
# We continue to use the kernel-config-test as CI is currently expecting to see a success message
|
# We continue to use the kernel-config-test as CI is currently expecting to see a success message
|
||||||
kernel:
|
kernel:
|
||||||
image: linuxkit/kernel:4.9.82
|
image: linuxkit/kernel:4.14.20
|
||||||
cmdline: "console=ttyS0"
|
cmdline: "console=ttyS0"
|
||||||
init:
|
init:
|
||||||
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
|
||||||
|
Loading…
Reference in New Issue
Block a user