Commit a6a3d145 authored by Geoff Simmons's avatar Geoff Simmons

Fix the haproxy container build.

For this it is necessary to abandon go get to download k8s-crt-dnldr,
and use git clone && make instead. The reasons for that are detailed
in commit message fe1fc4f of the k8s-crt-dnldr repo.
parent 379a3129
......@@ -8,9 +8,8 @@ RUN go get -d -v github.com/slimhazard/gogitversion && \
cd /go/src/github.com/slimhazard/gogitversion && \
make install
RUN go get -d -v code.uplex.de/k8s/k8s-crt-dnldr/cmd
RUN cd /go/src/code.uplex.de/k8s/k8s-crt-dnldr && make k8s-crt-dnldr
RUN cd /go && git clone https://code.uplex.de/k8s/k8s-crt-dnldr.git && \
cd /go/k8s-crt-dnldr && make k8s-crt-dnldr
RUN cd /go && git clone https://github.com/haproxytech/dataplaneapi.git && \
cd /go/dataplaneapi && git checkout ${dataplane_version} && make build
......@@ -20,7 +19,7 @@ FROM debian:${debian_tag}
COPY buster-backports.list /etc/apt/sources.list.d/
ARG haproxy_version=2.2.9-1~bpo10+1
ARG haproxy_version=2.2.9-2~bpo10+1
RUN apt-get update -q && \
apt-get install -y -q haproxy=${haproxy_version} && \
......@@ -29,7 +28,7 @@ RUN apt-get update -q && \
rm -rf /var/lib/apt/lists/* && rm -rf /etc/haproxy/errors && \
rm -rf /usr/share/doc && rm -rf /usr/share/man
COPY --from=builder /go/src/code.uplex.de/k8s/k8s-crt-dnldr/k8s-crt-dnldr /usr/bin/
COPY --from=builder /go/k8s-crt-dnldr/k8s-crt-dnldr /usr/bin/
COPY --from=builder /go/dataplaneapi/build/dataplaneapi /usr/bin/
COPY haproxy.cfg /etc/haproxy/
RUN /bin/chmod 755 /usr/bin/dataplaneapi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment