diff --git a/README.md b/README.md index 5f7969b2..4de39d4f 100644 --- a/README.md +++ b/README.md @@ -430,6 +430,7 @@ These are the data sources used for download config from cloud provider. The val packet scaleway vultr + hetzner cdrom More than one can be supported at a time, for example: @@ -441,6 +442,8 @@ k3os: - cdrom ``` +When multiple data sources are specified they are probed in order and the first to provide `/run/config/userdata` will halt further processing. + ### `k3os.modules` A list of kernel modules to be loaded on start. diff --git a/images/02-progs/Dockerfile b/images/02-progs/Dockerfile index 952afe44..e926fcfd 100644 --- a/images/02-progs/Dockerfile +++ b/images/02-progs/Dockerfile @@ -3,11 +3,12 @@ ARG TAG ARG VERSION FROM ${REPO}/k3os-gobuild:${TAG} as gobuild -ENV LINUXKIT v0.7 +ENV LINUXKIT 3f56669576bac1a44cd61f5a9fa540976d33eeed FROM gobuild as linuxkit -RUN git clone --branch $LINUXKIT https://github.com/linuxkit/linuxkit.git $GOPATH/src/github.com/linuxkit/linuxkit +RUN git clone https://github.com/linuxkit/linuxkit.git $GOPATH/src/github.com/linuxkit/linuxkit WORKDIR $GOPATH/src/github.com/linuxkit/linuxkit/pkg/metadata +RUN git checkout -b current $LINUXKIT RUN gobuild -o /output/metadata FROM gobuild as k3os