Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2025-12-20 02:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove entrypoint.sh as it is not needed

Browse Source 
Signed-off-by: Christian König <ckoenig@posteo.de>
This commit is contained in:
Christian König
2024-06-24 18:17:24 +02:00
parent 20145db333
commit d28c37e1e5
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build-and-test.sh
View File

@@ -2,7 +2,8 @@
set -ex set -ex
if [[ "$1" == "enter" ]]; then if [[ "$1" == "enter" ]]; then
enter="-it --entrypoint=sh" enter="-it"
cmd="sh"
fi fi
GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD | sed "s/\//-/g") GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD | sed "s/\//-/g")
@@ -20,4 +21,4 @@ docker run --rm \
--env GIT_TAG="${GIT_TAG}" \ --env GIT_TAG="${GIT_TAG}" \
--env PY_COLORS=1 \ --env PY_COLORS=1 \
--env TARGETPLATFORM="${PLATFORM}" \ --env TARGETPLATFORM="${PLATFORM}" \
${enter} image_pipenv ${enter} image_pipenv ${cmd}

5
test/Dockerfile
View File

@@ -4,7 +4,6 @@ ARG docker_version="25.0.4"
FROM docker:${docker_version}-cli-alpine${alpine_version} FROM docker:${docker_version}-cli-alpine${alpine_version}
COPY --chmod=0755 ./cmd.sh /usr/local/bin/cmd.sh COPY --chmod=0755 ./cmd.sh /usr/local/bin/cmd.sh
COPY --chmod=0755 ./entrypoint.sh /usr/local/bin/entrypoint.sh
COPY requirements.txt /root/ COPY requirements.txt /root/
WORKDIR /root WORKDIR /root
@@ -18,5 +17,5 @@ RUN apk add --no-cache \
# Tests fall over without it. Investigate later. # 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 && sed -i 's|/bin/sh|/bin/bash|g' /usr/lib/python3.11/site-packages/testinfra/backend/docker.py
ENTRYPOINT ["/bin/sh","-c","entrypoint.sh"] SHELL ["/bin/sh", "-c"]
CMD ["/bin/sh","-c","cmd.sh"] CMD ["cmd.sh"]

1
test/entrypoint.sh
View File

@@ -1 +0,0 @@
set -ex && cmd.sh