Standard Dockerfiles, build and push for all archs

.dockerignore

@@ -1,3 +1,4 @@
-# Ignore everything except the filesystem that gets copied in
+# Ignore everything except the filesystem that gets copied in and the generated binaries
 *
-!filesystem
+!filesystem
+!dist/bin

.gitignore

@@ -10,7 +10,7 @@ certs
 .coverage
 cover
 *.tar
-*.created
+*.created-*
 docker
 **/*.sw[pon]
 birdcl

Dockerfile

@@ -0,0 +1 @@
+Dockerfile.amd64

Dockerfile-ppc64le → Dockerfile.amd64

@@ -1,5 +1,4 @@
 # Copyright (c) 2015-2016 Tigera, Inc. All rights reserved.
-# Copyright IBM Corp. 2017
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,16 +11,26 @@
 # 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 ppc64le/alpine:3.8
-MAINTAINER David Wilder <[email protected]>
+ARG BIRD_IMAGE=calico/bird:latest
+FROM ${BIRD_IMAGE} as bird
 
-# Set the minimum Docker API version required for libnetwork.
-ENV DOCKER_API_VERSION 1.21
+FROM alpine:3.8
+MAINTAINER Tom Denham <[email protected]>
+
+# Populated by build with the git version.
+ARG ver="n/a"
+ARG ARCH=amd64
+ENV NODE_VERSION=$ver
 
 # Install remaining runtime deps required for felix from the global repository
-RUN apk add --no-cache ip6tables ipset iputils iproute2 conntrack-tools runit file
+RUN apk add --no-cache ip6tables ipset iputils iproute2 conntrack-tools runit
+
+# Copy our bird binaries in
+COPY --from=bird /bird* /bin/
 
-# Copy in the filesystem - this contains felix, bird, gobgp etc...
-COPY filesystem /
+# Copy in the filesystem - this contains felix, calico-bgp-daemon etc...
+COPY filesystem/ /
+# Copy in the calico-node binary
+COPY dist/bin/calico-node-${ARCH} /bin/calico-node
 
 CMD ["start_runit"]

Dockerfile.arm64

@@ -0,0 +1,48 @@
+# Copyright (c) 2015-2016 Tigera, Inc. 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.
+ARG QEMU_IMAGE=calico/go-build:latest
+ARG BIRD_IMAGE=calico/bird:latest
+
+FROM ${QEMU_IMAGE} as qemu
+FROM ${BIRD_IMAGE} as bird
+
+FROM arm64v8/alpine:3.8 as base
+MAINTAINER Tom Denham <[email protected]>
+
+ARG ARCH=arm64
+
+# Populated by build with the git version.
+ARG ver="n/a"
+ENV NODE_VERSION=$ver
+
+# Enable non-native builds of this image on an amd64 hosts.
+# This must be the first RUN command in this file!
+# we only need this for the intermediate "base" image, so we can run all the apk and other commands
+# when running on a kernel >= 4.8, this will become less relevant
+COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/
+
+# Install remaining runtime deps required for felix from the global repository
+RUN apk add --no-cache ip6tables ipset iputils iproute2 conntrack-tools runit
+
+# Copy our bird binaries in
+COPY --from=bird /bird* /bin/
+
+# Copy in the filesystem - this contains felix, calico-bgp-daemon etc...
+COPY filesystem/ /
+# Copy in the calico-node binary
+COPY dist/bin/calico-node-${ARCH} /bin/calico-node
+
+RUN rm /usr/bin/qemu-aarch64-static
+
+CMD ["start_runit"]

Dockerfile.ppc64le

@@ -0,0 +1,48 @@
+# Copyright (c) 2015-2016 Tigera, Inc. All rights reserved.
+# Copyright IBM Corp. 2017
+#
+# 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.
+ARG QEMU_IMAGE=calico/go-build:latest
+ARG BIRD_IMAGE=calico/bird:latest
+
+FROM ${QEMU_IMAGE} as qemu
+FROM ${BIRD_IMAGE} as bird
+
+FROM ppc64le/alpine:3.8
+MAINTAINER David Wilder <[email protected]>
+
+ARG ARCH=ppc64le
+
+# Set the minimum Docker API version required for libnetwork.
+ENV DOCKER_API_VERSION 1.21
+
+# Enable non-native builds of this image on an amd64 hosts.
+# This must be the first RUN command in this file!
+# we only need this for the intermediate "base" image, so we can run all the apk and other commands
+# when running on a kernel >= 4.8, this will become less relevant
+COPY --from=qemu /usr/bin/qemu-${ARCH}-static /usr/bin/
+
+# Install remaining runtime deps required for felix from the global repository
+RUN apk add --no-cache ip6tables ipset iputils iproute2 conntrack-tools runit file
+
+# Copy our bird binaries in
+COPY --from=bird /bird* /bin/
+
+# Copy in the filesystem - this contains felix, calico-bgp-daemon etc...
+COPY filesystem/ /
+# Copy in the calico-node binary
+COPY dist/bin/calico-node-${ARCH} /bin/calico-node
+
+RUN rm /usr/bin/qemu-${ARCH}-static
+
+CMD ["start_runit"]

Dockerfile-s390x → Dockerfile.s390x

@@ -12,16 +12,36 @@
 # 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.
+ARG QEMU_IMAGE=calico/go-build:latest
+ARG BIRD_IMAGE=calico/bird:latest
+
+FROM ${QEMU_IMAGE} as qemu
+FROM ${BIRD_IMAGE} as bird
+
 FROM s390x/alpine:3.8
 MAINTAINER LoZ Open Source Ecosystem (https://www.ibm.com/developerworks/community/groups/community/lozopensource)
 
+ARG ARCH=s390x
 # Set the minimum Docker API version required for libnetwork.
 ENV DOCKER_API_VERSION 1.21
 
+# Enable non-native builds of this image on an amd64 hosts.
+# This must be the first RUN command in this file!
+# we only need this for the intermediate "base" image, so we can run all the apk and other commands
+# when running on a kernel >= 4.8, this will become less relevant
+COPY --from=qemu /usr/bin/qemu-${ARCH}-static /usr/bin/
+
 # Install remaining runtime deps required for felix from the global repository
 RUN apk add --no-cache ip6tables ipset iputils iproute2 conntrack-tools runit file
 
-# Copy in the filesystem - this contains felix, bird, gobgp etc...
-COPY filesystem /
+# Copy our bird binaries in
+COPY --from=bird /bird* /bin/
+
+# Copy in the filesystem - this contains felix, calico-bgp-daemon etc...
+COPY filesystem/ /
+# Copy in the calico-node binary
+COPY dist/bin/calico-node-${ARCH} /bin/calico-node
+
+RUN rm /usr/bin/qemu-${ARCH}-static
 
 CMD ["start_runit"]