diff --git a/README.md b/README.md index 219fced7..a6ae25a8 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ or build the binary from source. ./build ./docker-build -Next, prepare a [data config directory](#configs) or use the example in [data](data). Optionally create an [image assets](#assets) directory. +Next, prepare a [data config directory](#configs) or use the example in [data](data). Optionally create an [image assets](#image assets) directory. Run the application on your host or as a Docker container with flag or environment variable [arguments](docs/config.md). @@ -40,15 +40,15 @@ Prepare a config data directory. If you keep a versioned repository of declarati └── uuid └── 1cff2cd8-f00a-42c8-9426-f55e6a1847f6 └── mac - └── 1cff2cd8-f00a-42c8-9426-f55e6a1847f6 + └── 52:54:00:c7:b6:64 To find boot configs and cloud configs, the `FileStore` searches the `uuid` directory for a file matching a client machine's UUID, then searches `mac` for file matching the client's MAC address, and finally falls back to using the `default` file if present. A typical boot config can be written as { - "kernel": "/images/stable/coreos_production_pxe.vmlinuz", - "initrd": ["/images/stable/coreos_production_pxe_image.cpio.gz"], + "kernel": "/images/coreos/835.9.0/coreos_production_pxe.vmlinuz", + "initrd": ["/images/coreos/835.9.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "cloud-config-url": "http://172.17.0.2:8080/cloud?uuid=${uuid}", "coreos.autologin": "" diff --git a/docker-run b/docker-run index 42179e97..e7df0cea 100755 --- a/docker-run +++ b/docker-run @@ -1,3 +1,3 @@ #!/bin/bash -e -docker run -p 8080:8080 --name=bootcfg --rm -v $PWD/data:/data -v $PWD/images:/images dghubble/bootcfg:latest -address=0.0.0.0:8080 \ No newline at end of file +docker run -p 8080:8080 --name=bootcfg --rm -v $PWD/data:/data:Z -v $PWD/images:/images:Z dghubble/bootcfg:latest -address=0.0.0.0:8080 \ No newline at end of file diff --git a/dockerfiles/ipxe/Dockerfile b/dockerfiles/ipxe/Dockerfile index 68dc4a5b..22e4f3fe 100644 --- a/dockerfiles/ipxe/Dockerfile +++ b/dockerfiles/ipxe/Dockerfile @@ -1,6 +1,6 @@ -FROM fedora:latest +FROM alpine:latest MAINTAINER Dalton Hubble -RUN dnf install -yq dnsmasq +RUN apk -U add dnsmasq curl COPY dnsmasq.conf /etc/dnsmasq.conf RUN mkdir -p /var/lib/tftpboot RUN curl -s -o /var/lib/tftpboot/undionly.kpxe http://boot.ipxe.org/undionly.kpxe diff --git a/dockerfiles/ipxe/dnsmasq.conf b/dockerfiles/ipxe/dnsmasq.conf index 6a817c79..81da8aa1 100644 --- a/dockerfiles/ipxe/dnsmasq.conf +++ b/dockerfiles/ipxe/dnsmasq.conf @@ -15,4 +15,3 @@ dhcp-boot=tag:ipxe,http://172.17.0.2:8080/boot.ipxe log-queries log-dhcp -conf-dir=/etc/dnsmasq.d,.rpmnew,.rpmsave,.rpmorig \ No newline at end of file