github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2310 from justincormack/binfmt-basedir

Browse Source 
Add mountpoint to binfmt image
This commit is contained in:
Justin Cormack 2017-07-27 16:34:50 +01:00 committed by GitHub
commit 280ee41e34
13 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blueprints/docker-for-mac/base.yml
View File

@ -16,7 +16,7 @@ onboot:
- name: sysfs - name: sysfs
image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc
- name: binfmt - name: binfmt
image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
# Format and mount the disk image in /var/lib/docker # Format and mount the disk image in /var/lib/docker
- name: format - name: format
image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61

2
examples/docker.yml
View File

@ -12,7 +12,7 @@ onboot:
- name: sysfs - name: sysfs
image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc
- name: binfmt - name: binfmt
image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
- name: format - name: format
image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61
- name: mount - name: mount

2
linuxkit.yml
View File

@ -10,7 +10,7 @@ onboot:
- name: sysctl - name: sysctl
image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
- name: binfmt - name: binfmt
image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]

3
pkg/binfmt/Dockerfile
View File

@ -12,11 +12,14 @@ ENV GOPATH=/go PATH=$PATH:/go/bin
COPY main.go /go/src/binfmt/ COPY main.go /go/src/binfmt/
RUN go-compile.sh /go/src/binfmt RUN go-compile.sh /go/src/binfmt
RUN mkdir /binfmt_misc
FROM scratch FROM scratch
ENTRYPOINT [] ENTRYPOINT []
WORKDIR / WORKDIR /
COPY --from=qemu usr/bin/qemu-* usr/bin/ COPY --from=qemu usr/bin/qemu-* usr/bin/
COPY --from=mirror /go/bin/binfmt usr/bin/binfmt COPY --from=mirror /go/bin/binfmt usr/bin/binfmt
COPY --from=mirror /binfmt_misc /binfmt_misc/
COPY etc/binfmt.d/00_linuxkit.conf etc/binfmt.d/00_linuxkit.conf COPY etc/binfmt.d/00_linuxkit.conf etc/binfmt.d/00_linuxkit.conf
CMD ["/usr/bin/binfmt", "-dir", "/etc/binfmt.d/", "-mount", "/binfmt_misc"] CMD ["/usr/bin/binfmt", "-dir", "/etc/binfmt.d/", "-mount", "/binfmt_misc"]
LABEL org.mobyproject.config='{"binds": ["/proc/sys/fs/binfmt_misc:/binfmt_misc"], "readonly": true, "net": "new", "ipc": "new"}' LABEL org.mobyproject.config='{"binds": ["/proc/sys/fs/binfmt_misc:/binfmt_misc"], "readonly": true, "net": "new", "ipc": "new"}'

2
projects/compose/compose-dynamic.yml
View File

@ -15,7 +15,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: binfmt - name: binfmt
image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
- name: format - name: format
image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61
- name: mount - name: mount

2
projects/compose/compose-static.yml
View File

@ -15,7 +15,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: binfmt - name: binfmt
image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
- name: format - name: format
image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61
- name: mount - name: mount

2
projects/ima-namespace/ima-namespace.yml
View File

@ -11,7 +11,7 @@ onboot:
- name: sysctl - name: sysctl
image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
- name: binfmt - name: binfmt
image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]

2
projects/kubernetes/kube-master.yml
View File

@ -12,7 +12,7 @@ onboot:
- name: sysfs - name: sysfs
image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc
- name: binfmt - name: binfmt
image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]

2
projects/kubernetes/kube-node.yml
View File

@ -12,7 +12,7 @@ onboot:
- name: sysfs - name: sysfs
image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc
- name: binfmt - name: binfmt
image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]

2
projects/logging/examples/logging.yml
View File

@ -11,7 +11,7 @@ onboot:
- name: sysctl - name: sysctl
image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
- name: binfmt - name: binfmt
image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]

2
projects/shiftfs/shiftfs.yml
View File

@ -10,7 +10,7 @@ onboot:
- name: sysctl - name: sysctl
image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
- name: binfmt - name: binfmt
image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]

2
test/cases/030_security/000_docker-bench/test-docker-bench.yml
View File

@ -12,7 +12,7 @@ onboot:
- name: sysfs - name: sysfs
image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc
- name: binfmt - name: binfmt
image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
- name: format - name: format
image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61
- name: mount - name: mount

2
test/cases/040_packages/002_binfmt/test-binfmt.yml
View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
onboot: onboot:
- name: binfmt - name: binfmt
image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5 image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
- name: test - name: test
image: alpine:3.6 image: alpine:3.6
readonly: true readonly: true