From 9dc58247e59b2bf3c42386798f8c89a921dd8aa1 Mon Sep 17 00:00:00 2001
From: Fahmi Akbar Wildana <f.a.wildana@gmail.com>
Date: Mon, 9 Sep 2019 16:45:55 +0700
Subject: [PATCH] Fix wrong patch on glibc-busybox

because distroless/cc doesn't contain libz
---
 docker/Package.glibc-busybox.Dockerfile    | 13 ++++++++-----
 docker/Package.glibc-distroless.Dockerfile |  5 ++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/docker/Package.glibc-busybox.Dockerfile b/docker/Package.glibc-busybox.Dockerfile
index bdd4c18dd0..6191b5f04c 100644
--- a/docker/Package.glibc-busybox.Dockerfile
+++ b/docker/Package.glibc-busybox.Dockerfile
@@ -1,12 +1,15 @@
 ARG base
-FROM gcr.io/distroless/cc AS patch
+FROM debian:stable-slim AS patch
 FROM ${base}
 
 ARG artifact
 COPY ${artifact} /bin/
 
-COPY --from=patch /lib/x86_64-linux-gnu/libz*       /lib/x86_64-linux-gnu/
-COPY --from=patch /lib/x86_64-linux-gnu/libdl*      /lib/x86_64-linux-gnu/
-COPY --from=patch /lib/x86_64-linux-gnu/librt*      /lib/x86_64-linux-gnu/
-COPY --from=patch /lib/x86_64-linux-gnu/libgcc_s*   /lib/x86_64-linux-gnu/
+COPY --from=patch                       \
+    /lib/x86_64-linux-gnu/libz.so.1     \
+    /lib/x86_64-linux-gnu/libdl.so.2    \
+    /lib/x86_64-linux-gnu/librt.so.1    \
+    /lib/x86_64-linux-gnu/libgcc_s.so.1 \
+    /lib/x86_64-linux-gnu/
+
 ENTRYPOINT ["/bin/nu"]
\ No newline at end of file
diff --git a/docker/Package.glibc-distroless.Dockerfile b/docker/Package.glibc-distroless.Dockerfile
index 250146f88e..42768fc08c 100644
--- a/docker/Package.glibc-distroless.Dockerfile
+++ b/docker/Package.glibc-distroless.Dockerfile
@@ -5,5 +5,8 @@ FROM ${base}
 ARG artifact
 COPY ${artifact} /bin/
 
-COPY --from=patch /lib/x86_64-linux-gnu/libz.so.1 /lib/x86_64-linux-gnu/libz.so.1
+COPY --from=patch                   \
+    /lib/x86_64-linux-gnu/libz.so.1 \
+    /lib/x86_64-linux-gnu/
+
 ENTRYPOINT ["/bin/nu"]
\ No newline at end of file