Skip to content

Commit

Permalink
cleanup(docker): revert dockerhub-specific warning
Browse files Browse the repository at this point in the history
It has been decided to support both DockerHub and GHCR for the time being (#174 (comment)).
  • Loading branch information
vit-zikmund committed Jan 11, 2025
1 parent c7c1d9f commit 4d980fd
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 32 deletions.
16 changes: 2 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ LABEL org.opencontainers.image.authors="Shahar Evron <[email protected]>
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
Expand All @@ -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
Expand Down
15 changes: 0 additions & 15 deletions scripts/docker-entrypoint-dockerhub.sh

This file was deleted.

3 changes: 0 additions & 3 deletions scripts/docker-entrypoint.sh

This file was deleted.

0 comments on commit 4d980fd

Please sign in to comment.