diff --git a/Dockerfile b/Dockerfile index 0e59e38..6f3d32b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,8 +62,6 @@ LABEL org.opencontainers.image.authors="Shahar Evron ARG USER_NAME=giftless # Writable path for local LFS storage ARG STORAGE_DIR=/lfs-storage -# Set to true to add a runtime dockerhub deprecation warning -ARG IS_DOCKERHUB # expose shared ARGs ARG WORKDIR ARG VENV @@ -90,23 +88,13 @@ ENV VIRTUAL_ENV="$VENV" PATH="$VENV/bin:$PATH" # Copy project source back into the same path referenced by the editable install COPY --from=builder "$WORKDIR/giftless" "giftless" -# Copy desired docker-entrypoint -RUN --mount=target=/build-ctx set -eux ;\ - target_de=scripts/docker-entrypoint.sh ;\ - mkdir -p "$(dirname "$target_de")" ;\ - if [ "${IS_DOCKERHUB:-}" = true ]; then \ - cp /build-ctx/scripts/docker-entrypoint-dockerhub.sh "$target_de" ;\ - else \ - cp /build-ctx/scripts/docker-entrypoint.sh "$target_de" ;\ - fi - # Set runtime properties USER $USER_NAME ENV GIFTLESS_TRANSFER_ADAPTERS_basic_options_storage_options_path="$STORAGE_DIR" ENV UWSGI_MODULE="giftless.wsgi_entrypoint" -ENTRYPOINT ["tini", "--", "scripts/docker-entrypoint.sh"] -CMD ["uwsgi", "-s", "127.0.0.1:5000", "-M", "-T", "--threads", "2", "-p", "2", \ +ENTRYPOINT ["tini", "--", "uwsgi"] +CMD ["-s", "127.0.0.1:5000", "-M", "-T", "--threads", "2", "-p", "2", \ "--manage-script-name", "--callable", "app"] # TODO remove this STOPSIGNAL override after uwsgi>=2.1 diff --git a/scripts/docker-entrypoint-dockerhub.sh b/scripts/docker-entrypoint-dockerhub.sh deleted file mode 100755 index 9499836..0000000 --- a/scripts/docker-entrypoint-dockerhub.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# Deprecation warning for images on dockerhub. - -# ANSI color codes -RED='\033[1;31m' -YELLOW='\033[1;33m' -RESET='\033[0m' - -echo "${RED}**********************************************${RESET}" -echo "${YELLOW}WARNING:${RESET} This Docker image from docker.io is deprecated!" -echo "${YELLOW}It will no longer be maintained. Please use ghcr.io/datopian/giftless." -echo "${YELLOW}Refer to https://github.com/datopian/giftless for more details." -echo "${RED}**********************************************${RESET}" - -exec "$@" diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh deleted file mode 100755 index b7984b3..0000000 --- a/scripts/docker-entrypoint.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# This is a default docker entrypoint (for pre-checks) to be conditionally overridden from Dockerfile. -exec "$@"