diff --git a/dockerized/.env.example b/dockerized/.env.example index 9d20802..c488ff3 100644 --- a/dockerized/.env.example +++ b/dockerized/.env.example @@ -8,8 +8,8 @@ GIT_REF=main PUBLIC_SCHEME=https APP_DOMAIN=nyone.example.com HLS_DOMAIN=nyone-hls.example.com -APP_HTTP_PORT=8080 -RTMP_PUBLIC_PORT=19935 +APP_HTTP_PORT=80 +RTMP_PUBLIC_PORT=1935 APP_NAME=Nyone APP_ENV=production diff --git a/dockerized/docker-compose.yml b/dockerized/docker-compose.yml index c5515c0..3876066 100644 --- a/dockerized/docker-compose.yml +++ b/dockerized/docker-compose.yml @@ -38,13 +38,13 @@ x-app-environment: &app-environment MAIL_MAILER: ${MAIL_MAILER:-log} MAIL_SCHEME: ${MAIL_SCHEME:-} MAIL_HOST: ${MAIL_HOST:-127.0.0.1} - MAIL_PORT: ${MAIL_PORT:-2525} + MAIL_PORT: ${MAIL_PORT:-25} MAIL_USERNAME: ${MAIL_USERNAME:-} MAIL_PASSWORD: ${MAIL_PASSWORD:-} MAIL_FROM_ADDRESS: ${MAIL_FROM_ADDRESS:-hello@example.com} MAIL_FROM_NAME: ${MAIL_FROM_NAME:-Nyone} VITE_APP_NAME: ${APP_NAME:-Nyone} - STREAMING_RTMP_INGEST_URL: rtmp://${APP_DOMAIN:-nyone.example.com}:${RTMP_PUBLIC_PORT:-19935} + STREAMING_RTMP_INGEST_URL: rtmp://${APP_DOMAIN:-nyone.example.com}:${RTMP_PUBLIC_PORT:-1935} STREAMING_HLS_PUBLIC_URL: ${PUBLIC_SCHEME:-https}://${HLS_DOMAIN:-nyone-hls.example.com} STREAMING_MEDIAMTX_API_URL: http://mediamtx:9997 STREAMING_VIEWER_COUNT_CACHE_STORE: redis @@ -59,7 +59,7 @@ x-app-environment: &app-environment MEDIAMTX_SHARED_SECRET: ${MEDIAMTX_SHARED_SECRET:-} APP_DOMAIN: ${APP_DOMAIN:-nyone.example.com} HLS_DOMAIN: ${HLS_DOMAIN:-nyone-hls.example.com} - HLS_INTERNAL_PORT: 19988 + HLS_INTERNAL_PORT: 8888 APP_OPTIMIZE_ON_BOOT: ${APP_OPTIMIZE_ON_BOOT:-true} SEED_DATABASE: ${SEED_DATABASE:-false} @@ -86,7 +86,7 @@ services: <<: *app-environment CONTAINER_ROLE: app ports: - - "${APP_HTTP_PORT:-8080}:80" + - "${APP_HTTP_PORT:-80}:80" healthcheck: test: ["CMD-SHELL", "curl -fsS http://127.0.0.1/up >/dev/null || exit 1"] interval: 30s @@ -145,10 +145,10 @@ services: APP_URL: ${PUBLIC_SCHEME:-https}://${APP_DOMAIN:-nyone.example.com} HLS_PUBLIC_URL: ${PUBLIC_SCHEME:-https}://${HLS_DOMAIN:-nyone-hls.example.com} MEDIAMTX_SHARED_SECRET: ${MEDIAMTX_SHARED_SECRET:-} - RTMP_INTERNAL_PORT: 19935 - HLS_INTERNAL_PORT: 19988 + RTMP_INTERNAL_PORT: 1935 + HLS_INTERNAL_PORT: 8888 ports: - - "${RTMP_PUBLIC_PORT:-19935}:19935" + - "${RTMP_PUBLIC_PORT:-1935}:1935" volumes: - app-storage:/var/www/html/storage depends_on: diff --git a/dockerized/docker/mediamtx/entrypoint.sh b/dockerized/docker/mediamtx/entrypoint.sh index 63c03b6..44a086e 100644 --- a/dockerized/docker/mediamtx/entrypoint.sh +++ b/dockerized/docker/mediamtx/entrypoint.sh @@ -12,8 +12,8 @@ fi : "${APP_URL:?APP_URL is required.}" : "${HLS_PUBLIC_URL:?HLS_PUBLIC_URL is required.}" -: "${RTMP_INTERNAL_PORT:=19935}" -: "${HLS_INTERNAL_PORT:=19988}" +: "${RTMP_INTERNAL_PORT:=1935}" +: "${HLS_INTERNAL_PORT:=8888}" mkdir -p /config /var/www/html/storage/app/private/recordings @@ -32,4 +32,3 @@ if [ -x /mediamtx ]; then fi fail "MediaMTX binary was not found in the base image." -