Merge pull request #2923 from rn/kernel

Make 4.14.x the default and reduce number of kernels build
This commit is contained in:
Rolf Neugebauer 2018-02-21 15:45:27 +00:00 committed by GitHub
commit f5d7b33986
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
67 changed files with 86 additions and 3731 deletions

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
@ -22,7 +22,7 @@ services:
binds:
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
- name: nginx
image: nginx:alpine
image: nginx:1.13.8-alpine
capabilities:
- CAP_NET_BIND_SERVICE
- CAP_CHOWN

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,6 +1,6 @@
# This is an example for building the open source components of Docker for Mac
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/vpnkit-expose-port:v0.2 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
@ -26,7 +26,7 @@ services:
binds:
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
- name: nginx
image: nginx:alpine
image: nginx:1.13.8-alpine
capabilities:
- CAP_NET_BIND_SERVICE
- CAP_CHOWN

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
@ -32,7 +32,7 @@ services:
- name: rngd
image: linuxkit/rngd:v0.2
- name: nginx
image: nginx:alpine
image: nginx:1.13.8-alpine
capabilities:
- CAP_NET_BIND_SERVICE
- CAP_CHOWN

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=tty0 console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
@ -23,7 +23,7 @@ services:
binds:
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
- name: nginx
image: nginx:alpine
image: nginx:1.13.8-alpine
capabilities:
- CAP_NET_BIND_SERVICE
- CAP_CHOWN

View File

@ -5,7 +5,7 @@
# for arm64 then the 'ucode' line in the kernel section can be left
# out.
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyAMA0"
ucode: ""
onboot:

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: console=ttyS1
ucode: intel-ucode.cpio
init:

View File

@ -1,7 +1,7 @@
# Minimal YAML to run a redis server (used at DockerCon'17)
# connect: nc localhost 6379
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=tty0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
@ -19,7 +19,7 @@ services:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.2
- name: nginx
image: nginx:alpine
image: nginx:1.13.8-alpine
capabilities:
- CAP_NET_BIND_SERVICE
- CAP_CHOWN

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
@ -26,7 +26,7 @@ services:
binds:
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
- name: nginx
image: nginx:alpine
image: nginx:1.13.8-alpine
capabilities:
- CAP_NET_BIND_SERVICE
- CAP_CHOWN

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
@ -47,7 +47,7 @@ services:
- name: rngd
image: linuxkit/rngd:v0.2
- name: nginx
image: nginx:alpine
image: nginx:1.13.8-alpine
net: /run/netns/wg0
capabilities:
- CAP_NET_BIND_SERVICE

View File

@ -28,14 +28,14 @@ RUN set -e && \
SERIES=${VERSION%.*}.x && \
echo "Patching $VERSION $SERIES" && \
cd /linux-${VERSION} && \
if [ -d /patches-${SERIES} ]; then \
for patch in /patches-${SERIES}/*.patch; do \
echo "Applying $patch" && \
patch -t -F0 -N -u -p1 < "$patch"; \
done; \
fi && \
mv /config-${SERIES}-x86_64 arch/x86/configs/x86_64_defconfig && \
mv /config-${SERIES}-aarch64 arch/arm64/configs/defconfig; \
if [ -d /patches-${SERIES} ]; then \
for patch in /patches-${SERIES}/*.patch; do \
echo "Applying $patch" && \
patch -t -F0 -N -u -p1 < "$patch"; \
done; \
fi && \
[ ! -f /config-${SERIES}-x86_64 ] || mv /config-${SERIES}-x86_64 arch/x86/configs/x86_64_defconfig && \
[ ! -f /config-${SERIES}-aarch64 ] || mv /config-${SERIES}-aarch64 arch/arm64/configs/defconfig ; \
done
ENTRYPOINT ["/bin/sh"]

View File

@ -41,10 +41,10 @@ endif
PUSH_MANIFEST:=$(shell git rev-parse --show-toplevel)/scripts/push-manifest.sh
ARCH := $(shell uname -m)
ifeq ($(ARCH), x86_64)
ifeq ($(ARCH),x86_64)
SUFFIX=-amd64
endif
ifeq ($(ARCH), aarch64)
ifeq ($(ARCH),aarch64)
SUFFIX=-arm64
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,,-dbg))
$(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,,-dbg))
ifeq ($(ARCH),x86_64)
$(eval $(call kernel,4.4.116,4.4.x,$(EXTRA),$(DEBUG)))
endif
# Target for kernel config
kconfig: | sources

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9
@ -24,7 +24,7 @@ services:
- name: rngd
image: linuxkit/rngd:v0.2
- name: nginx
image: nginx:alpine
image: nginx:1.13.8-alpine
capabilities:
- CAP_NET_BIND_SERVICE
- CAP_CHOWN

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -17,7 +17,7 @@ services:
- name: rngd
image: linuxkit/rngd:v0.2
- name: nginx
image: nginx:alpine
image: nginx:1.13.8-alpine
capabilities:
- CAP_NET_BIND_SERVICE
- CAP_CHOWN

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=tty0 page_poison=1"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 # with runc, logwrite, startmemlogd
@ -17,7 +17,7 @@ services:
- name: rngd
image: linuxkit/rngd:v0.2
- name: nginx
image: nginx:alpine
image: nginx:1.13.8-alpine
capabilities:
- CAP_NET_BIND_SERVICE
- CAP_CHOWN

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -20,7 +20,7 @@ services:
- name: rngd
image: linuxkit/rngd:v0.2
- name: nginx
image: nginx:alpine
image: nginx:1.13.8-alpine
capabilities:
- CAP_NET_BIND_SERVICE
- CAP_CHOWN

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -19,7 +19,7 @@ clean_up() {
trap clean_up EXIT
# 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
docker build -t ${IMAGE_NAME} .

View File

@ -19,7 +19,7 @@ clean_up() {
trap clean_up EXIT
# 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
docker build -t ${IMAGE_NAME} .

View File

@ -19,7 +19,7 @@ clean_up() {
trap clean_up EXIT
# 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
docker build -t ${IMAGE_NAME} .

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9

View File

@ -1,7 +1,7 @@
# 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
kernel:
image: linuxkit/kernel:4.9.82
image: linuxkit/kernel:4.14.20
cmdline: "console=ttyS0"
init:
- linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9