Build Verification Updates for TLA (April 2025)

.gitignore

@@ -6,3 +6,25 @@
 global.env
 **/local.env
 **/.env
+
+
+# Logs
+*.log
+
+# Data directories
+**/data/
+**/postgres/data/
+**/nginx_logs/
+
+# Temporary files
+**/=*
+**/node_modules/
+**/bitcoin*
+
+# Backup files
+*.bak
+
+# Node.js dependencies
+core-js*
+craco
+tla-portal*

adl-auth/docker-compose.yml

@@ -1,6 +1,4 @@
-version: '3'
-services:
-
+services: 
   nginx:
     restart: always
     build:
@@ -18,7 +16,7 @@ services:
       - public
 
   certbot:
-    container_name: 'docker_certbot'
+    container_name: 'auth_certbot'
     image: certbot/certbot
     volumes:
       - ./keys:/var/lib/letsencrypt
@@ -52,7 +50,7 @@ services:
     build: 
       context: keycloak
     ports:
-      - "127.0.0.1:8080:8080"
+      - "8080:8080"
       - "127.0.0.1:9990:9990"
     links:
       - postgres:docker_postgres

adl-content/docker-compose.yml

@@ -1,6 +1,4 @@
-version: '3'
 services:
-
   # Nginx instance controlling traffic to each service
   #
   nginx:
@@ -10,9 +8,9 @@ services:
       args:
         - CONTENT_HOST=${CONTENT_HOST}
     ports:
-      - 80:80
-      - 443:443
-    container_name: docker_nginx
+      - 8081:80  # Map host port 8081 to container port 80
+      - 8441:443 # Map host port 8441 to container port 443
+    container_name: content_nginx
     volumes:
       - ./nginx/letsencrypt:/usr/share/nginx/html
       - ./certbot/etc:/usr/share/keys
@@ -22,7 +20,7 @@ services:
   # Certbot for SSL automation
   #
   certbot:
-    container_name: 'docker_certbot'
+    container_name: 'content_certbot'
     image: certbot/certbot
     volumes:
       - ./keys:/var/lib/letsencrypt
@@ -38,7 +36,7 @@ services:
   #
   players:
     restart: always
-    build: 
+    build:
       context: players
     container_name: docker_players
     environment:
@@ -56,7 +54,7 @@ services:
   #
   content:
     restart: always
-    build: 
+    build:
       context: static-content
     container_name: docker_content
     networks:
@@ -68,7 +66,7 @@ services:
       PORT: 3000
     volumes:
       - ./content:/usr/src/app/files/content
-   
+
 networks:
-  public: 
+  public:
     driver: bridge

adl-content/nginx/default.conf

@@ -14,29 +14,6 @@ http {
         listen       80;
         server_name  $CONTENT_HOST;
 
-        location / {
-            return 301 https://$server_name$request_uri;
-        }
-
-        location ~ /.well-known/acme-challenge {
-            allow   all;
-            root    /usr/share/nginx/html;
-        }
-    }
-
-    server {
-        listen       443 ssl;
-        server_name  $CONTENT_HOST;
-
-        ssl_certificate     /usr/share/keys/live/$CONTENT_HOST/fullchain.pem;
-        ssl_certificate_key /usr/share/keys/live/$CONTENT_HOST/privkey.pem;
-
-        ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
-        ssl_ciphers         HIGH:!aNULL:!MD5;
-
-        ssl_verify_client off;
-        proxy_ssl_server_name on;
-
         client_body_in_file_only clean;
         client_body_buffer_size 32K;
 
@@ -61,7 +38,7 @@ http {
 
         location /content {
             include proxy_headers.conf;
-            
+
             proxy_cache_key "$scheme$proxy_host$request_uri $http_range";
             proxy_set_header Range $http_range;
 

adl-discovery/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   #CouchDB instance to act as the discovery service API
   #
@@ -18,50 +16,43 @@ services:
       - couchdb_data:/bitnami/couchdb
     restart: always
 
-
   # Nginx instance controlling traffic to each service
   #
   nginx:
-    restart: always
-    build:
-      context: nginx
-      args:
-        - HOSTNAME=${HOSTNAME}
-    ports:
-      - 80:80
-      - 443:443
+    image: adl-discovery-nginx
     container_name: docker_nginx
+    ports:
+      - "8083:80"
+      - "8443:443"
     volumes:
-      - ./nginx/letsencrypt:/usr/share/nginx/html
+      - ./nginx_logs:/var/log/nginx
       - ./certbot/etc:/usr/share/keys
+    depends_on:
+      - couchdb  # Changed from adl-discovery-couchdb-1
     networks:
       - public
 
   # Certbot for SSL automation
   #
   certbot:
-    container_name: 'docker_certbot'
+    container_name: 'discovery_certbot'
     image: certbot/certbot
     volumes:
       - ./keys:/var/lib/letsencrypt
       - ./nginx/letsencrypt:/data/letsencrypt
       - ./certbot/etc:/etc/letsencrypt
       - ./certbot/log:/var/log/letsencrypt
-    networks:
-      - public
     depends_on:
       - nginx
-    ports:
-      - 8080:8080
-
+    networks:
+      - public
 
 #volumes for CouchDB
 volumes:
   couchdb_data:
     driver: local
 
-
 #Network for the nginx server
 networks:
-  public: 
+  public:
     driver: bridge