Merge pull request #279 from Telecominfraproject/WIFI-13969-docker-co…

…mpose-default-to-postgres Wifi 13969 docker compose default to postgres
Telecominfraproject · Jul 29, 2024 · 3e8795a · 3e8795a
2 parents 4fcbd32 + dceb24d
commit 3e8795a
Show file tree

Hide file tree

Showing 14 changed files with 279 additions and 187 deletions.
diff --git a/docker-compose/.env.letsencrypt b/docker-compose/.env.letsencrypt
@@ -1,5 +1,6 @@
-# Image tags
 COMPOSE_PROJECT_NAME=openwifi
+
+# Image tags
 OWGW_TAG=master
 OWGWUI_TAG=main
 OWSEC_TAG=main
@@ -8,10 +9,12 @@ OWPROV_TAG=main
 OWPROVUI_TAG=main
 OWANALYTICS_TAG=main
 OWSUB_TAG=main
+
 KAFKA_TAG=2.8.0-debian-10-r43
 ZOOKEEPER_TAG=3.8
+POSTGRESQL_TAG=15.0
 ACMESH_TAG=latest
-TRAEFIK_TAG=latest
+TRAEFIK_TAG=v3.1.0
 
 # Microservice root/config directories
 OWGW_ROOT=/owgw-data
@@ -38,3 +41,4 @@ INTERNAL_OWANALYTICS_HOSTNAME=owanalytics.wlan.local
 INTERNAL_RTTYS_HOSTNAME=rttys.wlan.local
 INTERNAL_OWSUB_HOSTNAME=owsub.wlan.local
 SDKHOSTNAME=
+#SDKHOSTNAME=openwifi.example.com
diff --git a/docker-compose/.env.selfsigned b/docker-compose/.env.selfsigned
@@ -1,5 +1,6 @@
-# Image tags
 COMPOSE_PROJECT_NAME=openwifi
+
+# Image tags
 OWGW_TAG=master
 OWGWUI_TAG=main
 OWSEC_TAG=main
@@ -8,8 +9,10 @@ OWPROV_TAG=main
 OWPROVUI_TAG=main
 OWANALYTICS_TAG=main
 OWSUB_TAG=main
+
 KAFKA_TAG=2.8.0-debian-10-r43
 ZOOKEEPER_TAG=3.8
+POSTGRESQL_TAG=15.0
 ACMESH_TAG=latest
 TRAEFIK_TAG=latest
 

diff --git a/docker-compose/README.md b/docker-compose/README.md
diff --git a/docker-compose/cloudformation/openwifi-cloudsdk-docker-compose.yml b/docker-compose/cloudformation/openwifi-cloudsdk-docker-compose.yml
@@ -205,8 +205,6 @@ Resources:
                 docker-compose.lb.letsencrypt.yml --env-file .env.letsencrypt"
                 alias docker-compose-lb-selfsigned="docker-compose -f \
                 docker-compose.lb.selfsigned.yml --env-file .env.selfsigned"
-                alias docker-compose-postgresql="docker-compose -f \
-                docker-compose.yml -f docker-compose.postgresql.yml"
               mode: "000644"
               owner: "root"
               group: "root"

diff --git a/docker-compose/docker-compose.lb.letsencrypt.yml b/docker-compose/docker-compose.lb.letsencrypt.yml
@@ -17,6 +17,8 @@ volumes:
     driver: local
   kafka_data:
     driver: local
+  postgresql_data:
+    driver: local
   letsencrypt_certs:
     driver: local
 
@@ -36,6 +38,9 @@ services:
     depends_on:
       init-kafka:
         condition: service_completed_successfully
+      postgresql:
+        condition: service_healthy
+    command: ["./wait-for-postgres.sh", "postgresql", "/openwifi/owgw"]
     restart: unless-stopped
     volumes:
       - owgw_data:${OWGW_ROOT}/persist
@@ -72,6 +77,9 @@ services:
     depends_on:
       init-kafka:
         condition: service_completed_successfully
+      postgresql:
+        condition: service_healthy
+    command: ["./wait-for-postgres.sh", "postgresql", "/openwifi/owsec"]
     restart: unless-stopped
     volumes:
       - owsec_data:${OWSEC_ROOT}/persist
@@ -89,6 +97,9 @@ services:
     depends_on:
       init-kafka:
         condition: service_completed_successfully
+      postgresql:
+        condition: service_healthy
+    command: ["./wait-for-postgres.sh", "postgresql", "/openwifi/owfms"]
     restart: unless-stopped
     volumes:
       - owfms_data:${OWFMS_ROOT}/persist
@@ -106,6 +117,9 @@ services:
     depends_on:
       init-kafka:
         condition: service_completed_successfully
+      postgresql:
+        condition: service_healthy
+    command: ["./wait-for-postgres.sh", "postgresql", "/openwifi/owprov"]
     restart: unless-stopped
     volumes:
       - owprov_data:${OWPROV_ROOT}
@@ -138,6 +152,9 @@ services:
     depends_on:
       init-kafka:
         condition: service_completed_successfully
+      postgresql:
+        condition: service_healthy
+    command: ["./wait-for-postgres.sh", "postgresql", "/openwifi/owanalytics"]
     restart: unless-stopped
     volumes:
       - owanalytics_data:${OWANALYTICS_ROOT}
@@ -155,6 +172,9 @@ services:
     depends_on:
       init-kafka:
         condition: service_completed_successfully
+      postgresql:
+        condition: service_healthy
+    command: ["./wait-for-postgres.sh", "postgresql", "/openwifi/owsub"]
     restart: unless-stopped
     volumes:
       - owsub_data:${OWSUB_ROOT}
@@ -247,3 +267,26 @@ services:
       - "1812:1812/udp"
       - "1813:1813/udp"
       - "3799:3799/udp"
+
+  postgresql:
+    image: "postgres:${POSTGRESQL_TAG}"
+    networks:
+      openwifi:
+    command:
+      - "postgres"
+      - "-c"
+      - "max_connections=400"
+      - "-c"
+      - "shared_buffers=20MB"
+    env_file:
+      - postgresql.env
+    restart: unless-stopped
+    volumes:
+      - postgresql_data:/var/lib/postgresql/data
+      - ./postgresql/init-db.sh:/docker-entrypoint-initdb.d/init-db.sh
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d owsub"]
+      interval: 10s
+      retries: 5
+      start_period: 30s
+      timeout: 10s
diff --git a/docker-compose/docker-compose.lb.selfsigned.yml b/docker-compose/docker-compose.lb.selfsigned.yml
@@ -17,6 +17,8 @@ volumes:
     driver: local
   kafka_data:
     driver: local
+  postgresql_data:
+    driver: local
 
 networks:
   openwifi:
@@ -34,6 +36,9 @@ services:
     depends_on:
       init-kafka:
         condition: service_completed_successfully
+      postgresql:
+        condition: service_healthy
+    command: ["./wait-for-postgres.sh", "postgresql", "/openwifi/owgw"]
     restart: unless-stopped
     volumes:
       - owgw_data:${OWGW_ROOT}/persist
@@ -45,8 +50,6 @@ services:
 
   owgw-ui:
     image: "tip-tip-wlan-cloud-ucentral.jfrog.io/owgw-ui:${OWGWUI_TAG}"
-    env_file:
-      - owgw-ui.env
     networks:
       openwifi:
         aliases:
@@ -72,6 +75,9 @@ services:
     depends_on:
       init-kafka:
         condition: service_completed_successfully
+      postgresql:
+        condition: service_healthy
+    command: ["./wait-for-postgres.sh", "postgresql", "/openwifi/owsec"]
     restart: unless-stopped
     volumes:
       - owsec_data:${OWSEC_ROOT}/persist
@@ -89,6 +95,9 @@ services:
     depends_on:
       init-kafka:
         condition: service_completed_successfully
+      postgresql:
+        condition: service_healthy
+    command: ["./wait-for-postgres.sh", "postgresql", "/openwifi/owfms"]
     restart: unless-stopped
     volumes:
       - owfms_data:${OWFMS_ROOT}/persist
@@ -106,6 +115,9 @@ services:
     depends_on:
       init-kafka:
         condition: service_completed_successfully
+      postgresql:
+        condition: service_healthy
+    command: ["./wait-for-postgres.sh", "postgresql", "/openwifi/owprov"]
     restart: unless-stopped
     volumes:
       - owprov_data:${OWPROV_ROOT}
@@ -138,6 +150,9 @@ services:
     depends_on:
       init-kafka:
         condition: service_completed_successfully
+      postgresql:
+        condition: service_healthy
+    command: ["./wait-for-postgres.sh", "postgresql", "/openwifi/owanalytics"]
     restart: unless-stopped
     volumes:
       - owanalytics_data:${OWANALYTICS_ROOT}
@@ -155,6 +170,9 @@ services:
     depends_on:
       init-kafka:
         condition: service_completed_successfully
+      postgresql:
+        condition: service_healthy
+    command: ["./wait-for-postgres.sh", "postgresql", "/openwifi/owsub"]
     restart: unless-stopped
     volumes:
       - owsub_data:${OWSUB_ROOT}
@@ -241,3 +259,26 @@ services:
       - "1812:1812/udp"
       - "1813:1813/udp"
       - "3799:3799/udp"
+
+  postgresql:
+    image: "postgres:${POSTGRESQL_TAG}"
+    networks:
+      openwifi:
+    command:
+      - "postgres"
+      - "-c"
+      - "max_connections=400"
+      - "-c"
+      - "shared_buffers=20MB"
+    env_file:
+      - postgresql.env
+    restart: unless-stopped
+    volumes:
+      - postgresql_data:/var/lib/postgresql/data
+      - ./postgresql/init-db.sh:/docker-entrypoint-initdb.d/init-db.sh
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d owsub"]
+      interval: 10s
+      retries: 5
+      start_period: 30s
+      timeout: 10s
diff --git a/docker-compose/docker-compose.postgresql.yml b/docker-compose/docker-compose.postgresql.yml