Merge pull request #2310 from justincormack/binfmt-basedir

Add mountpoint to binfmt image
2025-07-20 01:29:07 +00:00 · 2017-07-27 16:34:50 +01:00 · 2017-07-27 16:34:50 +01:00 · 280ee41e34
commit 280ee41e34
parent 2c58fbc01a 7211045ba6
13 changed files with 15 additions and 12 deletions
--- a/blueprints/docker-for-mac/base.yml
+++ b/blueprints/docker-for-mac/base.yml
@ -16,7 +16,7 @@ onboot:
  - name: sysfs
    image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc
  - name: binfmt
-    image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5
+    image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
  # Format and mount the disk image in /var/lib/docker
  - name: format
    image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61
--- a/examples/docker.yml
+++ b/examples/docker.yml
@ -12,7 +12,7 @@ onboot:
  - name: sysfs
    image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc
  - name: binfmt
-    image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5
+    image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
  - name: format
    image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61
  - name: mount
--- a/linuxkit.yml
+++ b/linuxkit.yml
@ -10,7 +10,7 @@ onboot:
  - name: sysctl
    image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
  - name: binfmt
-    image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5
+    image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
  - name: dhcpcd
    image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
--- a/pkg/binfmt/Dockerfile
+++ b/pkg/binfmt/Dockerfile
@ -12,11 +12,14 @@ ENV GOPATH=/go PATH=$PATH:/go/bin
 COPY main.go /go/src/binfmt/
 RUN go-compile.sh /go/src/binfmt

+RUN mkdir /binfmt_misc
+
 FROM scratch
 ENTRYPOINT []
 WORKDIR /
 COPY --from=qemu usr/bin/qemu-* usr/bin/
 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
 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"}'
--- a/projects/compose/compose-dynamic.yml
+++ b/projects/compose/compose-dynamic.yml
@ -15,7 +15,7 @@ onboot:
    image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
  - name: binfmt
-    image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5
+    image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
  - name: format
    image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61
  - name: mount
--- a/projects/compose/compose-static.yml
+++ b/projects/compose/compose-static.yml
@ -15,7 +15,7 @@ onboot:
    image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
  - name: binfmt
-    image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5
+    image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
  - name: format
    image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61
  - name: mount
--- a/projects/ima-namespace/ima-namespace.yml
+++ b/projects/ima-namespace/ima-namespace.yml
@ -11,7 +11,7 @@ onboot:
  - name: sysctl
    image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
  - name: binfmt
-    image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5
+    image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
  - name: dhcpcd
    image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
--- a/projects/kubernetes/kube-master.yml
+++ b/projects/kubernetes/kube-master.yml
@ -12,7 +12,7 @@ onboot:
  - name: sysfs
    image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc
  - name: binfmt
-    image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5
+    image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
  - name: dhcpcd
    image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
--- a/projects/kubernetes/kube-node.yml
+++ b/projects/kubernetes/kube-node.yml
@ -12,7 +12,7 @@ onboot:
  - name: sysfs
    image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc
  - name: binfmt
-    image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5
+    image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
  - name: dhcpcd
    image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
--- a/projects/logging/examples/logging.yml
+++ b/projects/logging/examples/logging.yml
@ -11,7 +11,7 @@ onboot:
  - name: sysctl
    image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
  - name: binfmt
-    image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5
+    image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
  - name: dhcpcd
    image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
--- a/projects/shiftfs/shiftfs.yml
+++ b/projects/shiftfs/shiftfs.yml
@ -10,7 +10,7 @@ onboot:
  - name: sysctl
    image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
  - name: binfmt
-    image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5
+    image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
  - name: dhcpcd
    image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
--- a/test/cases/030_security/000_docker-bench/test-docker-bench.yml
+++ b/test/cases/030_security/000_docker-bench/test-docker-bench.yml
@ -12,7 +12,7 @@ onboot:
  - name: sysfs
    image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc
  - name: binfmt
-    image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5
+    image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
  - name: format
    image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61
  - name: mount
--- a/test/cases/040_packages/002_binfmt/test-binfmt.yml
+++ b/test/cases/040_packages/002_binfmt/test-binfmt.yml
@ -6,7 +6,7 @@ init:
  - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
 onboot:
  - name: binfmt
-    image: linuxkit/binfmt:0bde4ebd422099f45c5ee03217413523ad2223e5
+    image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628
  - name: test
    image: alpine:3.6
    readonly: true