home/torsearch
1
0
Fork 0
Code Issues 22 Pull Requests 1 Actions 3 Packages Projects 4 Releases Wiki Activity

chore: docker cleanup/refactoring

Browse Source
This commit is contained in:
Brock H Caldwell
2025-11-04 12:55:19 -06:00
parent adb79db8f5
commit 7cc48ffc73
6 changed files with 43 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/Dockerfile.base.worker
View File

@@ -27,3 +27,9 @@ RUN mkdir -p /etc/supervisor/conf.d
# We start supervisord and supervisord starts
# respective service in the configuration file.
ENTRYPOINT ["/app/bin/console", "init:worker"]
# Message transports can be enabled by passing them as command options.
# Inlcluding a number with the option will start that amount of processes
# for the transport. Not supplying a number will default to 1.
# --download --monitor OR --download 2 --monitor

23
docker/Dockerfile.scheduler
View File

@@ -1,10 +1,21 @@
FROM code.caldwell.digital/home/torsearch-base-worker:php8.4-alpine
###
# This version of Torsearch can run the scheduler, downloader, and
# worker in one container. Each process is managerd by supervisord
# and can be configured via environment variables, and more than
# one of these containers can still be run.
###
ARG APP_VERSION="0.0.0-dev"
ENV APP_VERSION="${APP_VERSION}"
# Default to latest, but should pass in a version
ARG APP_VERSION="latest"
COPY . /app
# Start with our base worker image
FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "scheduler_monitor" ]
# Set the APP_VERSION in the image
ENV APP_VERSION=${APP_VERSION}
HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0
# Copy the actual application code from the previously built app
COPY --chown=1000:1000 ./ /app
# To retain backwards compatibility, default to async & download transports
CMD [ "--async", "--download" ]

29
docker/Dockerfile.worker
View File

@@ -1,26 +1,21 @@
###
# This version of Torsearch runs the scheduler, downloader, and worker
# in this one container. Each process is managerd by supervisord
# and can be configured via environment variables and more
# than one of these containers cans till be run.
# This version of Torsearch can run the scheduler, downloader, and
# worker in one container. Each process is managerd by supervisord
# and can be configured via environment variables, and more than
# one of these containers can still be run.
###
# Default to latest, but should pass in a version
ARG APP_VERSION="latest"
FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION} AS base_image
# Start with our base worker image
FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
# Set the APP_VERSION in the image
ENV APP_VERSION=${APP_VERSION}
COPY --from=base_image --chown=1000:1000 /app /app
COPY docker/ /app/docker
# Copy the actual application code from the previously built app
COPY --chown=1000:1000 ./ /app
# We start supervisord and supervisord starts
# respective service in the configuration file.
ENTRYPOINT ["/app/bin/console", "init:worker"]
# Message transports can be enabled by passing them as command options.
# Inlcluding a number with the option will start that amount of processes
# for the transport. Not supplying a number will default to 1.
# --download --monitor OR --download 2 --monitor
# To retain backwards compatibility, default to async & download transports
CMD [ "--async", "--download" ]