--- lbbs-combo/docker-compose.yml	2026/01/08 15:14:08	1.2
+++ lbbs-combo/docker-compose.yml	2026/01/25 00:30:40	1.7
@@ -1,6 +1,7 @@
 services:
   mysql:
     image: mysql:8.4
+    platform: ${RUN_PLATFORM}
     restart: unless-stopped
     volumes:
       - mysql-data:/var/lib/mysql
@@ -18,12 +19,32 @@ services:
       - --innodb-buffer-pool-size=64M
       - --max-connections=15
 
+  solr:
+    image: leafok/lbbs-solr:combo
+    platform: ${RUN_PLATFORM}
+    restart: unless-stopped
+    build:
+      context: .
+      dockerfile: Dockerfile/dockerfile.solr
+    volumes:
+      - solr-data:/var/solr
+    environment:
+      SOLR_JAVA_MEM: "-Xms256m -Xmx512m"
+    command:
+      - solr-precreate
+      - lbbs
+      - /opt/solr/server/solr/configsets/lbbs
+    networks:
+      - app-network
+    mem_limit: 512M
+
   apache:
-    image: leafok/lbbs-apache:testing
+    image: leafok/lbbs-apache:combo
+    platform: ${RUN_PLATFORM}
     restart: unless-stopped
     build:
       context: .
-      dockerfile: Dockerfile/dockerfile.apache.testing
+      dockerfile: Dockerfile/dockerfile.apache
     ports:
       - "8080:8081"
     volumes:
@@ -31,15 +52,17 @@ services:
       - apache-logs:/usr/local/apache2/logs
     depends_on:
       - php
+      - solr
     networks:
       - app-network
 
   php:
-    image: leafok/lbbs-php:testing
+    image: leafok/lbbs-php:combo
+    platform: ${RUN_PLATFORM}
     restart: unless-stopped
     build:
       context: .
-      dockerfile: Dockerfile/dockerfile.php.testing
+      dockerfile: Dockerfile/dockerfile.php
     volumes:
       - www-data:/var/www/html
       - php-sessions:/var/lib/php/sessions
@@ -55,11 +78,12 @@ services:
     command: [ "php-fpm" ]
 
   bbsd-prepare:
-    image: leafok/lbbs-bbsd:testing
+    image: leafok/lbbs-bbsd:combo
+    platform: ${RUN_PLATFORM}
     restart: on-failure
     build:
       context: .
-      dockerfile: Dockerfile/dockerfile.bbsd.testing
+      dockerfile: Dockerfile/dockerfile.bbsd
     volumes:
       - bbsd-conf:/usr/local/lbbs/conf
       - bbsd-data:/usr/local/lbbs/data
@@ -75,7 +99,8 @@ services:
     command: [ "/bin/sh", "/usr/local/lbbs/bin/bbsd_prepare.sh" ]
 
   bbsd:
-    image: leafok/lbbs-bbsd:testing
+    image: leafok/lbbs-bbsd:combo
+    platform: ${RUN_PLATFORM}
     restart: unless-stopped
     shm_size: '4gb'
     ports:
@@ -102,6 +127,9 @@ volumes:
   mysql-data:
     # Volume for persistent storage of mysql data
     driver: local
+  solr-data:
+    # Volume for persistent storage of solr data
+    driver: local
   www-data:
     # Volume for persistent storage of web data
     driver: local