diff --git a/Dockerfile b/Dockerfile index 7986cbe..1bad441 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,6 @@ FROM docker:24.0.7-dind-alpine3.18 RUN apk update && apk --no-cache add bash curl git -RUN mv $(which sh) /bin/sh.sh; mv $(which bash /bin/bash.sh) - -COPY ./entrypoint.sh /bin/sh -COPY ./entrypoint.sh /bin/bash -RUN chmod +x /bin/sh /bin/bash +COPY ./entrypoint.sh /bin/entrypoint.sh +RUN chmod +x /bin/entrypoint.sh +ENTRYPOINT ["/bin/entrypoint.sh"] diff --git a/build.sh b/build.sh index 40bbbd0..63df4ac 100644 --- a/build.sh +++ b/build.sh @@ -1,6 +1,10 @@ #! /bin/sh +img=registry-app.inhome.blapointe.com:5001/docker +t=latest +docker rmi $img:$t + set -e -docker build -f ./Dockerfile -t registry-app.inhome.blapointe.com:5001/docker:latest . -docker push registry-app.inhome.blapointe.com:5001/docker:latest +docker build -f ./Dockerfile -t $img:$t --progress plain . +docker push $img:$t diff --git a/entrypoint.sh b/entrypoint.sh index 8fe29ec..75747b5 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,4 @@ -#! /bin/sh.sh +#! /bin/sh set -e @@ -7,4 +7,4 @@ if [ -n "$GITHUB_SERVER_URL" ] && [ -n "$GITHUB_REPOSITORY" ]; then cd ./git.d fi -exec "$0.sh" "$@" +exec bash "$@"