Skip to content

Commit 4d980fd

Browse files
committed
cleanup(docker): revert dockerhub-specific warning
It has been decided to support both DockerHub and GHCR for the time being (#174 (comment)).
1 parent c7c1d9f commit 4d980fd

File tree

3 files changed

+2
-32
lines changed

3 files changed

+2
-32
lines changed

Dockerfile

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ LABEL org.opencontainers.image.authors="Shahar Evron <[email protected]>
6262
ARG USER_NAME=giftless
6363
# Writable path for local LFS storage
6464
ARG STORAGE_DIR=/lfs-storage
65-
# Set to true to add a runtime dockerhub deprecation warning
66-
ARG IS_DOCKERHUB
6765
# expose shared ARGs
6866
ARG WORKDIR
6967
ARG VENV
@@ -90,23 +88,13 @@ ENV VIRTUAL_ENV="$VENV" PATH="$VENV/bin:$PATH"
9088
# Copy project source back into the same path referenced by the editable install
9189
COPY --from=builder "$WORKDIR/giftless" "giftless"
9290

93-
# Copy desired docker-entrypoint
94-
RUN --mount=target=/build-ctx set -eux ;\
95-
target_de=scripts/docker-entrypoint.sh ;\
96-
mkdir -p "$(dirname "$target_de")" ;\
97-
if [ "${IS_DOCKERHUB:-}" = true ]; then \
98-
cp /build-ctx/scripts/docker-entrypoint-dockerhub.sh "$target_de" ;\
99-
else \
100-
cp /build-ctx/scripts/docker-entrypoint.sh "$target_de" ;\
101-
fi
102-
10391
# Set runtime properties
10492
USER $USER_NAME
10593
ENV GIFTLESS_TRANSFER_ADAPTERS_basic_options_storage_options_path="$STORAGE_DIR"
10694
ENV UWSGI_MODULE="giftless.wsgi_entrypoint"
10795

108-
ENTRYPOINT ["tini", "--", "scripts/docker-entrypoint.sh"]
109-
CMD ["uwsgi", "-s", "127.0.0.1:5000", "-M", "-T", "--threads", "2", "-p", "2", \
96+
ENTRYPOINT ["tini", "--", "uwsgi"]
97+
CMD ["-s", "127.0.0.1:5000", "-M", "-T", "--threads", "2", "-p", "2", \
11098
"--manage-script-name", "--callable", "app"]
11199

112100
# TODO remove this STOPSIGNAL override after uwsgi>=2.1

scripts/docker-entrypoint-dockerhub.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

scripts/docker-entrypoint.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)