Skip to content

Commit 37e29b4

Browse files
rnrn
authored
Merge pull request linuxkit#2990 from rn/pre-release
Final preparation for v0.3 release
2 parents 110bded + ba1b7a4 commit 37e29b4

File tree

206 files changed

+746
-706
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+746
-706
lines changed

‎.circleci/config.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ jobs:
3333
GOOS: linux
3434
GOARCH: arm64
3535
command: make LOCAL_TARGET=bin/linuxkit-$GOOS-$GOARCH local-build
36+
- run:
37+
name: Build s390x/linux
38+
environment:
39+
GOOS: linux
40+
GOARCH: s390x
41+
command: make LOCAL_TARGET=bin/linuxkit-$GOOS-$GOARCH local-build
3642
- run:
3743
name: Build amd64/darwin
3844
environment:

‎CHANGELOG.md‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Changelog
2+
All notable changes to this project will be documented in this file.
3+
4+
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
5+
6+
## [v0.3] - 2018-04-05
7+
### Added
8+
- Initial `s390x` support.
9+
- Support for RealTime Linux kernels (`-rt`) on `x86_64` and `arm64`.
10+
- Support for booting of `qcow2` disks via EFI.
11+
- Support for CEPH filesystems in the kernel.
12+
- Logging for `onboot` containers to `/var/log`
13+
- Changelog file.
14+
15+
### Changed
16+
- Switched the default kernel to 4.14.x.
17+
- Update to `containerd` v1.0.3.
18+
- Update to `notary` v0.6.0.
19+
- Update WireGuard to 0.0.20180304.
20+
21+
### Removed
22+
- Removed support for 4.4.x and 4.9.x kernels for `arm64`.
23+
24+
25+
## [v0.2] - 2018-01-25
26+
- Almost everything
27+
28+
29+
## [v0.1] - 2017-??-??
30+
- Sometime in 2017 we did a mini v0.1 release but we seem to have lost any trace of it :)
31+
32+
33+
## [v0.0] - 2017-04-18
34+
- Initial open sourcing of LinuxKit

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
default: bin/linuxkit bin/rtf
55
all: default
66

7-
VERSION="v0.2+"
7+
VERSION="v0.3"
88
GIT_COMMIT=$(shell git rev-list -1 HEAD)
99

10-
GO_COMPILE=linuxkit/go-compile:7392985c6f55aba61201514174b45ba755fb386e
10+
GO_COMPILE=linuxkit/go-compile:2940a8141d907c2976be15f201f6e9b7c4c1f931
1111

1212
LINUXKIT?=bin/linuxkit
1313
GOOS?=$(shell uname -s | tr '[:upper:]' '[:lower:]')

‎docs/vendoring.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ docker run -it --rm \
2828
-v $(pwd):/go/src/github.com/linuxkit/linuxkit \
2929
-w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \
3030
--entrypoint /go/bin/vndr \
31-
linuxkit/go-compile:7392985c6f55aba61201514174b45ba755fb386e
31+
linuxkit/go-compile:2940a8141d907c2976be15f201f6e9b7c4c1f931
3232
```
3333

3434
To update a single dependency:
@@ -38,7 +38,7 @@ docker run -it --rm \
3838
-v $(pwd):/go/src/github.com/linuxkit/linuxkit \
3939
-w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \
4040
--entrypoint /go/bin/vndr \
41-
linuxkit/go-compile:7392985c6f55aba61201514174b45ba755fb386e
41+
linuxkit/go-compile:2940a8141d907c2976be15f201f6e9b7c4c1f931
4242
github.com/docker/docker
4343
```
4444

‎examples/aws.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@ kernel:
22
image: linuxkit/kernel:4.14.32
33
cmdline: "console=ttyS0"
44
init:
5-
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
6-
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
7-
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
8-
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
5+
- linuxkit/init:v0.3
6+
- linuxkit/runc:v0.3
7+
- linuxkit/containerd:v0.3
8+
- linuxkit/ca-certificates:v0.3
99
onboot:
1010
- name: sysctl
11-
image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d
11+
image: linuxkit/sysctl:v0.3
1212
- name: dhcpcd
13-
image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165
13+
image: linuxkit/dhcpcd:v0.3
1414
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
1515
- name: metadata
16-
image: linuxkit/metadata:09272c373fa10b9a09f2c9fe380bffb4402f98f6
16+
image: linuxkit/metadata:v0.3
1717
services:
1818
- name: rngd
19-
image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a
19+
image: linuxkit/rngd:v0.3
2020
- name: sshd
21-
image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615
21+
image: linuxkit/sshd:v0.3
2222
binds:
2323
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
2424
- name: nginx

‎examples/azure.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ kernel:
22
image: linuxkit/kernel:4.14.32
33
cmdline: "console=ttyS0"
44
init:
5-
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
6-
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
7-
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
8-
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
5+
- linuxkit/init:v0.3
6+
- linuxkit/runc:v0.3
7+
- linuxkit/containerd:v0.3
8+
- linuxkit/ca-certificates:v0.3
99
onboot:
1010
- name: sysctl
11-
image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d
11+
image: linuxkit/sysctl:v0.3
1212
services:
1313
- name: rngd
14-
image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a
14+
image: linuxkit/rngd:v0.3
1515
- name: dhcpcd
16-
image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165
16+
image: linuxkit/dhcpcd:v0.3
1717
- name: sshd
18-
image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615
18+
image: linuxkit/sshd:v0.3
1919
files:
2020
- path: root/.ssh/authorized_keys
2121
source: ~/.ssh/id_rsa.pub

‎examples/cadvisor.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,33 @@ kernel:
22
image: linuxkit/kernel:4.14.32
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
44
init:
5-
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
6-
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
7-
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
8-
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
5+
- linuxkit/init:v0.3
6+
- linuxkit/runc:v0.3
7+
- linuxkit/containerd:v0.3
8+
- linuxkit/ca-certificates:v0.3
99
onboot:
1010
- name: sysctl
11-
image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d
11+
image: linuxkit/sysctl:v0.3
1212
- name: dhcpcd
13-
image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165
13+
image: linuxkit/dhcpcd:v0.3
1414
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
1515
- name: sysfs
16-
image: linuxkit/sysfs:f7fc4dfbdc7e09f8aab0063699d9a75932b08c3f
16+
image: linuxkit/sysfs:v0.3
1717
- name: format
18-
image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680
18+
image: linuxkit/format:v0.3
1919
- name: mount
20-
image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a
20+
image: linuxkit/mount:v0.3
2121
command: ["/usr/bin/mountie", "/var/lib/docker"]
2222

2323
services:
2424
- name: getty
25-
image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21
25+
image: linuxkit/getty:v0.3
2626
env:
2727
- INSECURE=true
2828
- name: rngd
29-
image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a
29+
image: linuxkit/rngd:v0.3
3030
- name: ntpd
31-
image: linuxkit/openntpd:e3cd26ff2974f2d93c88c28efacf69e15bcdb983
31+
image: linuxkit/openntpd:v0.3
3232

3333
- name: docker
3434
image: docker:17.10.0-ce-dind
@@ -46,7 +46,7 @@ services:
4646
- /etc/docker/daemon.json:/etc/docker/daemon.json
4747
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
4848
- name: cadvisor
49-
image: linuxkit/cadvisor:5adb222abfcc3e7f21287045d7192aaf9198b80e
49+
image: linuxkit/cadvisor:v0.3
5050
files:
5151
- path: var/lib/docker
5252
directory: true

‎examples/docker-for-mac.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@ kernel:
33
image: linuxkit/kernel:4.14.32
44
cmdline: "console=ttyS0 page_poison=1"
55
init:
6-
- linuxkit/vpnkit-expose-port:3f60b78f78bfb83c14dd459ff7a3f58dacb33ad0 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
7-
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
8-
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
9-
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
10-
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
6+
- linuxkit/vpnkit-expose-port:v0.3 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
7+
- linuxkit/init:v0.3
8+
- linuxkit/runc:v0.3
9+
- linuxkit/containerd:v0.3
10+
- linuxkit/ca-certificates:v0.3
1111
onboot:
1212
# support metadata for optional config in /run/config
1313
- name: metadata
14-
image: linuxkit/metadata:09272c373fa10b9a09f2c9fe380bffb4402f98f6
14+
image: linuxkit/metadata:v0.3
1515
- name: sysctl
16-
image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d
16+
image: linuxkit/sysctl:v0.3
1717
- name: sysfs
18-
image: linuxkit/sysfs:f7fc4dfbdc7e09f8aab0063699d9a75932b08c3f
18+
image: linuxkit/sysfs:v0.3
1919
- name: binfmt
20-
image: linuxkit/binfmt:98398d827e80b56e487d2ae94ed86a0006acb702
20+
image: linuxkit/binfmt:v0.3
2121
# Format and mount the disk image in /var/lib/docker
2222
- name: format
23-
image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680
23+
image: linuxkit/format:v0.3
2424
- name: mount
25-
image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a
25+
image: linuxkit/mount:v0.3
2626
command: ["/usr/bin/mountie", "/var/lib"]
2727
# make a swap file on the mounted disk
2828
- name: swap
29-
image: linuxkit/swap:83b2f6d8c1e8196b68215a62269da4b79002aad0
29+
image: linuxkit/swap:v0.3
3030
command: ["/swap.sh", "--path", "/var/lib/swap", "--size", "1024M"]
3131
# mount-vpnkit mounts the 9p share used by vpnkit to coordinate port forwarding
3232
- name: mount-vpnkit
@@ -44,41 +44,41 @@ onboot:
4444
- /var:/host_var
4545
command: ["sh", "-c", "mv -v /host_var/log /host_var/lib && ln -vs /var/lib/log /host_var/log"]
4646
- name: dhcpcd
47-
image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165
47+
image: linuxkit/dhcpcd:v0.3
4848
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
4949
services:
5050
# Enable acpi to shutdown on power events
5151
- name: acpid
52-
image: linuxkit/acpid:a1399f824db917488d048c5e23ca3cec6e5317d8
52+
image: linuxkit/acpid:v0.3
5353
# Enable getty for easier debugging
5454
- name: getty
55-
image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21
55+
image: linuxkit/getty:v0.3
5656
env:
5757
- INSECURE=true
5858
# Run ntpd to keep time synchronised in the VM
5959
- name: ntpd
60-
image: linuxkit/openntpd:e3cd26ff2974f2d93c88c28efacf69e15bcdb983
60+
image: linuxkit/openntpd:v0.3
6161
# VSOCK to unix domain socket forwarding. Forwards guest /var/run/docker.sock
6262
# to a socket on the host.
6363
- name: vsudd
64-
image: linuxkit/vsudd:3559f24480e165e0719479146953b461a3e1b99e
64+
image: linuxkit/vsudd:v0.3
6565
binds:
6666
- /var/run:/var/run
6767
command: ["/vsudd", "-inport", "2376:unix:/var/run/docker.sock"]
6868
# vpnkit-forwarder forwards network traffic to/from the host via VSOCK port 62373.
6969
# It needs access to the vpnkit 9P coordination share
7070
- name: vpnkit-forwarder
71-
image: linuxkit/vpnkit-forwarder:9dad2e9fb848d6452232deb01e08beda7ba00d21
71+
image: linuxkit/vpnkit-forwarder:v0.3
7272
binds:
7373
- /var/vpnkit:/port
7474
net: host
7575
command: ["/vpnkit-forwarder", "-vsockPort", "62373"]
7676
# Monitor for image deletes and invoke a TRIM on the container filesystem
7777
- name: trim-after-delete
78-
image: linuxkit/trim-after-delete:ab0873798bf27deb5024569e46dfe30bebda9713
78+
image: linuxkit/trim-after-delete:v0.3
7979
# When the host resumes from sleep, force a clock resync
8080
- name: host-timesync-daemon
81-
image: linuxkit/host-timesync-daemon:10177f45d9384fa4cc61571ae8bb3bffbb3eba3c
81+
image: linuxkit/host-timesync-daemon:v0.3
8282
# Run dockerd with the vpnkit userland proxy from the vpnkit-forwarder container.
8383
# Bind mounts /var/run to allow vsudd to connect to docker.sock, /var/vpnkit
8484
# for vpnkit coordination and /run/config/docker for the configuration file.

‎examples/docker.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@ kernel:
22
image: linuxkit/kernel:4.14.32
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
44
init:
5-
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
6-
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
7-
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
8-
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
5+
- linuxkit/init:v0.3
6+
- linuxkit/runc:v0.3
7+
- linuxkit/containerd:v0.3
8+
- linuxkit/ca-certificates:v0.3
99
onboot:
1010
- name: sysctl
11-
image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d
11+
image: linuxkit/sysctl:v0.3
1212
- name: sysfs
13-
image: linuxkit/sysfs:f7fc4dfbdc7e09f8aab0063699d9a75932b08c3f
13+
image: linuxkit/sysfs:v0.3
1414
- name: format
15-
image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680
15+
image: linuxkit/format:v0.3
1616
- name: mount
17-
image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a
17+
image: linuxkit/mount:v0.3
1818
command: ["/usr/bin/mountie", "/var/lib/docker"]
1919
services:
2020
- name: getty
21-
image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21
21+
image: linuxkit/getty:v0.3
2222
env:
2323
- INSECURE=true
2424
- name: rngd
25-
image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a
25+
image: linuxkit/rngd:v0.3
2626
- name: dhcpcd
27-
image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165
27+
image: linuxkit/dhcpcd:v0.3
2828
- name: ntpd
29-
image: linuxkit/openntpd:e3cd26ff2974f2d93c88c28efacf69e15bcdb983
29+
image: linuxkit/openntpd:v0.3
3030
- name: docker
3131
image: docker:17.09.0-ce-dind
3232
capabilities:

‎examples/gcp.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@ kernel:
22
image: linuxkit/kernel:4.14.32
33
cmdline: "console=ttyS0"
44
init:
5-
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
6-
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
7-
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
8-
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
5+
- linuxkit/init:v0.3
6+
- linuxkit/runc:v0.3
7+
- linuxkit/containerd:v0.3
8+
- linuxkit/ca-certificates:v0.3
99
onboot:
1010
- name: sysctl
11-
image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d
11+
image: linuxkit/sysctl:v0.3
1212
- name: dhcpcd
13-
image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165
13+
image: linuxkit/dhcpcd:v0.3
1414
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
1515
- name: metadata
16-
image: linuxkit/metadata:09272c373fa10b9a09f2c9fe380bffb4402f98f6
16+
image: linuxkit/metadata:v0.3
1717
services:
1818
- name: getty
19-
image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21
19+
image: linuxkit/getty:v0.3
2020
env:
2121
- INSECURE=true
2222
- name: rngd
23-
image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a
23+
image: linuxkit/rngd:v0.3
2424
- name: sshd
25-
image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615
25+
image: linuxkit/sshd:v0.3
2626
binds:
2727
- /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys
2828
- name: nginx

0 commit comments

Comments
 (0)