b8d000853e
Automatic merge from submit-queue Cross-build hyperkube and debian-iptables for ARM. Also add a flannel image We have to be able to build complex docker images too on `amd64` hosts. Right now we can't build Dockerfiles with `RUN` commands when building for other architectures e.g. ARM. Resin has a tutorial about this here: https://resin.io/blog/building-arm-containers-on-any-x86-machine-even-dockerhub/ But it's a bit clumsy syntax. The other alternative would be running this command in a Makefile: ``` # This registers in the kernel that ARM binaries should be run by /usr/bin/qemu-{ARCH}-static docker run --rm --privileged multiarch/qemu-user-static:register --reset ``` and ``` ADD https://github.com/multiarch/qemu-user-static/releases/download/v2.5.0/x86_64_qemu-arm-static.tar.xz /usr/bin ``` Then the kernel will be able to differ ARM binaries from amd64. When it finds a ARM binary, it will invoke `/usr/bin/qemu-arm-static` first and lets `qemu` translate the ARM syscalls to amd64 ones. Some code here: https://github.com/multiarch WDYT is the best approach? If registering `binfmt_misc` in the kernels of the machines is OK, then I think we should go with that. Otherwise, we'll have to wait for resin's patch to be merged into mainline qemu before we may use the code I have here now. @fgrzadkowski @david-mcmahon @brendandburns @zmerlynn @ixdy @ihmccreery @thockin
55 lines
1.9 KiB
Docker
55 lines
1.9 KiB
Docker
# Copyright 2016 The Kubernetes Authors All rights reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
FROM BASEIMAGE
|
|
|
|
# If we're building for another architecture than amd64, the CROSS_BUILD_ placeholder is removed so e.g. CROSS_BUILD_COPY turns into COPY
|
|
# If we're building normally, for amd64, CROSS_BUILD lines are removed
|
|
CROSS_BUILD_COPY qemu-ARCH-static /usr/bin/
|
|
|
|
RUN DEBIAN_FRONTEND=noninteractive apt-get update -y \
|
|
&& DEBIAN_FRONTEND=noninteractive apt-get -yy -q \
|
|
install \
|
|
iptables \
|
|
ethtool \
|
|
ca-certificates \
|
|
file \
|
|
util-linux \
|
|
socat \
|
|
curl \
|
|
git \
|
|
&& DEBIAN_FRONTEND=noninteractive apt-get autoremove -y \
|
|
&& DEBIAN_FRONTEND=noninteractive apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
|
|
|
RUN cp /usr/bin/nsenter /nsenter
|
|
|
|
COPY hyperkube /hyperkube
|
|
RUN chmod a+rx /hyperkube
|
|
|
|
COPY master-multi.json /etc/kubernetes/manifests-multi/master.json
|
|
COPY kube-proxy.json /etc/kubernetes/manifests-multi/kube-proxy.json
|
|
|
|
COPY master.json /etc/kubernetes/manifests/master.json
|
|
COPY etcd.json /etc/kubernetes/manifests/etcd.json
|
|
COPY kube-proxy.json /etc/kubernetes/manifests/kube-proxy.json
|
|
|
|
COPY safe_format_and_mount /usr/share/google/safe_format_and_mount
|
|
RUN chmod a+rx /usr/share/google/safe_format_and_mount
|
|
|
|
COPY setup-files.sh /setup-files.sh
|
|
RUN chmod a+rx /setup-files.sh
|
|
|
|
COPY make-ca-cert.sh /make-ca-cert.sh
|
|
RUN chmod a+x /make-ca-cert.sh
|