diff --git a/Dockerfile b/Dockerfile index f9896bc..5a25570 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,6 +61,7 @@ ENV PGID=1000 ENV UMASK=022 ENV DOWNLOAD_DIR=/downloads +ENV AUDIO_DOWNLOAD_DIR=/downloads ENV STATE_DIR=/downloads/.metube ENV TEMP_DIR=/downloads ENV PORT=8081 diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index e1d976c..615d477 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -5,8 +5,8 @@ PGID="${GID:-$PGID}" echo "Setting umask to ${UMASK}" umask ${UMASK} -echo "Creating download directory (${DOWNLOAD_DIR}), state directory (${STATE_DIR}), and temp dir (${TEMP_DIR})" -mkdir -p "${DOWNLOAD_DIR}" "${STATE_DIR}" "${TEMP_DIR}" +echo "Creating download directory (${DOWNLOAD_DIR}), audio download directory (${AUDIO_DOWNLOAD_DIR}), state directory (${STATE_DIR}), and temp dir (${TEMP_DIR})" +mkdir -p "${DOWNLOAD_DIR}" "${AUDIO_DOWNLOAD_DIR}" "${STATE_DIR}" "${TEMP_DIR}" do_upgrade() { echo "Upgrading yt-dlp to nightly channel..." @@ -56,7 +56,7 @@ if [ `id -u` -eq 0 ] && [ `id -g` -eq 0 ]; then fi if [ "${CHOWN_DIRS:-true}" != "false" ]; then echo "Changing ownership of download and state directories to ${PUID}:${PGID}" - chown -R "${PUID}":"${PGID}" /app "${DOWNLOAD_DIR}" "${STATE_DIR}" "${TEMP_DIR}" + chown -R "${PUID}":"${PGID}" /app "${DOWNLOAD_DIR}" "${AUDIO_DOWNLOAD_DIR}" "${STATE_DIR}" "${TEMP_DIR}" fi if nightly_enabled; then echo "YTDL_NIGHTLY_UPDATE_TIME is set to ${YTDL_NIGHTLY_UPDATE_TIME}; upgrading yt-dlp on startup"