From 3723f3155f50757fef71ec46922743fe79b1c047 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Mon, 15 Jan 2024 16:27:09 -0500
Subject: [PATCH] simplify COPY layers

---
 Dockerfile               | 8 +++-----
 cryostat-entrypoint.bash | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cf51864..b61c732 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,9 +12,7 @@ RUN dnf install -y go git make gettext \
     && popd
 
 FROM registry.access.redhat.com/ubi8/ubi-micro:${runner_version}
-COPY --from=builder /usr/bin/envsubst /usr/bin/
-COPY --from=builder /root/go/bin/weed /usr/bin/weed
-COPY --from=builder /root/seaweedfs/docker/entrypoint.sh /usr/local
-COPY ./cryostat-entrypoint.bash /usr/local/
+COPY --from=builder /usr/bin/envsubst /root/go/bin/weed /root/seaweedfs/docker/entrypoint.sh /usr/bin/
+COPY ./cryostat-entrypoint.bash /usr/bin/
 COPY seaweed_conf.template.json /etc/seaweed_conf.template.json
-ENTRYPOINT ["/usr/local/cryostat-entrypoint.bash"]
+ENTRYPOINT ["/usr/bin/cryostat-entrypoint.bash"]
diff --git a/cryostat-entrypoint.bash b/cryostat-entrypoint.bash
index a84f0af..ccb2229 100755
--- a/cryostat-entrypoint.bash
+++ b/cryostat-entrypoint.bash
@@ -15,7 +15,7 @@ set -xe
 cfg="$(mktemp)"
 envsubst '$CRYOSTAT_ACCESS_KEY $CRYOSTAT_SECRET_KEY' < /etc/seaweed_conf.template.json > "${cfg}"
 
-exec /usr/local/entrypoint.sh \
+exec /usr/bin/entrypoint.sh \
     server -dir="${DATA_DIR:-/data}" \
     -s3 -s3.config="${cfg}" \
     "$@"