-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cleanup(docker): revert dockerhub-specific warning
It has been decided to support both DockerHub and GHCR for the time being (#174 (comment)).
- Loading branch information
1 parent
c7c1d9f
commit 4d980fd
Showing
3 changed files
with
2 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
@@ -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 | ||
|
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.