fix: update provision

vicholp · Dec 10, 2023 · c345403 · c345403
1 parent 94bcfda
commit c345403
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 18 deletions.
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -8,36 +8,47 @@ services:
     volumes:
       - .:/var/www/html
     labels:
+      - "traefik.enable=true"
       - "traefik.docker.network=traefik"
       - "traefik.http.routers.${APP_NAME}-${APP_ACTUAL_ENV}.rule=Host(`${TRAEFIK_HOST}`)"
     networks:
       - traefik
       - default
-    command:
-      [
-        "su",
-        "webuser",
-        "-c",
-        "php artisan queue:work --tries=3 --queue=high,default,low"
-      ]
     environment:
+      AUTORUN_ENABLED: "false"
       APACHE_DOCUMENT_ROOT: /var/www/html/public
-      PHP_MEMORY_LIMIT: 512M
-      AUTORUN_LARAVEL_STORAGE_LINK: false
+      PHP_MEMORY_LIMIT: "1G"
       PHP_DISPLAY_ERRORS: false
       PHP_MAX_EXECUTION_TIME: 300
+      SSL_MODE: "off"
+      PUID: 1000
+      PGID: 1000
     restart: unless-stopped
 
+  queue:
+    image: serversideup/php:8.1-cli
+    volumes:
+      - .:/var/www/html
+    command: ["su", "webuser", "-c", "php artisan queue:listen --queue=high,default,low"]
+    networks:
+      - default
+    environment:
+      PHP_MEMORY_LIMIT: "1G"
+      PHP_DISPLAY_ERRORS: false
+      PHP_MAX_EXECUTION_TIME: 300
+      PUID: 1000
+      PGID: 1000
+
   db:
     container_name: ${APP_NAME}-${APP_ACTUAL_ENV}-db
-    image: percona:5.7-centos
+    image: mariadb:10.6.16
     networks:
       - default
     ports:
       - 3306
     environment:
-      MYSQL_DATABASE: ${DB_DATABASE}
-      MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
+      MARIADB_DATABASE: ${DB_DATABASE}
+      MARIADB_ROOT_PASSWORD: ${DB_PASSWORD}
     volumes:
       - db:/var/lib/mysql
     restart: unless-stopped

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,17 +5,32 @@ services:
     volumes:
       - .:/var/www/html
     environment:
+      AUTORUN_ENABLED: "false"
       APACHE_DOCUMENT_ROOT: /var/www/html/public
-      PHP_MEMORY_LIMIT: "512M"
-      AUTORUN_LARAVEL_STORAGE_LINK: "false"
+      PHP_MEMORY_LIMIT: "1G"
+      PHP_MAX_EXECUTION_TIME: 300
       SSL_MODE: "off"
+      PUID: 1000
+      PGID: 1000
     network_mode: host
 
+  queue:
+    image: serversideup/php:8.1-cli
+    volumes:
+      - .:/var/www/html
+    command: ["su", "webuser", "-c", "php artisan queue:listen --queue=high,default,low"]
+    network_mode: host
+    environment:
+      PHP_MEMORY_LIMIT: "1G"
+      PHP_MAX_EXECUTION_TIME: 300
+      PUID: 1000
+      PGID: 1000
+
   db:
-    image: percona:5.7-centos
+    image: mariadb:10.6.16
     environment:
-      MYSQL_DATABASE: database
-      MYSQL_ROOT_PASSWORD: root
+      MARIADB_DATABASE: database
+      MARIADB_ROOT_PASSWORD: root
     volumes:
       - db:/var/lib/mysql
     network_mode: host
@@ -26,7 +41,6 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Etc/UTC
     network_mode: host
     volumes:
       - ./provision/beets/config.yaml:/config/config.yaml