Skip to content

Commit

Permalink
Merge pull request docker#419 from SvenDowideit/update-to-3.15.3-linu…
Browse files Browse the repository at this point in the history
…x-kernel

Update to 3.15.3 linux kernel
  • Loading branch information
Sven Dowideit authored and Sven Dowideit committed Jul 4, 2014
2 parents dc2b5f2 + 03ef23b commit 086c429
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 66 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM debian:jessie
MAINTAINER Steeve Morin "steeve.morin@gmail.com"

ENV KERNEL_VERSION 3.14.1
ENV AUFS_BRANCH aufs3.14
ENV KERNEL_VERSION 3.15.3
ENV AUFS_BRANCH aufs3.15

RUN apt-get update && apt-get -y install unzip \
xz-utils \
Expand All @@ -21,7 +21,7 @@ RUN apt-get update && apt-get -y install unzip \
pkg-config

# Fetch the kernel sources
RUN curl https://www.kernel.org/pub/linux/kernel/v3.x/linux-$KERNEL_VERSION.tar.xz | tar -C / -xJ && \
RUN curl --retry 10 https://www.kernel.org/pub/linux/kernel/v3.x/linux-$KERNEL_VERSION.tar.xz | tar -C / -xJ && \
mv /linux-$KERNEL_VERSION /linux-kernel

# Download AUFS and apply patches and files, then remove it
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ https://github.com/boot2docker/boot2docker/releases).


## Features
* Kernel 3.14.1 with AUFS, Docker 1.1.0 - using libcontainer
* Kernel 3.15.3 with AUFS, Docker 1.1.0 - using libcontainer
* Container persistence via disk automount on `/var/lib/docker`
* SSH keys persistence via disk automount

Expand Down
5 changes: 2 additions & 3 deletions doc/BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ How to build boot2docker.iso locally
The boot2docker.iso is built with Docker, via a Dockerfile.

During `docker build` we
* fetch, patch with AUFS support and build the 3.14.0 Linux Kernel with Tiny Core base configuration
* fetch, patch with AUFS support and build the 3.15.3 Linux Kernel with Tiny Core base configuration
* build the base rootfs for boot2docker (not complete)
* build the rootfs, download the latest Docker release and create the `.iso` file on `/` of the container.

Expand All @@ -14,8 +14,7 @@ So the full build process goes like this:

```
# you will need more than 2GB memory
$ sudo docker build -t boot2docker .
$ sudo docker run --rm boot2docker > boot2docker.iso
$ docker build -t boot2docker . && docker run --rm boot2docker > boot2docker.iso
```

Now you can install the iso to a USB drive, SD card, CD-Rom or hard-disk. The image contains
Expand Down
Loading

0 comments on commit 086c429

Please sign in to comment.