From c0039d7c473a7e4094614b6d2ac23447c0077459 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 2 Apr 2025 11:48:03 +0200 Subject: [PATCH 1/9] add: gitsubmodules branch dev and merge strategy --- .gitmodules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmodules b/.gitmodules index 15fe86be2..15158d27d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,5 @@ [submodule "sintonia_webapp"] path = sintonia_webapp url = ssh://gitea@git.congegni.net:4022/Congegni/sintonia_webapp.git + branch = dev + update = merge From f2c2e5a8e07e5e858fc91ec4c452460b7d29d95e Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 2 Apr 2025 12:57:16 +0200 Subject: [PATCH 2/9] Update README.md --- README.md | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a09304b2f..c4f58db58 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,12 @@ Currently only the dev version of the project is being developed, the branch to Ensure docker is installed and its service is up and running One can quickly test docker by running: docker run hello-world -Edit the file docker/config.yml by adding to the local url the public url (for dev add http://127.0.0.1:9876) +This repo contains a git submodule sintonia_webapp, it refers to this [repo](https://git.congegni.net/Congegni/sintonia_webapp). +To pull the repo, open a terminal in the root of this project and run this command: + git submodule update --init --recursive --remote && cd sintonia_webapp && git checkout dev && cd .. +The folder sintonia_webapp now it's synced with the dev branch (the currently active branch). + +In the sintonia folder, edit the file docker/config.yml by adding to the local url the public url (for dev add http://127.0.0.1:9876) Add a string to the api_key and secret_key field, for dev it can be any random string Copy or rename the file .env.dev to .env @@ -38,6 +43,27 @@ This commands builds the docker containers in dev mode, then il will attempt to The sintonia web app is reachable on the port indicated in the env var SINTONIA_LARAVEL_PORT, by default the port is 9876. So proceed to open a browser, connect to http://127.0.0.1:9876 (if no config or vars were changed). Usually the user created by default is login: admin password: admin + +## HW usage +The stats below refer to the containers without any load and some test data +docker stats --no-stream +CONTAINER ID NAME CPU % MEM USAGE / LIMIT MEM % NET I/O BLOCK I/O PIDS +fdc43da14053 sintonia-postgres-1 0.33% 236.7MiB / 30.95GiB 0.75% 86.4MB / 45.2MB 1.11GB / 906MB 9 +74c48a47033c sintonia-liquidsoap-1 23.00% 78.48MiB / 30.95GiB 0.25% 113MB / 2.61GB 281MB / 0B 12 +f97521670581 sintonia-playout-1 0.00% 43.95MiB / 30.95GiB 0.14% 39.9MB / 6.85MB 52.5MB / 0B 2 +5c8bf1fe4e61 sintonia-legacy-1 0.01% 64.21MiB / 30.95GiB 0.20% 24.4MB / 24.2MB 136MB / 0B 5 +b868aad49ccc sintonia-nginx-1 0.00% 11.46MiB / 30.95GiB 0.04% 96MB / 110MB 36.4MB / 0B 9 +e89bf2b1a732 sintonia-worker-1 0.20% 96.11MiB / 30.95GiB 0.30% 8.93MB / 8.26MB 45.8MB / 2.03MB 4 +e18346d6b201 sintonia-analyzer-1 0.02% 32.97MiB / 30.95GiB 0.10% 454kB / 106kB 34.8MB / 0B 3 +7341e6559130 sintonia-webapp-dev 0.09% 492.6MiB / 30.95GiB 1.55% 46.3MB / 254MB 742MB / 28.1MB 41 +959c88dc8a46 sintonia-api-1 4.39% 121.4MiB / 30.95GiB 0.38% 395kB / 79kB 83.6MB / 0B 4 + +### RAM +1177.88MB + +### Images size +4460.7MB + ## Support Coming soon From db1ac237c9648f797bace255bdb71c5394d53ec8 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 2 Apr 2025 13:02:34 +0200 Subject: [PATCH 3/9] Update README.md --- README.md | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index c4f58db58..64303567a 100644 --- a/README.md +++ b/README.md @@ -23,40 +23,53 @@ This application will replicate the functions of the previous one while integrat Currently only the dev version of the project is being developed, the branch to be used is main. Ensure docker is installed and its service is up and running + One can quickly test docker by running: docker run hello-world This repo contains a git submodule sintonia_webapp, it refers to this [repo](https://git.congegni.net/Congegni/sintonia_webapp). + To pull the repo, open a terminal in the root of this project and run this command: +` git submodule update --init --recursive --remote && cd sintonia_webapp && git checkout dev && cd .. +` + The folder sintonia_webapp now it's synced with the dev branch (the currently active branch). In the sintonia folder, edit the file docker/config.yml by adding to the local url the public url (for dev add http://127.0.0.1:9876) + Add a string to the api_key and secret_key field, for dev it can be any random string Copy or rename the file .env.dev to .env Run the following command: -docker compose -f docker-compose.yml -f docker-compose.override.yml build && docker compose up -d +` + docker compose -f docker-compose.yml -f docker-compose.override.yml build && docker compose up -d +` This commands builds the docker containers in dev mode, then il will attempt to start them up. The sintonia web app is reachable on the port indicated in the env var SINTONIA_LARAVEL_PORT, by default the port is 9876. + So proceed to open a browser, connect to http://127.0.0.1:9876 (if no config or vars were changed). + Usually the user created by default is login: admin password: admin ## HW usage The stats below refer to the containers without any load and some test data -docker stats --no-stream -CONTAINER ID NAME CPU % MEM USAGE / LIMIT MEM % NET I/O BLOCK I/O PIDS -fdc43da14053 sintonia-postgres-1 0.33% 236.7MiB / 30.95GiB 0.75% 86.4MB / 45.2MB 1.11GB / 906MB 9 -74c48a47033c sintonia-liquidsoap-1 23.00% 78.48MiB / 30.95GiB 0.25% 113MB / 2.61GB 281MB / 0B 12 -f97521670581 sintonia-playout-1 0.00% 43.95MiB / 30.95GiB 0.14% 39.9MB / 6.85MB 52.5MB / 0B 2 -5c8bf1fe4e61 sintonia-legacy-1 0.01% 64.21MiB / 30.95GiB 0.20% 24.4MB / 24.2MB 136MB / 0B 5 -b868aad49ccc sintonia-nginx-1 0.00% 11.46MiB / 30.95GiB 0.04% 96MB / 110MB 36.4MB / 0B 9 -e89bf2b1a732 sintonia-worker-1 0.20% 96.11MiB / 30.95GiB 0.30% 8.93MB / 8.26MB 45.8MB / 2.03MB 4 -e18346d6b201 sintonia-analyzer-1 0.02% 32.97MiB / 30.95GiB 0.10% 454kB / 106kB 34.8MB / 0B 3 -7341e6559130 sintonia-webapp-dev 0.09% 492.6MiB / 30.95GiB 1.55% 46.3MB / 254MB 742MB / 28.1MB 41 -959c88dc8a46 sintonia-api-1 4.39% 121.4MiB / 30.95GiB 0.38% 395kB / 79kB 83.6MB / 0B 4 + +` + docker stats --no-stream + CONTAINER ID NAME CPU % MEM USAGE / LIMIT MEM % NET I/O BLOCK I/O PIDS + fdc43da14053 sintonia-postgres-1 0.33% 236.7MiB / 30.95GiB 0.75% 86.4MB / 45.2MB 1.11GB / 906MB 9 + 74c48a47033c sintonia-liquidsoap-1 23.00% 78.48MiB / 30.95GiB 0.25% 113MB / 2.61GB 281MB / 0B 12 + f97521670581 sintonia-playout-1 0.00% 43.95MiB / 30.95GiB 0.14% 39.9MB / 6.85MB 52.5MB / 0B 2 + 5c8bf1fe4e61 sintonia-legacy-1 0.01% 64.21MiB / 30.95GiB 0.20% 24.4MB / 24.2MB 136MB / 0B 5 + b868aad49ccc sintonia-nginx-1 0.00% 11.46MiB / 30.95GiB 0.04% 96MB / 110MB 36.4MB / 0B 9 + e89bf2b1a732 sintonia-worker-1 0.20% 96.11MiB / 30.95GiB 0.30% 8.93MB / 8.26MB 45.8MB / 2.03MB 4 + e18346d6b201 sintonia-analyzer-1 0.02% 32.97MiB / 30.95GiB 0.10% 454kB / 106kB 34.8MB / 0B 3 + 7341e6559130 sintonia-webapp-dev 0.09% 492.6MiB / 30.95GiB 1.55% 46.3MB / 254MB 742MB / 28.1MB 41 + 959c88dc8a46 sintonia-api-1 4.39% 121.4MiB / 30.95GiB 0.38% 395kB / 79kB 83.6MB / 0B 4 +` ### RAM 1177.88MB From a920273f670329ed0ff6d329a0bd1228f8e76c46 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 2 Apr 2025 13:04:09 +0200 Subject: [PATCH 4/9] Update README.md --- README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 64303567a..2febe954e 100644 --- a/README.md +++ b/README.md @@ -24,14 +24,17 @@ Currently only the dev version of the project is being developed, the branch to Ensure docker is installed and its service is up and running -One can quickly test docker by running: docker run hello-world +One can quickly test docker by running: +``` + docker run hello-world +``` This repo contains a git submodule sintonia_webapp, it refers to this [repo](https://git.congegni.net/Congegni/sintonia_webapp). To pull the repo, open a terminal in the root of this project and run this command: -` +``` git submodule update --init --recursive --remote && cd sintonia_webapp && git checkout dev && cd .. -` +``` The folder sintonia_webapp now it's synced with the dev branch (the currently active branch). @@ -42,9 +45,9 @@ Add a string to the api_key and secret_key field, for dev it can be any random s Copy or rename the file .env.dev to .env Run the following command: -` +``` docker compose -f docker-compose.yml -f docker-compose.override.yml build && docker compose up -d -` +``` This commands builds the docker containers in dev mode, then il will attempt to start them up. From 3768bb6fe38b39b7ac1263ab7ecd5fbe5b76d22e Mon Sep 17 00:00:00 2001 From: Adri Date: Thu, 3 Apr 2025 15:51:10 +0200 Subject: [PATCH 5/9] fixing readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2febe954e..291d7d162 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ To pull the repo, open a terminal in the root of this project and run this comma The folder sintonia_webapp now it's synced with the dev branch (the currently active branch). -In the sintonia folder, edit the file docker/config.yml by adding to the local url the public url (for dev add http://127.0.0.1:9876) +In the sintonia folder, edit the file docker/config.yml by adding to the public url variable the local url (for dev add 'http://127.0.0.1:9876') Add a string to the api_key and secret_key field, for dev it can be any random string From 88f1732bdcd1ffb9f0156d4f3ca1617747ba9a15 Mon Sep 17 00:00:00 2001 From: Adri Date: Thu, 3 Apr 2025 15:52:12 +0200 Subject: [PATCH 6/9] fixing readme local url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 291d7d162..cdc6fcad5 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ To pull the repo, open a terminal in the root of this project and run this comma The folder sintonia_webapp now it's synced with the dev branch (the currently active branch). -In the sintonia folder, edit the file docker/config.yml by adding to the public url variable the local url (for dev add 'http://127.0.0.1:9876') +In the sintonia folder, edit the file docker/config.yml by adding to the public url variable the local url (for dev add http://127.0.0.1:9876) Add a string to the api_key and secret_key field, for dev it can be any random string From 7f79c78c2394547c4734c776efb3e72f545e9f9e Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 3 Apr 2025 17:14:56 +0200 Subject: [PATCH 7/9] Update README.md --- README.md | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index cdc6fcad5..a049fcb76 100644 --- a/README.md +++ b/README.md @@ -29,20 +29,30 @@ One can quickly test docker by running: docker run hello-world ``` +Clone this repo using the command git clone and the url of this repo. + This repo contains a git submodule sintonia_webapp, it refers to this [repo](https://git.congegni.net/Congegni/sintonia_webapp). -To pull the repo, open a terminal in the root of this project and run this command: +Right now the submodule is not set up properly, so open a terminal in the root of this project and run this command: ``` - git submodule update --init --recursive --remote && cd sintonia_webapp && git checkout dev && cd .. + git clone ssh://gitea@git.congegni.net:4022/Congegni/sintonia_webapp.git && cd sintonia_webapp && git checkout dev && cp .env.dev .env && cd .. ``` The folder sintonia_webapp now it's synced with the dev branch (the currently active branch). -In the sintonia folder, edit the file docker/config.yml by adding to the public url variable the local url (for dev add http://127.0.0.1:9876) +Return to the sintonia project folder, run this commands: -Add a string to the api_key and secret_key field, for dev it can be any random string +``` +# Clean and build +make clean +cp .env.dev .env +DOCKER_BUILDKIT=1 docker-compose build -Copy or rename the file .env.dev to .env +# Setup +make dev-certs +docker-compose run --rm legacy make build +docker-compose run --rm api libretime-api migrate +``` Run the following command: ``` From 1ae38232a185da98df82ff8314d5a0b41798fe4f Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 3 Apr 2025 17:37:15 +0200 Subject: [PATCH 8/9] Update README.md --- README.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a049fcb76..fbbc35328 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,8 @@ Clone this repo using the command git clone and the url of this repo. This repo contains a git submodule sintonia_webapp, it refers to this [repo](https://git.congegni.net/Congegni/sintonia_webapp). -Right now the submodule is not set up properly, so open a terminal in the root of this project and run this command: +Right now the submodule is not set up properly. +So open a terminal in the root of this project, sintonia, and run this command: ``` git clone ssh://gitea@git.congegni.net:4022/Congegni/sintonia_webapp.git && cd sintonia_webapp && git checkout dev && cp .env.dev .env && cd .. ``` @@ -56,10 +57,10 @@ docker-compose run --rm api libretime-api migrate Run the following command: ``` - docker compose -f docker-compose.yml -f docker-compose.override.yml build && docker compose up -d + docker compose -f docker-compose.yml -f docker-compose.override.yml build && docker compose up -d && docker container restart sintonia-webapp-dev ``` -This commands builds the docker containers in dev mode, then il will attempt to start them up. +This commands builds the docker containers in dev mode, then it will attempt to start them up. The sintonia web app is reachable on the port indicated in the env var SINTONIA_LARAVEL_PORT, by default the port is 9876. @@ -72,15 +73,25 @@ The stats below refer to the containers without any load and some test data ` docker stats --no-stream + CONTAINER ID NAME CPU % MEM USAGE / LIMIT MEM % NET I/O BLOCK I/O PIDS + fdc43da14053 sintonia-postgres-1 0.33% 236.7MiB / 30.95GiB 0.75% 86.4MB / 45.2MB 1.11GB / 906MB 9 + 74c48a47033c sintonia-liquidsoap-1 23.00% 78.48MiB / 30.95GiB 0.25% 113MB / 2.61GB 281MB / 0B 12 + f97521670581 sintonia-playout-1 0.00% 43.95MiB / 30.95GiB 0.14% 39.9MB / 6.85MB 52.5MB / 0B 2 + 5c8bf1fe4e61 sintonia-legacy-1 0.01% 64.21MiB / 30.95GiB 0.20% 24.4MB / 24.2MB 136MB / 0B 5 + b868aad49ccc sintonia-nginx-1 0.00% 11.46MiB / 30.95GiB 0.04% 96MB / 110MB 36.4MB / 0B 9 + e89bf2b1a732 sintonia-worker-1 0.20% 96.11MiB / 30.95GiB 0.30% 8.93MB / 8.26MB 45.8MB / 2.03MB 4 + e18346d6b201 sintonia-analyzer-1 0.02% 32.97MiB / 30.95GiB 0.10% 454kB / 106kB 34.8MB / 0B 3 + 7341e6559130 sintonia-webapp-dev 0.09% 492.6MiB / 30.95GiB 1.55% 46.3MB / 254MB 742MB / 28.1MB 41 + 959c88dc8a46 sintonia-api-1 4.39% 121.4MiB / 30.95GiB 0.38% 395kB / 79kB 83.6MB / 0B 4 ` From 2e4be6c9b95f786f949f88bb48265d83f6732826 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 3 Apr 2025 17:51:43 +0200 Subject: [PATCH 9/9] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fbbc35328..a92e279f9 100644 --- a/README.md +++ b/README.md @@ -47,12 +47,12 @@ Return to the sintonia project folder, run this commands: # Clean and build make clean cp .env.dev .env -DOCKER_BUILDKIT=1 docker-compose build +DOCKER_BUILDKIT=1 docker compose build # Setup make dev-certs -docker-compose run --rm legacy make build -docker-compose run --rm api libretime-api migrate +docker compose run --rm legacy make build +docker compose run --rm api libretime-api migrate ``` Run the following command: