github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-22 18:41:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1479 from justincormack/command

Browse Source 
Revert Command->Args but remove from yaml where not needed
This commit is contained in:
Justin Cormack 2017-04-04 10:49:32 +01:00 committed by GitHub
commit 01fba0f3f5
10 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/gcp.yml
View File

@ -16,7 +16,6 @@ system:
binds: binds:
- /proc/sys/fs/binfmt_misc:/binfmt_misc - /proc/sys/fs/binfmt_misc:/binfmt_misc
readonly: true readonly: true
command: [/usr/bin/binfmt, -dir, /etc/binfmt.d/, -mount, /binfmt_misc]
- name: metadata-gcp - name: metadata-gcp
image: "mobylinux/metadata-gcp:7fc3dd5ef92e0408fb3f76048bbaae88bbb55ad9" image: "mobylinux/metadata-gcp:7fc3dd5ef92e0408fb3f76048bbaae88bbb55ad9"
binds: binds:
@ -34,7 +33,6 @@ daemon:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN
oomScoreAdj: -800 oomScoreAdj: -800
readonly: true readonly: true
command: [/bin/tini, /usr/sbin/rngd, -f]
- name: sshd - name: sshd
image: "mobylinux/sshd:4f8452ddaff703416fd7452fcd9693b96b23e847" image: "mobylinux/sshd:4f8452ddaff703416fd7452fcd9693b96b23e847"
capabilities: capabilities:

2
examples/sshd.yml
View File

@ -14,14 +14,12 @@ system:
image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01" image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01"
binds: binds:
- /proc/sys/fs/binfmt_misc:/binfmt_misc - /proc/sys/fs/binfmt_misc:/binfmt_misc
command: [/usr/bin/binfmt, -dir, /etc/binfmt.d/, -mount, /binfmt_misc]
daemon: daemon:
- name: rngd - name: rngd
image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92" image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92"
capabilities: capabilities:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN
oomScoreAdj: -800 oomScoreAdj: -800
command: [/bin/tini, /usr/sbin/rngd, -f]
- name: sshd - name: sshd
image: "mobylinux/sshd:4f8452ddaff703416fd7452fcd9693b96b23e847" image: "mobylinux/sshd:4f8452ddaff703416fd7452fcd9693b96b23e847"
capabilities: capabilities:

2
examples/vmware.yml
View File

@ -16,7 +16,6 @@ system:
binds: binds:
- /proc/sys/fs/binfmt_misc:/binfmt_misc - /proc/sys/fs/binfmt_misc:/binfmt_misc
readonly: true readonly: true
command: [/usr/bin/binfmt, -dir, /etc/binfmt.d/, -mount, /binfmt_misc]
daemon: daemon:
- name: rngd - name: rngd
image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92" image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92"
@ -24,7 +23,6 @@ daemon:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN
oomScoreAdj: -800 oomScoreAdj: -800
readonly: true readonly: true
command: [/bin/tini, /usr/sbin/rngd, -f]
- name: nginx - name: nginx
image: "nginx:alpine" image: "nginx:alpine"
capabilities: capabilities:

2
moby.yml
View File

@ -16,7 +16,6 @@ system:
binds: binds:
- /proc/sys/fs/binfmt_misc:/binfmt_misc - /proc/sys/fs/binfmt_misc:/binfmt_misc
readonly: true readonly: true
command: [/usr/bin/binfmt, -dir, /etc/binfmt.d/, -mount, /binfmt_misc]
daemon: daemon:
- name: rngd - name: rngd
image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92" image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92"
@ -24,7 +23,6 @@ daemon:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN
oomScoreAdj: -800 oomScoreAdj: -800
readonly: true readonly: true
command: [/bin/tini, /usr/sbin/rngd, -f]
- name: nginx - name: nginx
image: "nginx:alpine" image: "nginx:alpine"
capabilities: capabilities:

2
projects/miragesdk/examples/mirage-dhcp.yml
View File

@ -16,7 +16,6 @@ system:
binds: binds:
- /proc/sys/fs/binfmt_misc:/binfmt_misc - /proc/sys/fs/binfmt_misc:/binfmt_misc
readonly: true readonly: true
command: [/usr/bin/binfmt, -dir, /etc/binfmt.d/, -mount, /binfmt_misc]
daemon: daemon:
- name: rngd - name: rngd
image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92" image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92"
@ -24,7 +23,6 @@ daemon:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN
oomScoreAdj: -800 oomScoreAdj: -800
readonly: true readonly: true
command: [/bin/tini, /usr/sbin/rngd, -f]
- name: dhcp-client - name: dhcp-client
net: host net: host
image: "mobylinux/dhcp-client:f40cafe2ade4b115704750a85d21eb35b1116b91" image: "mobylinux/dhcp-client:f40cafe2ade4b115704750a85d21eb35b1116b91"

1
projects/selinux/selinux.yml
View File

@ -18,7 +18,6 @@ daemon:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN
oomScoreAdj: -800 oomScoreAdj: -800
readonly: true readonly: true
command: [/bin/tini, /usr/sbin/rngd, -f]
files: files:
- path: etc/docker/daemon.json - path: etc/docker/daemon.json
contents: '{"debug": true}' contents: '{"debug": true}'

1
projects/wireguard/examples/wireguard.yml
View File

@ -18,7 +18,6 @@ daemon:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN
oomScoreAdj: -800 oomScoreAdj: -800
readonly: true readonly: true
command: [/bin/tini, /usr/sbin/rngd, -f]
files: files:
- path: etc/docker/daemon.json - path: etc/docker/daemon.json
contents: '{"debug": true}' contents: '{"debug": true}'

6
src/cmd/moby/config.go
View File

@ -45,7 +45,7 @@ type MobyImage struct {
Mounts []specs.Mount Mounts []specs.Mount
Binds []string Binds []string
Tmpfs []string Tmpfs []string
Args []string Command []string
Env []string Env []string
Cwd string Cwd string
Net string Net string
@ -95,8 +95,8 @@ func ConfigToOCI(image *MobyImage) ([]byte, error) {
} }
args := append(config.Entrypoint, config.Cmd...) args := append(config.Entrypoint, config.Cmd...)
if len(image.Args) != 0 { if len(image.Command) != 0 {
args = image.Args args = image.Command
} }
env := config.Env env := config.Env
if len(image.Env) != 0 { if len(image.Env) != 0 {

1
test/test.yml
View File

@ -8,7 +8,6 @@ system:
binds: binds:
- /proc/sys/fs/binfmt_misc:/binfmt_misc - /proc/sys/fs/binfmt_misc:/binfmt_misc
readonly: true readonly: true
command: [/usr/bin/binfmt, -dir, /etc/binfmt.d/, -mount, /binfmt_misc]
- name: check - name: check
image: "mobylinux/check:c9e41ab96b3ea6a3ced97634751e20d12a5bf52f" image: "mobylinux/check:c9e41ab96b3ea6a3ced97634751e20d12a5bf52f"
pid: host pid: host

3
test/virtsock/test-virtsock-server.yml
View File

@ -22,12 +22,9 @@ daemon:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN
oomScoreAdj: -800 oomScoreAdj: -800
readonly: true readonly: true
command: [/bin/tini, /usr/sbin/rngd, -f]
- name: virtsock-server - name: virtsock-server
image: "mobylinux/test-virtsock:35fea96fd01f6edb67021c494ddf098fdb8bbca0" image: "mobylinux/test-virtsock:35fea96fd01f6edb67021c494ddf098fdb8bbca0"
readonly: true readonly: true
command: [/bin/tini, /bin/virtsock_stress, -s, -v, 1]
outputs: outputs:
- format: kernel+initrd - format: kernel+initrd
- format: iso-bios - format: iso-bios