From 93a8e9579f9d1271e88c804fb5e8e07cd837bf3b Mon Sep 17 00:00:00 2001 From: Salim Fadhley Date: Sun, 26 Nov 2023 23:08:51 +0000 Subject: [PATCH 01/15] Try to make a self-contained config file --- docker-compose.prebuilt.yaml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/docker-compose.prebuilt.yaml b/docker-compose.prebuilt.yaml index 32ffe80..6838215 100644 --- a/docker-compose.prebuilt.yaml +++ b/docker-compose.prebuilt.yaml @@ -19,7 +19,7 @@ services: - JaegerAddress= - GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn volumes: - - ./front_api:/horahora/front_api + - ${STORAGE_ROOT:-.}/front_api:/horahora/front_api rabbitmq: build: @@ -54,7 +54,7 @@ services: - GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn - GRPCPort=7777 volumes: - - ./scheduler:/horahora/scheduler + - ${STORAGE_ROOT:-.}/scheduler:/horahora/scheduler videoservice: image: ghcr.io/horahoradev/prometheustube/videoservice:master @@ -88,9 +88,10 @@ services: - MaxDLFileSize=300 - GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn - GRPCPort=7777 + - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-} + - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-} volumes: - - ./video_service:/horahora/videoservice - - $HOME/.aws/:/root/.aws/:ro + - ${STORAGE_ROOT:-.}/video_service:/horahora/videoservice userservice: image: ghcr.io/horahoradev/prometheustube/userservice:master @@ -108,7 +109,7 @@ services: - pgs_db=userservice - GRPCPort=7777 volumes: - - ./user_service:/horahora/userservice + - ${STORAGE_ROOT:-.}/user_service:/horahora/userservice postgres: image: ghcr.io/horahoradev/prometheustube/postgres:master @@ -136,7 +137,7 @@ services: - MINIO_CACHE=off - BUCKET_NAME=otomads volumes: - - ./videos:/data + - ${STORAGE_ROOT:-.}/videos:/data nginx: image: anroe/nginx-headers-more @@ -150,9 +151,9 @@ services: - videoservice - horaminio volumes: - - ./static:/etc/nginx/html/static/images - - ./configs/nginx.conf:/etc/nginx/templates/default.conf.template - - ./videos/otomads:/etc/nginx/html/otomads + - ${STORAGE_ROOT:-.}/static:/etc/nginx/html/static/images + - ${STORAGE_ROOT:-.}/configs/nginx.conf:/etc/nginx/templates/default.conf.template + - ${STORAGE_ROOT:-.}/videos/otomads:/etc/nginx/html/otomads redis: image: "redis:alpine" restart: always @@ -193,7 +194,7 @@ services: --cache-path /var/lib/gorse/master_cache.data volumes: # Mount the configuration file. - - ./config.toml:/etc/gorse/config.toml + - ${STORAGE_ROOT:-.}/config.toml:/etc/gorse/config.toml depends_on: - redis - postgres From 28cc2826ff1ea091ca54a270cdbd4be096a25580 Mon Sep 17 00:00:00 2001 From: Salim Fadhley Date: Sun, 26 Nov 2023 23:11:50 +0000 Subject: [PATCH 02/15] Try to make a self-contained config file --- docker-compose.prebuilt.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.prebuilt.yaml b/docker-compose.prebuilt.yaml index 6838215..906626a 100644 --- a/docker-compose.prebuilt.yaml +++ b/docker-compose.prebuilt.yaml @@ -99,8 +99,6 @@ services: depends_on: - postgres restart: unless-stopped - env_file: - - ./.secrets.env environment: - pgs_host=postgres - pgs_port=5432 From 15dbce9012256ec34a374f2e87bfb61e17d487c8 Mon Sep 17 00:00:00 2001 From: Salim Fadhley Date: Sun, 26 Nov 2023 23:32:24 +0000 Subject: [PATCH 03/15] Try to make a self-contained config file --- docker-compose.prebuilt.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose.prebuilt.yaml b/docker-compose.prebuilt.yaml index 906626a..755a114 100644 --- a/docker-compose.prebuilt.yaml +++ b/docker-compose.prebuilt.yaml @@ -150,7 +150,7 @@ services: - horaminio volumes: - ${STORAGE_ROOT:-.}/static:/etc/nginx/html/static/images - - ${STORAGE_ROOT:-.}/configs/nginx.conf:/etc/nginx/templates/default.conf.template + - ${STORAGE_ROOT:-.}/nginx_conf/:/etc/nginx/templates/ # put the nginx config here - ${STORAGE_ROOT:-.}/videos/otomads:/etc/nginx/html/otomads redis: image: "redis:alpine" @@ -192,7 +192,8 @@ services: --cache-path /var/lib/gorse/master_cache.data volumes: # Mount the configuration file. - - ${STORAGE_ROOT:-.}/config.toml:/etc/gorse/config.toml + # Gorse's config.toml has to exist here + - ${STORAGE_ROOT:-.}/gorse/:/etc/gorse/ depends_on: - redis - postgres From 05680939a1327fe2fb1034ed3efc822a6b273313 Mon Sep 17 00:00:00 2001 From: Salim Fadhley Date: Sun, 26 Nov 2023 23:37:27 +0000 Subject: [PATCH 04/15] Try to make a self-contained config file --- docker-compose.prebuilt.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.prebuilt.yaml b/docker-compose.prebuilt.yaml index 755a114..4c9d520 100644 --- a/docker-compose.prebuilt.yaml +++ b/docker-compose.prebuilt.yaml @@ -192,8 +192,7 @@ services: --cache-path /var/lib/gorse/master_cache.data volumes: # Mount the configuration file. - # Gorse's config.toml has to exist here - - ${STORAGE_ROOT:-.}/gorse/:/etc/gorse/ + - ${STORAGE_ROOT:-.}/gorse/:/etc/gorse/ # Gorse's config.toml has to exist here depends_on: - redis - postgres From cb6ff56a7bd13151d325dc318793576b34133350 Mon Sep 17 00:00:00 2001 From: Salim Fadhley Date: Sun, 26 Nov 2023 23:49:45 +0000 Subject: [PATCH 05/15] Revert "Try to make a self-contained config file" This reverts commit 05680939a1327fe2fb1034ed3efc822a6b273313. --- docker-compose.prebuilt.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.prebuilt.yaml b/docker-compose.prebuilt.yaml index 4c9d520..755a114 100644 --- a/docker-compose.prebuilt.yaml +++ b/docker-compose.prebuilt.yaml @@ -192,7 +192,8 @@ services: --cache-path /var/lib/gorse/master_cache.data volumes: # Mount the configuration file. - - ${STORAGE_ROOT:-.}/gorse/:/etc/gorse/ # Gorse's config.toml has to exist here + # Gorse's config.toml has to exist here + - ${STORAGE_ROOT:-.}/gorse/:/etc/gorse/ depends_on: - redis - postgres From d93d9bba5f067f09a736b19f0d590c91ddf0ac40 Mon Sep 17 00:00:00 2001 From: Salim Fadhley Date: Sun, 26 Nov 2023 23:51:04 +0000 Subject: [PATCH 06/15] Try to make a self-contained config file --- docker-compose.prebuilt.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.prebuilt.yaml b/docker-compose.prebuilt.yaml index 755a114..a3d0e09 100644 --- a/docker-compose.prebuilt.yaml +++ b/docker-compose.prebuilt.yaml @@ -150,7 +150,7 @@ services: - horaminio volumes: - ${STORAGE_ROOT:-.}/static:/etc/nginx/html/static/images - - ${STORAGE_ROOT:-.}/nginx_conf/:/etc/nginx/templates/ # put the nginx config here + - ${STORAGE_ROOT:-.}/nginx.conf:/etc/nginx/templates/nginx.conf # put the nginx config file in the storage root before you start the process. - ${STORAGE_ROOT:-.}/videos/otomads:/etc/nginx/html/otomads redis: image: "redis:alpine" @@ -193,7 +193,7 @@ services: volumes: # Mount the configuration file. # Gorse's config.toml has to exist here - - ${STORAGE_ROOT:-.}/gorse/:/etc/gorse/ + - ${STORAGE_ROOT:-.}/config.toml:/etc/gorse/config.toml depends_on: - redis - postgres From a08a16ea0721f16b5a1d719029411b0d994ade29 Mon Sep 17 00:00:00 2001 From: Salim Fadhley Date: Sun, 26 Nov 2023 23:54:45 +0000 Subject: [PATCH 07/15] Try to make a self-contained config file --- docker-compose.prebuilt.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.prebuilt.yaml b/docker-compose.prebuilt.yaml index a3d0e09..21f8389 100644 --- a/docker-compose.prebuilt.yaml +++ b/docker-compose.prebuilt.yaml @@ -150,7 +150,7 @@ services: - horaminio volumes: - ${STORAGE_ROOT:-.}/static:/etc/nginx/html/static/images - - ${STORAGE_ROOT:-.}/nginx.conf:/etc/nginx/templates/nginx.conf # put the nginx config file in the storage root before you start the process. + - ${STORAGE_ROOT:-.}/nginx.conf:/etc/nginx/nginx.conf # put the nginx config file in the storage root before you start the process. - ${STORAGE_ROOT:-.}/videos/otomads:/etc/nginx/html/otomads redis: image: "redis:alpine" From 6f7701c93a982c77d7ccf5523f9df7c68add5b0b Mon Sep 17 00:00:00 2001 From: Salim Fadhley Date: Mon, 27 Nov 2023 00:01:06 +0000 Subject: [PATCH 08/15] Revert "Try to make a self-contained config file" This reverts commit a08a16ea0721f16b5a1d719029411b0d994ade29. --- docker-compose.prebuilt.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.prebuilt.yaml b/docker-compose.prebuilt.yaml index 21f8389..a3d0e09 100644 --- a/docker-compose.prebuilt.yaml +++ b/docker-compose.prebuilt.yaml @@ -150,7 +150,7 @@ services: - horaminio volumes: - ${STORAGE_ROOT:-.}/static:/etc/nginx/html/static/images - - ${STORAGE_ROOT:-.}/nginx.conf:/etc/nginx/nginx.conf # put the nginx config file in the storage root before you start the process. + - ${STORAGE_ROOT:-.}/nginx.conf:/etc/nginx/templates/nginx.conf # put the nginx config file in the storage root before you start the process. - ${STORAGE_ROOT:-.}/videos/otomads:/etc/nginx/html/otomads redis: image: "redis:alpine" From f1a594185361bc7078c7bdcf4cb1df1c54e55668 Mon Sep 17 00:00:00 2001 From: Salim Fadhley Date: Mon, 27 Nov 2023 00:01:06 +0000 Subject: [PATCH 09/15] Revert "Try to make a self-contained config file" This reverts commit d93d9bba5f067f09a736b19f0d590c91ddf0ac40. --- docker-compose.prebuilt.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.prebuilt.yaml b/docker-compose.prebuilt.yaml index a3d0e09..755a114 100644 --- a/docker-compose.prebuilt.yaml +++ b/docker-compose.prebuilt.yaml @@ -150,7 +150,7 @@ services: - horaminio volumes: - ${STORAGE_ROOT:-.}/static:/etc/nginx/html/static/images - - ${STORAGE_ROOT:-.}/nginx.conf:/etc/nginx/templates/nginx.conf # put the nginx config file in the storage root before you start the process. + - ${STORAGE_ROOT:-.}/nginx_conf/:/etc/nginx/templates/ # put the nginx config here - ${STORAGE_ROOT:-.}/videos/otomads:/etc/nginx/html/otomads redis: image: "redis:alpine" @@ -193,7 +193,7 @@ services: volumes: # Mount the configuration file. # Gorse's config.toml has to exist here - - ${STORAGE_ROOT:-.}/config.toml:/etc/gorse/config.toml + - ${STORAGE_ROOT:-.}/gorse/:/etc/gorse/ depends_on: - redis - postgres From 0eb3f1d6791e2681b6b92e6ae77749e00a5fd78d Mon Sep 17 00:00:00 2001 From: Salim Fadhley Date: Mon, 27 Nov 2023 00:01:06 +0000 Subject: [PATCH 10/15] Revert "Revert "Try to make a self-contained config file"" This reverts commit cb6ff56a7bd13151d325dc318793576b34133350. --- docker-compose.prebuilt.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.prebuilt.yaml b/docker-compose.prebuilt.yaml index 755a114..4c9d520 100644 --- a/docker-compose.prebuilt.yaml +++ b/docker-compose.prebuilt.yaml @@ -192,8 +192,7 @@ services: --cache-path /var/lib/gorse/master_cache.data volumes: # Mount the configuration file. - # Gorse's config.toml has to exist here - - ${STORAGE_ROOT:-.}/gorse/:/etc/gorse/ + - ${STORAGE_ROOT:-.}/gorse/:/etc/gorse/ # Gorse's config.toml has to exist here depends_on: - redis - postgres From 2685dc84b07079f67882414094e3301a3a08b3a2 Mon Sep 17 00:00:00 2001 From: Salim Fadhley Date: Mon, 27 Nov 2023 00:01:06 +0000 Subject: [PATCH 11/15] Revert "Try to make a self-contained config file" This reverts commit 05680939a1327fe2fb1034ed3efc822a6b273313. --- docker-compose.prebuilt.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.prebuilt.yaml b/docker-compose.prebuilt.yaml index 4c9d520..755a114 100644 --- a/docker-compose.prebuilt.yaml +++ b/docker-compose.prebuilt.yaml @@ -192,7 +192,8 @@ services: --cache-path /var/lib/gorse/master_cache.data volumes: # Mount the configuration file. - - ${STORAGE_ROOT:-.}/gorse/:/etc/gorse/ # Gorse's config.toml has to exist here + # Gorse's config.toml has to exist here + - ${STORAGE_ROOT:-.}/gorse/:/etc/gorse/ depends_on: - redis - postgres From 5c4bb1f8ba3d8ad514889ed9026c58a5bdbe923b Mon Sep 17 00:00:00 2001 From: Salim Fadhley Date: Mon, 27 Nov 2023 00:01:06 +0000 Subject: [PATCH 12/15] Revert "Try to make a self-contained config file" This reverts commit 15dbce9012256ec34a374f2e87bfb61e17d487c8. --- docker-compose.prebuilt.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker-compose.prebuilt.yaml b/docker-compose.prebuilt.yaml index 755a114..906626a 100644 --- a/docker-compose.prebuilt.yaml +++ b/docker-compose.prebuilt.yaml @@ -150,7 +150,7 @@ services: - horaminio volumes: - ${STORAGE_ROOT:-.}/static:/etc/nginx/html/static/images - - ${STORAGE_ROOT:-.}/nginx_conf/:/etc/nginx/templates/ # put the nginx config here + - ${STORAGE_ROOT:-.}/configs/nginx.conf:/etc/nginx/templates/default.conf.template - ${STORAGE_ROOT:-.}/videos/otomads:/etc/nginx/html/otomads redis: image: "redis:alpine" @@ -192,8 +192,7 @@ services: --cache-path /var/lib/gorse/master_cache.data volumes: # Mount the configuration file. - # Gorse's config.toml has to exist here - - ${STORAGE_ROOT:-.}/gorse/:/etc/gorse/ + - ${STORAGE_ROOT:-.}/config.toml:/etc/gorse/config.toml depends_on: - redis - postgres From f6c6868666e5a9ee56f1c1006478ba860e3149ba Mon Sep 17 00:00:00 2001 From: Salim Fadhley Date: Mon, 27 Nov 2023 00:01:06 +0000 Subject: [PATCH 13/15] Revert "Try to make a self-contained config file" This reverts commit 28cc2826ff1ea091ca54a270cdbd4be096a25580. --- docker-compose.prebuilt.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.prebuilt.yaml b/docker-compose.prebuilt.yaml index 906626a..6838215 100644 --- a/docker-compose.prebuilt.yaml +++ b/docker-compose.prebuilt.yaml @@ -99,6 +99,8 @@ services: depends_on: - postgres restart: unless-stopped + env_file: + - ./.secrets.env environment: - pgs_host=postgres - pgs_port=5432 From 558413833b48681d54c7618b1c1fc9ca2ac3cd8d Mon Sep 17 00:00:00 2001 From: Salim Fadhley Date: Mon, 27 Nov 2023 00:01:06 +0000 Subject: [PATCH 14/15] Revert "Try to make a self-contained config file" This reverts commit 93a8e9579f9d1271e88c804fb5e8e07cd837bf3b. --- docker-compose.prebuilt.yaml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/docker-compose.prebuilt.yaml b/docker-compose.prebuilt.yaml index 6838215..32ffe80 100644 --- a/docker-compose.prebuilt.yaml +++ b/docker-compose.prebuilt.yaml @@ -19,7 +19,7 @@ services: - JaegerAddress= - GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn volumes: - - ${STORAGE_ROOT:-.}/front_api:/horahora/front_api + - ./front_api:/horahora/front_api rabbitmq: build: @@ -54,7 +54,7 @@ services: - GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn - GRPCPort=7777 volumes: - - ${STORAGE_ROOT:-.}/scheduler:/horahora/scheduler + - ./scheduler:/horahora/scheduler videoservice: image: ghcr.io/horahoradev/prometheustube/videoservice:master @@ -88,10 +88,9 @@ services: - MaxDLFileSize=300 - GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn - GRPCPort=7777 - - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-} - - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-} volumes: - - ${STORAGE_ROOT:-.}/video_service:/horahora/videoservice + - ./video_service:/horahora/videoservice + - $HOME/.aws/:/root/.aws/:ro userservice: image: ghcr.io/horahoradev/prometheustube/userservice:master @@ -109,7 +108,7 @@ services: - pgs_db=userservice - GRPCPort=7777 volumes: - - ${STORAGE_ROOT:-.}/user_service:/horahora/userservice + - ./user_service:/horahora/userservice postgres: image: ghcr.io/horahoradev/prometheustube/postgres:master @@ -137,7 +136,7 @@ services: - MINIO_CACHE=off - BUCKET_NAME=otomads volumes: - - ${STORAGE_ROOT:-.}/videos:/data + - ./videos:/data nginx: image: anroe/nginx-headers-more @@ -151,9 +150,9 @@ services: - videoservice - horaminio volumes: - - ${STORAGE_ROOT:-.}/static:/etc/nginx/html/static/images - - ${STORAGE_ROOT:-.}/configs/nginx.conf:/etc/nginx/templates/default.conf.template - - ${STORAGE_ROOT:-.}/videos/otomads:/etc/nginx/html/otomads + - ./static:/etc/nginx/html/static/images + - ./configs/nginx.conf:/etc/nginx/templates/default.conf.template + - ./videos/otomads:/etc/nginx/html/otomads redis: image: "redis:alpine" restart: always @@ -194,7 +193,7 @@ services: --cache-path /var/lib/gorse/master_cache.data volumes: # Mount the configuration file. - - ${STORAGE_ROOT:-.}/config.toml:/etc/gorse/config.toml + - ./config.toml:/etc/gorse/config.toml depends_on: - redis - postgres From 85603e8363ce66e2d2cf7b0533c09365ee91e760 Mon Sep 17 00:00:00 2001 From: Salim Fadhley Date: Mon, 27 Nov 2023 00:30:23 +0000 Subject: [PATCH 15/15] remove secrets.env --- docker-compose.prebuilt.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.prebuilt.yaml b/docker-compose.prebuilt.yaml index 32ffe80..8a1c9f8 100644 --- a/docker-compose.prebuilt.yaml +++ b/docker-compose.prebuilt.yaml @@ -98,8 +98,8 @@ services: depends_on: - postgres restart: unless-stopped - env_file: - - ./.secrets.env +# env_file: +# - ./.secrets.env environment: - pgs_host=postgres - pgs_port=5432