From d28c37e1e50ff54d2764e021f27cfcf5690e9e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Mon, 24 Jun 2024 18:17:24 +0200
Subject: [PATCH] Remove entrypoint.sh as it is not needed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 build-and-test.sh  | 5 +++--
 test/Dockerfile    | 5 ++---
 test/entrypoint.sh | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 test/entrypoint.sh

diff --git a/build-and-test.sh b/build-and-test.sh
index 3c34bbd..c56b0c8 100755
--- a/build-and-test.sh
+++ b/build-and-test.sh
@@ -2,7 +2,8 @@
 set -ex
 
 if [[ "$1" == "enter" ]]; then
-    enter="-it --entrypoint=sh"
+    enter="-it"
+    cmd="sh"
 fi
 
 GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD | sed "s/\//-/g")
@@ -20,4 +21,4 @@ docker run --rm \
     --env GIT_TAG="${GIT_TAG}" \
     --env PY_COLORS=1 \
     --env TARGETPLATFORM="${PLATFORM}" \
-    ${enter} image_pipenv
+    ${enter} image_pipenv ${cmd}
diff --git a/test/Dockerfile b/test/Dockerfile
index da65f29..fa2ceb9 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -4,7 +4,6 @@ ARG docker_version="25.0.4"
 FROM docker:${docker_version}-cli-alpine${alpine_version}
 
 COPY --chmod=0755 ./cmd.sh /usr/local/bin/cmd.sh
-COPY --chmod=0755 ./entrypoint.sh /usr/local/bin/entrypoint.sh
 COPY requirements.txt /root/
 WORKDIR /root
 
@@ -18,5 +17,5 @@ RUN apk add --no-cache \
     # Tests fall over without it. Investigate later.
     && sed -i 's|/bin/sh|/bin/bash|g' /usr/lib/python3.11/site-packages/testinfra/backend/docker.py
 
-ENTRYPOINT ["/bin/sh","-c","entrypoint.sh"]
-CMD ["/bin/sh","-c","cmd.sh"]
+SHELL ["/bin/sh", "-c"]
+CMD ["cmd.sh"]
diff --git a/test/entrypoint.sh b/test/entrypoint.sh
deleted file mode 100644
index dce4fc1..0000000
--- a/test/entrypoint.sh
+++ /dev/null
@@ -1 +0,0 @@
-set -ex && cmd.sh
\ No newline at end of file