diff --git a/.mailmap b/.mailmap index adca1fa52..a2dddc406 100644 --- a/.mailmap +++ b/.mailmap @@ -1,5 +1,3 @@ -# Generate AUTHORS: scripts/generate-authors.sh - # Tip for finding duplicates (besides scanning the output of AUTHORS for name # duplicates that aren't also email duplicates): scan the output of: # git log --format='%aE - %aN' | sort -uf @@ -41,7 +39,8 @@ Magnus Skjegstad Marten Cassel Mindy Preston MinJae Kwon -Nathan Dautenhahn +Nathan Dautenhahn +Nathan Dautenhahn Nathan LeClaire Nathan LeClaire Niclas Mietz diff --git a/AUTHORS b/AUTHORS index fac7478f4..7dda0c8bf 100644 --- a/AUTHORS +++ b/AUTHORS @@ -14,6 +14,7 @@ Asbjorn Enge Avi Deitcher Ben Allen Bill Kerr +Björn Ingeson Brice Figureau Carlton-Semple Chanwit Kaewkasi @@ -22,6 +23,7 @@ Craig Ingram Damiano Donati Dan Finneran Daniel Caminada +Daniel Dean Daniel Hiltgen Daniel Nephin Dave Freitag @@ -33,6 +35,7 @@ David Scott David Sheets Dennis Chen Dieter Reuter +Dominic White duraki Edward Vielmetti Emily Casey @@ -40,11 +43,14 @@ Eric Briand Evan Hazlett French Ben functor +Gabriel Chabot Garth Bushell George Papanikolaou +Gerben Geijteman Gianluca Arbezzano Guillaume Rose Hans van den Bogert +hyperized Ian Campbell Ilya Dmitrichenko Isaac Rodman @@ -70,6 +76,7 @@ Krisztian Horvath Kunal Kushwaha Liqdfire Lorenzo Fontana +Loïc Pottier Luke Hodkinson Madhu Venugopal Magnus Skjegstad @@ -87,7 +94,7 @@ Mickaël Salaün Mindy Preston MinJae Kwon Natanael Copa -Nathan Dautenhahn +Nathan Dautenhahn Nathan LeClaire Nick Jones Niclas Mietz @@ -99,6 +106,7 @@ Patrik Cyvoct Phil Estes Pierre Gayvallet Pratik Mallya +Preston Holmes Radu Matei Richard Connon Richard Mortier @@ -116,6 +124,7 @@ Sebastiaan van Stijn sethp Simarpreet Singh Simon Ferquel +Simon Fridlund Sotiris Salloumis Steeve Morin Stefan Bourlon @@ -136,6 +145,7 @@ Tomas Knappek Tristan Slominski Tycho Andersen Vincent Demeester +Yoann Ricordel Zachery Hostens zimbatm zlim diff --git a/examples/aws.yml b/examples/aws.yml index 4ef7ddcab..1dc60add2 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:e182c1e638a30937918ac8b2d03d3b55f950104c + image: linuxkit/metadata:2dade7485ac60c765b16a34a42afc6431da938cf services: - name: rngd image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81 diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 5b4792793..0f97985a4 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -11,7 +11,7 @@ init: onboot: # support metadata for optional config in /run/config - name: metadata - image: linuxkit/metadata:e182c1e638a30937918ac8b2d03d3b55f950104c + image: linuxkit/metadata:2dade7485ac60c765b16a34a42afc6431da938cf - name: sysctl image: linuxkit/sysctl:v0.7 - name: sysfs @@ -26,7 +26,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib"] # make a swap file on the mounted disk - name: swap - image: linuxkit/swap:f8b0434963b4c9114db473aab3b9409bccd4f85b + image: linuxkit/swap:7f17cd1dfca99f643f91c895e19ab61df09aa870 command: ["/swap.sh", "--path", "/var/lib/swap", "--size", "1024M"] # mount-vpnkit mounts the 9p share used by vpnkit to coordinate port forwarding - name: mount-vpnkit diff --git a/examples/gcp.yml b/examples/gcp.yml index 1e100625c..de3415cc7 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:e182c1e638a30937918ac8b2d03d3b55f950104c + image: linuxkit/metadata:2dade7485ac60c765b16a34a42afc6431da938cf services: - name: getty image: linuxkit/getty:v0.7 diff --git a/examples/hetzner.yml b/examples/hetzner.yml index dcb35e25c..acb7e5c11 100644 --- a/examples/hetzner.yml +++ b/examples/hetzner.yml @@ -18,7 +18,7 @@ onboot: image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:e182c1e638a30937918ac8b2d03d3b55f950104c + image: linuxkit/metadata:2dade7485ac60c765b16a34a42afc6431da938cf command: ["/usr/bin/metadata", "hetzner"] services: - name: rngd diff --git a/examples/openstack.yml b/examples/openstack.yml index 950e5914d..a706b69fc 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:e182c1e638a30937918ac8b2d03d3b55f950104c + image: linuxkit/metadata:2dade7485ac60c765b16a34a42afc6431da938cf command: ["/usr/bin/metadata", "openstack"] services: - name: rngd diff --git a/examples/packet.yml b/examples/packet.yml index 5164652fc..e41467d01 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -18,7 +18,7 @@ onboot: image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:e182c1e638a30937918ac8b2d03d3b55f950104c + image: linuxkit/metadata:2dade7485ac60c765b16a34a42afc6431da938cf command: ["/usr/bin/metadata", "packet"] services: - name: rngd diff --git a/examples/scaleway.yml b/examples/scaleway.yml index 64add2a04..c772c1cf5 100644 --- a/examples/scaleway.yml +++ b/examples/scaleway.yml @@ -16,7 +16,7 @@ onboot: image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:e182c1e638a30937918ac8b2d03d3b55f950104c + image: linuxkit/metadata:2dade7485ac60c765b16a34a42afc6431da938cf services: - name: getty image: linuxkit/getty:v0.7 diff --git a/examples/swap.yml b/examples/swap.yml index a71e41f89..9c9ddc1d5 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -18,7 +18,7 @@ onboot: image: linuxkit/mount:v0.7 command: ["/usr/bin/mountie", "/var/external"] - name: swap - image: linuxkit/swap:f8b0434963b4c9114db473aab3b9409bccd4f85b + image: linuxkit/swap:7f17cd1dfca99f643f91c895e19ab61df09aa870 # to use unencrypted swap, use: # command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G"] command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"] diff --git a/examples/vultr.yml b/examples/vultr.yml index 55feb6127..ebc996e6a 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:v0.7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:e182c1e638a30937918ac8b2d03d3b55f950104c + image: linuxkit/metadata:2dade7485ac60c765b16a34a42afc6431da938cf command: ["/usr/bin/metadata", "vultr"] services: - name: getty