Remove entrypoint.sh as it is not needed

Signed-off-by: Christian König <[email protected]>

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")
@@ -11,7 +12,7 @@ GIT_TAG="${GIT_TAG:-$GIT_BRANCH}"
 PLATFORM="${PLATFORM:-linux/amd64}"
 
 # generate and build dockerfile
-docker buildx build --load --platform=${PLATFORM} --tag image_pipenv --file test/Dockerfile test/
+docker buildx build --load --platform="${PLATFORM}" --tag image_pipenv --file test/Dockerfile test/
 docker run --rm \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume "$(pwd):/$(pwd)" \
@@ -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}

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"]

test/cmd.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env sh
 set -eux
 
-docker buildx build ./src --build-arg TARGETPLATFORM="${TARGETPLATFORM}" --tag pihole:${GIT_TAG} --no-cache
-docker images pihole:${GIT_TAG}
+docker buildx build ./src --build-arg TARGETPLATFORM="${TARGETPLATFORM}" --tag pihole:"${GIT_TAG}" --no-cache
+docker images pihole:"${GIT_TAG}"
 
 # auto-format the pytest code
 python -m black ./test/tests/