From 78ce724171cb76ce1bfa84c96fdeb1303a457515 Mon Sep 17 00:00:00 2001
From: Simon Marsh <simon@burble.com>
Date: Tue, 12 Jan 2021 09:16:30 +0000
Subject: [PATCH] Fix bindata build step and parameterize docker build

---
 .travis.yml                            |  3 ++-
 frontend/Dockerfile                    | 19 +++++++++++++++++++
 frontend/Dockerfile.amd64              | 10 ----------
 frontend/Dockerfile.arm32v7            | 10 ----------
 frontend/Dockerfile.arm64v8            | 10 ----------
 frontend/Dockerfile.i386               | 10 ----------
 frontend/Dockerfile.ppc64le            | 10 ----------
 frontend/Dockerfile.s390x              | 10 ----------
 proxy/{Dockerfile.amd64 => Dockerfile} |  9 +++++++--
 proxy/Dockerfile.arm32v7               | 23 -----------------------
 proxy/Dockerfile.arm64v8               | 23 -----------------------
 proxy/Dockerfile.i386                  | 23 -----------------------
 proxy/Dockerfile.ppc64le               | 23 -----------------------
 proxy/Dockerfile.s390x                 | 23 -----------------------
 14 files changed, 28 insertions(+), 178 deletions(-)
 create mode 100644 frontend/Dockerfile
 delete mode 100644 frontend/Dockerfile.amd64
 delete mode 100644 frontend/Dockerfile.arm32v7
 delete mode 100644 frontend/Dockerfile.arm64v8
 delete mode 100644 frontend/Dockerfile.i386
 delete mode 100644 frontend/Dockerfile.ppc64le
 delete mode 100644 frontend/Dockerfile.s390x
 rename proxy/{Dockerfile.amd64 => Dockerfile} (81%)
 delete mode 100644 proxy/Dockerfile.arm32v7
 delete mode 100644 proxy/Dockerfile.arm64v8
 delete mode 100644 proxy/Dockerfile.i386
 delete mode 100644 proxy/Dockerfile.ppc64le
 delete mode 100644 proxy/Dockerfile.s390x

diff --git a/.travis.yml b/.travis.yml
index 2c29d42..5af0ba9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,8 +31,9 @@ script:
   - |
     # Build image
     docker build \
+      --build-arg IMAGE_ARCH=$IMAGE_ARCH \
       -t $DOCKER_USERNAME/$IMAGE_NAME:$IMAGE_ARCH \
-      -f $PROGRAM/Dockerfile.$IMAGE_ARCH \
+      -f $PROGRAM/Dockerfile \
       $PROGRAM
 
     # Tag image :{arch} and :{arch}-build{build number}
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
new file mode 100644
index 0000000..f86252e
--- /dev/null
+++ b/frontend/Dockerfile
@@ -0,0 +1,19 @@
+FROM golang:buster AS step_0
+#
+# IMAGE_ARCH is the binary format of the final output
+# BUILD_ARCH is the binaary format of the build host
+#
+ARG IMAGE_ARCH=amd64
+ARG BUILD_ARCH=amd64
+#
+ENV CGO_ENABLED=0 GOOS=linux GOARCH=$IMAGE_ARCH GO111MODULE=on
+WORKDIR /root
+COPY . .
+# go-bindata is run on the build host as part of the go generate step
+RUN GOARCH=$BUILD_ARCH go get -u github.com/kevinburke/go-bindata/...
+RUN go generate
+RUN go build -ldflags "-w -s" -o /frontend
+
+FROM scratch AS step_1
+COPY --from=step_0 /frontend /
+ENTRYPOINT ["/frontend"]
diff --git a/frontend/Dockerfile.amd64 b/frontend/Dockerfile.amd64
deleted file mode 100644
index f0e62ad..0000000
--- a/frontend/Dockerfile.amd64
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM golang:buster AS step_0
-ENV CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on
-WORKDIR /root
-COPY . .
-RUN go generate
-RUN go build -o /frontend
-
-FROM scratch AS step_1
-COPY --from=step_0 /frontend /
-ENTRYPOINT ["/frontend"]
diff --git a/frontend/Dockerfile.arm32v7 b/frontend/Dockerfile.arm32v7
deleted file mode 100644
index 4c63217..0000000
--- a/frontend/Dockerfile.arm32v7
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM golang:buster AS step_0
-ENV CGO_ENABLED=0 GOOS=linux GOARCH=arm GO111MODULE=on
-WORKDIR /root
-COPY . .
-RUN go generate
-RUN go build -o /frontend
-
-FROM scratch AS step_1
-COPY --from=step_0 /frontend /
-ENTRYPOINT ["/frontend"]
diff --git a/frontend/Dockerfile.arm64v8 b/frontend/Dockerfile.arm64v8
deleted file mode 100644
index 982f66c..0000000
--- a/frontend/Dockerfile.arm64v8
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM golang:buster AS step_0
-ENV CGO_ENABLED=0 GOOS=linux GOARCH=arm64 GO111MODULE=on
-WORKDIR /root
-COPY . .
-RUN go generate
-RUN go build -o /frontend
-
-FROM scratch AS step_1
-COPY --from=step_0 /frontend /
-ENTRYPOINT ["/frontend"]
diff --git a/frontend/Dockerfile.i386 b/frontend/Dockerfile.i386
deleted file mode 100644
index 72a2cdb..0000000
--- a/frontend/Dockerfile.i386
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM golang:buster AS step_0
-ENV CGO_ENABLED=0 GOOS=linux GOARCH=386 GO111MODULE=on
-WORKDIR /root
-COPY . .
-RUN go generate
-RUN go build -o /frontend
-
-FROM scratch AS step_1
-COPY --from=step_0 /frontend /
-ENTRYPOINT ["/frontend"]
diff --git a/frontend/Dockerfile.ppc64le b/frontend/Dockerfile.ppc64le
deleted file mode 100644
index 8422b19..0000000
--- a/frontend/Dockerfile.ppc64le
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM golang:buster AS step_0
-ENV CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le GO111MODULE=on
-WORKDIR /root
-COPY . .
-RUN go generate
-RUN go build -o /frontend
-
-FROM scratch AS step_1
-COPY --from=step_0 /frontend /
-ENTRYPOINT ["/frontend"]
diff --git a/frontend/Dockerfile.s390x b/frontend/Dockerfile.s390x
deleted file mode 100644
index 3f8c8dc..0000000
--- a/frontend/Dockerfile.s390x
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM golang:buster AS step_0
-ENV CGO_ENABLED=0 GOOS=linux GOARCH=s390x GO111MODULE=on
-WORKDIR /root
-COPY . .
-RUN go generate
-RUN go build -o /frontend
-
-FROM scratch AS step_1
-COPY --from=step_0 /frontend /
-ENTRYPOINT ["/frontend"]
diff --git a/proxy/Dockerfile.amd64 b/proxy/Dockerfile
similarity index 81%
rename from proxy/Dockerfile.amd64
rename to proxy/Dockerfile
index 2f31ec6..f5f9646 100644
--- a/proxy/Dockerfile.amd64
+++ b/proxy/Dockerfile
@@ -1,8 +1,13 @@
 FROM golang:buster AS step_0
-ENV CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on
+#
+# IMAGE_ARCH is the binary format of the final output
+#
+ARG IMAGE_ARCH=amd64
+#
+ENV CGO_ENABLED=0 GOOS=linux GOARCH=$IMAGE_ARCH GO111MODULE=on
 WORKDIR /root
 COPY . .
-RUN go build -o /proxy
+RUN go build -ldflags "-w -s" -o /proxy
 
 FROM amd64/debian AS step_1
 ENV TARGET_ARCH=x86_64
diff --git a/proxy/Dockerfile.arm32v7 b/proxy/Dockerfile.arm32v7
deleted file mode 100644
index 4c66e4a..0000000
--- a/proxy/Dockerfile.arm32v7
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM golang:buster AS step_0
-ENV CGO_ENABLED=0 GOOS=linux GOARCH=arm GO111MODULE=on
-WORKDIR /root
-COPY . .
-RUN go build -o /proxy
-
-FROM arm32v7/debian AS step_1
-ENV TARGET_ARCH=arm
-WORKDIR /root
-RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y \
-        build-essential musl-dev musl-tools tar wget git
-RUN git clone https://github.com/sabotage-linux/kernel-headers.git
-RUN wget https://sourceforge.net/projects/traceroute/files/traceroute/traceroute-2.1.0/traceroute-2.1.0.tar.gz/download \
-        -O traceroute-2.1.0.tar.gz
-RUN tar xvf traceroute-2.1.0.tar.gz \
-    && cd traceroute-2.1.0 \
-    && make -j4 CC=musl-gcc CFLAGS="-I/root/kernel-headers/${TARGET_ARCH}/include" LDFLAGS="-static"
-
-FROM scratch AS step_2
-ENV PATH=/
-COPY --from=step_0 /proxy /
-COPY --from=step_1 /root/traceroute-2.1.0/traceroute/traceroute /
-ENTRYPOINT ["/proxy"]
diff --git a/proxy/Dockerfile.arm64v8 b/proxy/Dockerfile.arm64v8
deleted file mode 100644
index 1faba0e..0000000
--- a/proxy/Dockerfile.arm64v8
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM golang:buster AS step_0
-ENV CGO_ENABLED=0 GOOS=linux GOARCH=arm64 GO111MODULE=on
-WORKDIR /root
-COPY . .
-RUN go build -o /proxy
-
-FROM arm64v8/debian AS step_1
-ENV TARGET_ARCH=arm64
-WORKDIR /root
-RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y \
-        build-essential musl-dev musl-tools tar wget git
-RUN git clone https://github.com/sabotage-linux/kernel-headers.git
-RUN wget https://sourceforge.net/projects/traceroute/files/traceroute/traceroute-2.1.0/traceroute-2.1.0.tar.gz/download \
-        -O traceroute-2.1.0.tar.gz
-RUN tar xvf traceroute-2.1.0.tar.gz \
-    && cd traceroute-2.1.0 \
-    && make -j4 CC=musl-gcc CFLAGS="-I/root/kernel-headers/${TARGET_ARCH}/include" LDFLAGS="-static"
-
-FROM scratch AS step_2
-ENV PATH=/
-COPY --from=step_0 /proxy /
-COPY --from=step_1 /root/traceroute-2.1.0/traceroute/traceroute /
-ENTRYPOINT ["/proxy"]
diff --git a/proxy/Dockerfile.i386 b/proxy/Dockerfile.i386
deleted file mode 100644
index e204d0c..0000000
--- a/proxy/Dockerfile.i386
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM golang:buster AS step_0
-ENV CGO_ENABLED=0 GOOS=linux GOARCH=386 GO111MODULE=on
-WORKDIR /root
-COPY . .
-RUN go build -o /proxy
-
-FROM i386/debian AS step_1
-ENV TARGET_ARCH=x86
-WORKDIR /root
-RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y \
-        build-essential musl-dev musl-tools tar wget git
-RUN git clone https://github.com/sabotage-linux/kernel-headers.git
-RUN wget https://sourceforge.net/projects/traceroute/files/traceroute/traceroute-2.1.0/traceroute-2.1.0.tar.gz/download \
-        -O traceroute-2.1.0.tar.gz
-RUN tar xvf traceroute-2.1.0.tar.gz \
-    && cd traceroute-2.1.0 \
-    && make -j4 CC=musl-gcc CFLAGS="-I/root/kernel-headers/${TARGET_ARCH}/include" LDFLAGS="-static"
-
-FROM scratch AS step_2
-ENV PATH=/
-COPY --from=step_0 /proxy /
-COPY --from=step_1 /root/traceroute-2.1.0/traceroute/traceroute /
-ENTRYPOINT ["/proxy"]
diff --git a/proxy/Dockerfile.ppc64le b/proxy/Dockerfile.ppc64le
deleted file mode 100644
index 407508f..0000000
--- a/proxy/Dockerfile.ppc64le
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM golang:buster AS step_0
-ENV CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le GO111MODULE=on
-WORKDIR /root
-COPY . .
-RUN go build -o /proxy
-
-FROM ppc64le/debian AS step_1
-ENV TARGET_ARCH=ppc64le
-WORKDIR /root
-RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y \
-        build-essential musl-dev musl-tools tar wget git
-RUN git clone https://github.com/sabotage-linux/kernel-headers.git
-RUN wget https://sourceforge.net/projects/traceroute/files/traceroute/traceroute-2.1.0/traceroute-2.1.0.tar.gz/download \
-        -O traceroute-2.1.0.tar.gz
-RUN tar xvf traceroute-2.1.0.tar.gz \
-    && cd traceroute-2.1.0 \
-    && make -j4 CC=musl-gcc CFLAGS="-I/root/kernel-headers/${TARGET_ARCH}/include" LDFLAGS="-static"
-
-FROM scratch AS step_2
-ENV PATH=/
-COPY --from=step_0 /proxy /
-COPY --from=step_1 /root/traceroute-2.1.0/traceroute/traceroute /
-ENTRYPOINT ["/proxy"]
diff --git a/proxy/Dockerfile.s390x b/proxy/Dockerfile.s390x
deleted file mode 100644
index f6157aa..0000000
--- a/proxy/Dockerfile.s390x
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM golang:buster AS step_0
-ENV CGO_ENABLED=0 GOOS=linux GOARCH=s390x GO111MODULE=on
-WORKDIR /root
-COPY . .
-RUN go build -o /proxy
-
-FROM s390x/debian AS step_1
-ENV TARGET_ARCH=s390
-WORKDIR /root
-RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y \
-        build-essential musl-dev musl-tools tar wget git
-RUN git clone https://github.com/sabotage-linux/kernel-headers.git
-RUN wget https://sourceforge.net/projects/traceroute/files/traceroute/traceroute-2.1.0/traceroute-2.1.0.tar.gz/download \
-        -O traceroute-2.1.0.tar.gz
-RUN tar xvf traceroute-2.1.0.tar.gz \
-    && cd traceroute-2.1.0 \
-    && make -j4 CC=musl-gcc CFLAGS="-I/root/kernel-headers/${TARGET_ARCH}/include" LDFLAGS="-static"
-
-FROM scratch AS step_2
-ENV PATH=/
-COPY --from=step_0 /proxy /
-COPY --from=step_1 /root/traceroute-2.1.0/traceroute/traceroute /
-ENTRYPOINT ["/proxy"]