diff --git a/.gitignore b/.gitignore index 28538b5..0cf8601 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ phpstan.neon /phpunit.xml /.phpunit.cache/ ###< phpunit/phpunit ### + +docs/examples/movies/ +docs/examples/tvshows/ diff --git a/docker/Dockerfile.app b/docker/Dockerfile.app index 87fedb0..f23b6b0 100644 --- a/docker/Dockerfile.app +++ b/docker/Dockerfile.app @@ -3,6 +3,9 @@ FROM code.caldwell.digital/home/torsearch-base:php8.4 ARG APP_VERSION="0.0.0-dev" ENV APP_VERSION="${APP_VERSION}" +ARG TMDB_API="" +ENV TMDB_API="${TMDB_API}" + COPY . /app COPY --chmod=775 docker/app/entrypoint.sh /usr/local/bin/docker-entrypoint COPY docker/app/Caddyfile /etc/frankenphp/Caddyfile diff --git a/docker/Dockerfile.scheduler b/docker/Dockerfile.scheduler index 7d06720..f78159e 100644 --- a/docker/Dockerfile.scheduler +++ b/docker/Dockerfile.scheduler @@ -17,6 +17,9 @@ FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest # Set the APP_VERSION in the image ENV APP_VERSION=${APP_VERSION} +ARG TMDB_API="" +ENV TMDB_API="${TMDB_API}" + # Copy the actual application code from the previously built app COPY --chown=1000:1000 --from=app_image /app /app diff --git a/docker/Dockerfile.worker b/docker/Dockerfile.worker index c14c82f..18f5e6d 100644 --- a/docker/Dockerfile.worker +++ b/docker/Dockerfile.worker @@ -17,6 +17,9 @@ FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest # Set the APP_VERSION in the image ENV APP_VERSION=${APP_VERSION} +ARG TMDB_API="" +ENV TMDB_API="${TMDB_API}" + # Copy the actual application code from the previously built app COPY --chown=1000:1000 --from=app_image /app /app diff --git a/docs/examples/.env b/docs/examples/.env index 91bcd48..a730346 100644 --- a/docs/examples/.env +++ b/docs/examples/.env @@ -11,8 +11,8 @@ WEB_PORT=8004 # The host directories where your media is stored. # If you would like to use a docker driver for a network # share, update the compose.yml file to reflect that. -LOCAL_MOVIES_DIR="" -LOCAL_TVSHOWS_DIR="" +LOCAL_MOVIES_DIR="./movies" +LOCAL_TVSHOWS_DIR="./tvshows" # Set the timezone you're in. This helps render monitored items correctly on the calendar TZ=America/Chicago @@ -34,6 +34,8 @@ APP_ENV=prod # Mercure is a Caddy module built into the webserver # that facilitates the usage of websockets to transmit # real time data (download progress, etc.) +# TBH, I've only run into issues when changing these. If +# you have problems after changing them, just revert them. MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!" MERCURE_PUBLISHER_JWT_KEY="!ChangeThisMercureHubJWTSecretKey!" MERCURE_SUBSCRIBER_JWT_KEY="!ChangeThisMercureHubJWTSecretKey!" @@ -45,11 +47,11 @@ MERCURE_SUBSCRIBER_JWT_KEY="!ChangeThisMercureHubJWTSecretKey!" # Use the DATABASE_URL below to use the MariaDB container # provided in the example.compose.yml file, or remove this # line and fill in the details of your own MySQL/MariaDB server -MYSQL_RANDOM_ROOT_PASSWORD=true -MYSQL_DATABASE=app MYSQL_USER=app -MYSQL_PASSWORD=password +MYSQL_PASSWORD="P@ssword123" +MYSQL_DATABASE=app MYSQL_HOST=database +MYSQL_RANDOM_ROOT_PASSWORD=true DATABASE_URL="mysql://${MYSQL_USER}:${MYSQL_PASSWORD}@${MYSQL_HOST}:3306/${MYSQL_DATABASE}?serverVersion=10.11.2-MariaDB&charset=utf8mb4" @@ -60,15 +62,6 @@ DATABASE_URL="mysql://${MYSQL_USER}:${MYSQL_PASSWORD}@${MYSQL_HOST}:3306/${MYSQL REAL_DEBRID_KEY="" -################### -# TMDB # -################### -# Enter your TMDB API key -# This is used to provide rich search results when searching -# for media and rendering the Popular Movies and TV Shows section. -TMDB_API="" - - ################### # Redis # ################### diff --git a/docs/examples/compose.yml b/docs/examples/compose.yml index 0858579..6b603fc 100644 --- a/docs/examples/compose.yml +++ b/docs/examples/compose.yml @@ -43,7 +43,7 @@ services: - mysql:/var/lib/mysql env_file: .env healthcheck: - test: [ "CMD", "mysqladmin", "-u", "${MYSQL_USER}", "-p", "${MYSQL_PASSWORD}" ,"ping", "-h", "localhost" ] + test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ] interval: 5s timeout: 5s retries: 10