mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 09:16:29 +00:00
Merge pull request #2346 from justincormack/cdroms
Support multiple CDROMS in metadata
This commit is contained in:
commit
44439a77a4
@ -10,7 +10,7 @@ init:
|
|||||||
onboot:
|
onboot:
|
||||||
# support metadata for optional config in /var/config
|
# support metadata for optional config in /var/config
|
||||||
- name: metadata
|
- name: metadata
|
||||||
image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c
|
image: linuxkit/metadata:c3871ac5838e052ddb33248ceb95f86e4569aec4
|
||||||
- name: sysctl
|
- name: sysctl
|
||||||
image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
|
image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
|
||||||
- name: sysfs
|
- name: sysfs
|
||||||
|
@ -13,7 +13,7 @@ onboot:
|
|||||||
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
|
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
|
||||||
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
||||||
- name: metadata
|
- name: metadata
|
||||||
image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c
|
image: linuxkit/metadata:c3871ac5838e052ddb33248ceb95f86e4569aec4
|
||||||
services:
|
services:
|
||||||
- name: rngd
|
- name: rngd
|
||||||
image: linuxkit/rngd:6565ae49f6be29d4e64614a4df3978b972956ebf
|
image: linuxkit/rngd:6565ae49f6be29d4e64614a4df3978b972956ebf
|
||||||
|
@ -13,7 +13,7 @@ onboot:
|
|||||||
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
|
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
|
||||||
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
||||||
- name: metadata
|
- name: metadata
|
||||||
image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c
|
image: linuxkit/metadata:c3871ac5838e052ddb33248ceb95f86e4569aec4
|
||||||
services:
|
services:
|
||||||
- name: getty
|
- name: getty
|
||||||
image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02
|
image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02
|
||||||
|
@ -13,7 +13,7 @@ onboot:
|
|||||||
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
|
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
|
||||||
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
||||||
- name: metadata
|
- name: metadata
|
||||||
image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c
|
image: linuxkit/metadata:c3871ac5838e052ddb33248ceb95f86e4569aec4
|
||||||
services:
|
services:
|
||||||
- name: getty
|
- name: getty
|
||||||
image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02
|
image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02
|
||||||
|
@ -6,10 +6,13 @@ ENV GOPATH=/go PATH=$PATH:/go/bin
|
|||||||
COPY . /go/src/metadata/
|
COPY . /go/src/metadata/
|
||||||
RUN go-compile.sh /go/src/metadata
|
RUN go-compile.sh /go/src/metadata
|
||||||
|
|
||||||
|
RUN mkdir -p out/tmp out/var out/dev out/etc
|
||||||
|
|
||||||
FROM scratch
|
FROM scratch
|
||||||
ENTRYPOINT []
|
ENTRYPOINT []
|
||||||
CMD []
|
CMD []
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
COPY --from=mirror /go/bin/metadata /usr/bin/metadata
|
COPY --from=mirror /go/bin/metadata /usr/bin/metadata
|
||||||
|
COPY --from=mirror /out/ /
|
||||||
CMD ["/usr/bin/metadata"]
|
CMD ["/usr/bin/metadata"]
|
||||||
LABEL org.mobyproject.config='{"binds": ["/dev:/dev", "/var:/var", "/etc/resolv.conf:/etc/resolv.conf"], "capabilities": ["CAP_SYS_ADMIN"]}'
|
LABEL org.mobyproject.config='{"binds": ["/dev:/dev", "/var:/var", "/etc/resolv.conf:/etc/resolv.conf"], "tmpfs": ["/tmp"], "readonly": true, "capabilities": ["CAP_SYS_ADMIN"]}'
|
||||||
|
@ -14,17 +14,11 @@ const (
|
|||||||
// ConfigPath is where the data is extracted to
|
// ConfigPath is where the data is extracted to
|
||||||
ConfigPath = "/var/config"
|
ConfigPath = "/var/config"
|
||||||
|
|
||||||
// MountPoint is where the CDROM is mounted
|
|
||||||
MountPoint = "/cdrom"
|
|
||||||
|
|
||||||
// Hostname is the filename in configPath where the hostname is stored
|
// Hostname is the filename in configPath where the hostname is stored
|
||||||
Hostname = "hostname"
|
Hostname = "hostname"
|
||||||
|
|
||||||
// SSH is the path where sshd configuration from the provider is stored
|
// SSH is the path where sshd configuration from the provider is stored
|
||||||
SSH = "ssh"
|
SSH = "ssh"
|
||||||
|
|
||||||
// TODO(rneugeba): Need to check this is the same everywhere
|
|
||||||
cdromDev = "/dev/sr0"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Provider is a generic interface for metadata/userdata providers.
|
// Provider is a generic interface for metadata/userdata providers.
|
||||||
@ -48,7 +42,7 @@ var cdromProviders []Provider
|
|||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
netProviders = []Provider{NewGCP(), NewVultr(), NewAWS()}
|
netProviders = []Provider{NewGCP(), NewVultr(), NewAWS()}
|
||||||
cdromProviders = []Provider{NewCDROM()}
|
cdromProviders = ListCDROMs()
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
@ -69,19 +63,8 @@ func main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if !found {
|
if !found {
|
||||||
log.Printf("Trying CDROM")
|
|
||||||
if err := os.MkdirAll(MountPoint, 0755); err != nil {
|
|
||||||
log.Printf("CDROM: Failed to create %s: %s", MountPoint, err)
|
|
||||||
goto ErrorOut
|
|
||||||
}
|
|
||||||
if err := mountCDROM(cdromDev, MountPoint); err != nil {
|
|
||||||
log.Printf("Failed to mount cdrom: %s", err)
|
|
||||||
goto ErrorOut
|
|
||||||
}
|
|
||||||
defer syscall.Unmount(MountPoint, 0)
|
|
||||||
// Don't worry about removing MountPoint. We are in a container
|
|
||||||
|
|
||||||
for _, p = range cdromProviders {
|
for _, p = range cdromProviders {
|
||||||
|
log.Printf("Trying %s", p.String())
|
||||||
if p.Probe() {
|
if p.Probe() {
|
||||||
log.Printf("%s: Probe succeeded", p)
|
log.Printf("%s: Probe succeeded", p)
|
||||||
userdata, err = p.Extract()
|
userdata, err = p.Extract()
|
||||||
@ -91,7 +74,6 @@ func main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ErrorOut:
|
|
||||||
if !found {
|
if !found {
|
||||||
log.Printf("No metadata/userdata found. Bye")
|
log.Printf("No metadata/userdata found. Bye")
|
||||||
return
|
return
|
||||||
@ -202,9 +184,3 @@ func processUserData(data []byte) error {
|
|||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// mountCDROM mounts a CDROM/DVD device under mountPoint
|
|
||||||
func mountCDROM(device, mountPoint string) error {
|
|
||||||
// We may need to poll a little for device ready
|
|
||||||
return syscall.Mount(device, mountPoint, "iso9660", syscall.MS_RDONLY, "")
|
|
||||||
}
|
|
||||||
|
@ -3,39 +3,73 @@ package main
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"os"
|
|
||||||
"path"
|
"path"
|
||||||
|
"path/filepath"
|
||||||
|
"syscall"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
configFile = "config"
|
configFile = "config"
|
||||||
|
cdromDevs = "/dev/sr[0-9]*"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ProviderCDROM is the type implementing the Provider interface for CDROMs
|
// ProviderCDROM is the type implementing the Provider interface for CDROMs
|
||||||
// It looks for a file called 'configFile' in the root
|
// It looks for a file called 'configFile' in the root
|
||||||
type ProviderCDROM struct {
|
type ProviderCDROM struct {
|
||||||
|
device string
|
||||||
|
mountPoint string
|
||||||
|
err error
|
||||||
|
data []byte
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListCDROMs lists all the cdroms in the system
|
||||||
|
func ListCDROMs() []Provider {
|
||||||
|
cdroms, err := filepath.Glob(cdromDevs)
|
||||||
|
if err != nil {
|
||||||
|
// Glob can only error on invalid pattern
|
||||||
|
panic(fmt.Sprintf("Invalid glob pattern: %s", cdromDevs))
|
||||||
|
}
|
||||||
|
providers := []Provider{}
|
||||||
|
for _, device := range cdroms {
|
||||||
|
providers = append(providers, NewCDROM(device))
|
||||||
|
}
|
||||||
|
return providers
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewCDROM returns a new ProviderCDROM
|
// NewCDROM returns a new ProviderCDROM
|
||||||
func NewCDROM() *ProviderCDROM {
|
func NewCDROM(device string) *ProviderCDROM {
|
||||||
return &ProviderCDROM{}
|
mountPoint, err := ioutil.TempDir("", "cd")
|
||||||
|
p := ProviderCDROM{device, mountPoint, err, []byte{}}
|
||||||
|
if err == nil {
|
||||||
|
if p.err = p.mount(); p.err == nil {
|
||||||
|
p.data, p.err = ioutil.ReadFile(path.Join(p.mountPoint, configFile))
|
||||||
|
p.unmount()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return &p
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *ProviderCDROM) String() string {
|
func (p *ProviderCDROM) String() string {
|
||||||
return "CDROM"
|
return "CDROM " + p.device
|
||||||
}
|
}
|
||||||
|
|
||||||
// Probe checks if the CD has the right file
|
// Probe checks if the CD has the right file
|
||||||
func (p *ProviderCDROM) Probe() bool {
|
func (p *ProviderCDROM) Probe() bool {
|
||||||
_, err := os.Stat(path.Join(MountPoint, configFile))
|
return len(p.data) != 0
|
||||||
return (!os.IsNotExist(err))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Extract gets both the CDROM specific and generic userdata
|
// Extract gets both the CDROM specific and generic userdata
|
||||||
func (p *ProviderCDROM) Extract() ([]byte, error) {
|
func (p *ProviderCDROM) Extract() ([]byte, error) {
|
||||||
data, err := ioutil.ReadFile(path.Join(MountPoint, configFile))
|
return p.data, p.err
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("CDROM: Error reading file: %s", err)
|
|
||||||
}
|
}
|
||||||
return data, nil
|
|
||||||
|
// mount mounts a CDROM/DVD device under mountPoint
|
||||||
|
func (p *ProviderCDROM) mount() error {
|
||||||
|
// We may need to poll a little for device ready
|
||||||
|
return syscall.Mount(p.device, p.mountPoint, "iso9660", syscall.MS_RDONLY, "")
|
||||||
|
}
|
||||||
|
|
||||||
|
// unmount removes the mount
|
||||||
|
func (p *ProviderCDROM) unmount() {
|
||||||
|
_ = syscall.Unmount(p.mountPoint, 0)
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ onboot:
|
|||||||
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
|
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
|
||||||
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
||||||
- name: metadata
|
- name: metadata
|
||||||
image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c
|
image: linuxkit/metadata:c3871ac5838e052ddb33248ceb95f86e4569aec4
|
||||||
services:
|
services:
|
||||||
- name: rngd
|
- name: rngd
|
||||||
image: linuxkit/rngd:6565ae49f6be29d4e64614a4df3978b972956ebf
|
image: linuxkit/rngd:6565ae49f6be29d4e64614a4df3978b972956ebf
|
||||||
|
@ -13,7 +13,7 @@ onboot:
|
|||||||
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
|
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
|
||||||
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
||||||
- name: metadata
|
- name: metadata
|
||||||
image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c
|
image: linuxkit/metadata:c3871ac5838e052ddb33248ceb95f86e4569aec4
|
||||||
services:
|
services:
|
||||||
- name: rngd
|
- name: rngd
|
||||||
image: mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9
|
image: mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9
|
||||||
|
@ -17,7 +17,7 @@ onboot:
|
|||||||
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
|
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
|
||||||
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
||||||
- name: metadata
|
- name: metadata
|
||||||
image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c
|
image: linuxkit/metadata:c3871ac5838e052ddb33248ceb95f86e4569aec4
|
||||||
- name: format
|
- name: format
|
||||||
image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61
|
image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61
|
||||||
- name: mounts
|
- name: mounts
|
||||||
|
@ -17,7 +17,7 @@ onboot:
|
|||||||
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
|
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
|
||||||
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
||||||
- name: metadata
|
- name: metadata
|
||||||
image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c
|
image: linuxkit/metadata:c3871ac5838e052ddb33248ceb95f86e4569aec4
|
||||||
- name: format
|
- name: format
|
||||||
image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61
|
image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61
|
||||||
- name: mounts
|
- name: mounts
|
||||||
|
@ -20,7 +20,7 @@ onboot:
|
|||||||
image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d
|
image: linuxkit/mount:a738ccad4e3e009b7c5f541226e9232a6287fa5d
|
||||||
command: ["/usr/bin/mountie", "/var/lib/swarmd"]
|
command: ["/usr/bin/mountie", "/var/lib/swarmd"]
|
||||||
- name: metadata
|
- name: metadata
|
||||||
image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c
|
image: linuxkit/metadata:c3871ac5838e052ddb33248ceb95f86e4569aec4
|
||||||
services:
|
services:
|
||||||
- name: getty
|
- name: getty
|
||||||
image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02
|
image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02
|
||||||
|
Loading…
Reference in New Issue
Block a user