small fixes

mollux · Feb 1, 2024 · 5fee9c5 · 5fee9c5
1 parent 646f289
commit 5fee9c5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -6,19 +6,17 @@ _This version refers to Docker images and examples for Mautic 5. If you would li
 
 all Mautic 5 Docker images follow the following naming stategy.
 
-`v5<minor.patch>-<variant>`
+`<major.minor.patch>-<variant>`
 
 There are some defaults if parts are omitted:
 
 * `<minor.patch>` is the latest release patch version in the latest minor version.
-* `variant` is apache
 
 some examples:
 
-* `v5`: latest stable version of Mautic 5 of the `apache` variant
-* `v5-apache`: latest stable version of Mautic 5 of the `apache` variant
-* `v5.0-fpm`: latest version in the 5.0 minor release in the `fpm` variant 
-* `v5.0.3-apache`: specific point release of the `apache` variant
+* `5-apache`: latest stable version of Mautic 5 of the `apache` variant
+* `5.0-fpm`: latest version in the 5.0 minor release in the `fpm` variant 
+* `5.0.3-apache`: specific point release of the `apache` variant
 
 ## Variants
 

diff --git a/examples/basic/docker-compose.yml b/examples/basic/docker-compose.yml
@@ -26,7 +26,7 @@ services:
       retries: 10
 
   mautic_web:
-    image: ghcr.io/mollux/docker-mautic:5.x-dev-apache
+    image: ghcr.io/mollux/docker-mautic:5-apache
     links:
       - db:mysql
     ports:
@@ -49,7 +49,7 @@ services:
         condition: service_healthy
 
   mautic_cron:
-    image: ghcr.io/mollux/docker-mautic:5.x-dev-apache
+    image: ghcr.io/mollux/docker-mautic:5-apache
     links:
       - db:mysql
     volumes: *mautic-volumes
@@ -60,7 +60,7 @@ services:
         condition: service_healthy
 
   mautic_worker:
-    image: ghcr.io/mollux/docker-mautic:5.x-dev-apache
+    image: ghcr.io/mollux/docker-mautic:5-apache
     links:
       - db:mysql
     volumes: *mautic-volumes

diff --git a/examples/fpm-nginx/docker-compose.yml b/examples/fpm-nginx/docker-compose.yml
@@ -37,19 +37,14 @@ services:
       - 8002:80
 
   mautic_web:
-    image: ghcr.io/mollux/docker-mautic:5.x-dev-fpm
+    image: ghcr.io/mollux/docker-mautic:5-fpm
     links:
       - db:mysql
     volumes: *mautic-volumes
 
     environment:
       - DOCKER_MAUTIC_LOAD_TEST_DATA=${DOCKER_MAUTIC_LOAD_TEST_DATA}
       - DOCKER_MAUTIC_RUN_MIGRATIONS=${DOCKER_MAUTIC_RUN_MIGRATIONS}
-      - MYSQL_HOST=${MYSQL_HOST}
-      - MYSQL_PORT=${MYSQL_PORT}
-      - MYSQL_DATABASE=${MYSQL_DATABASE}
-      - MYSQL_USER=${MYSQL_USER}
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
     env_file:
       - .mautic_env
     healthcheck:
@@ -63,7 +58,7 @@ services:
         condition: service_healthy
 
   mautic_cron:
-    image: ghcr.io/mollux/docker-mautic:5.x-dev-fpm
+    image: ghcr.io/mollux/docker-mautic:5-fpm
     links:
       - db:mysql
     volumes: *mautic-volumes
@@ -74,7 +69,7 @@ services:
         condition: service_healthy
 
   mautic_worker:
-    image: ghcr.io/mollux/docker-mautic:5.x-dev-fpm
+    image: ghcr.io/mollux/docker-mautic:5-fpm
     links:
       - db:mysql
     volumes: *mautic-volumes

diff --git a/examples/rabbitmq-worker/docker-compose.yml b/examples/rabbitmq-worker/docker-compose.yml
@@ -31,11 +31,11 @@ services:
       - rabbitmq-data:/var/lib/rabbitmq
 
   mautic_web:
-    image: ghcr.io/mollux/docker-mautic:5.x-dev-apache
+    image: ghcr.io/mollux/docker-mautic:5-apache
     links:
       - db:mysql
     ports:
-      - 8001:80
+      - 8003:80
     volumes: *mautic-volumes
 
     environment:
@@ -54,7 +54,7 @@ services:
         condition: service_healthy
 
   mautic_cron:
-    image: ghcr.io/mollux/docker-mautic:5.x-dev-apache
+    image: ghcr.io/mollux/docker-mautic:5-apache
     links:
       - db:mysql
     volumes: *mautic-volumes
@@ -65,7 +65,7 @@ services:
         condition: service_healthy
 
   mautic_worker:
-    image: ghcr.io/mollux/docker-mautic:5.x-dev-apache
+    image: ghcr.io/mollux/docker-mautic:5-apache
     links:
       - db:mysql
     volumes: *mautic-volumes