diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 56e0516..75f3d4c 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -21,3 +21,9 @@ jobs: with: context: . file: ./Dockerfile + + - name: Push Docker image to Docker Hub + run: | + echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin + docker tag scalacast:latest ${{ secrets.DOCKER_USERNAME }}/scalacast:latest + docker push ${{ secrets.DOCKER_USERNAME }}/scalacast:latest diff --git a/Dockerfile b/Dockerfile index 6ad821f..da856a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build stage for Scala -FROM ubuntu:24.04 AS scala-build +FROM ubuntu:20.04 AS scala-build WORKDIR /app # Install Java and SBT dependencies @@ -25,7 +25,7 @@ COPY src/scala ./src/scala/ RUN sbt compile # Final runtime stage -FROM ubuntu:24.04 +FROM ubuntu:20.04 WORKDIR /app ENV NODE_NAME_1=node1@127.0.0.1 \ diff --git a/README.md b/README.md index 0e867f8..036b5ea 100644 --- a/README.md +++ b/README.md @@ -826,3 +826,201 @@ To run the project locally, follow these steps: ### Note The `scripts/run_local.sh` and `scripts/run_local.bat` scripts are deprecated. Please use the `scripts/run_local.py` script for local testing and running the project. + +## Webcam Test Site + +The project is now ready for release as a site for testing webcam functionality. The webcam test site allows users to select different streaming protocols and camera inputs for testing purposes. + +### Features +- Select different streaming protocols: Webcam, HLS, DASH, RTMP +- Choose camera inputs for different users and ports +- Display the selected camera input in a video element + +### How to Use the Webcam Test Site +1. Open the `docs/index.html` file in a web browser. +2. Select a streaming protocol from the dropdown menu. +3. Choose a camera input for each user and port. +4. The selected camera input will be displayed in the video element. + +### Example +```html + + + + + + Webcam Test - ScalaCast + + + +

Webcam Test

+ + + + + +
+

Selected Camera Input

+ +
+ + + + + +``` diff --git a/config/sys.config b/config/sys.config index 770e60f..6606289 100644 --- a/config/sys.config +++ b/config/sys.config @@ -21,5 +21,9 @@ {http, [ {port1, 8080}, {port2, 8081} + ]}, + {webcam_test_site, [ + {streaming_protocols, ["webcam", "hls", "dash", "rtmp"]}, + {camera_selections, ["user1", "user2", "port1", "port2"]} ]} ]. diff --git a/docs/index.html b/docs/index.html index f9e692f..bf9073e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -3,7 +3,7 @@ - Webcam Test - Scala Frontend + Webcam Test - ScalaCast