Merge pull request #7 from LibreCodeCoop/fix/default-tag

fix: default tag
LibreCodeCoop · Dec 11, 2024 · 2dde2df · 2dde2df
2 parents 4d1b492 + c6117ed
commit 2dde2df
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 17 deletions.
diff --git a/.docker/scripts/docker-entrypoint.sh b/.docker/scripts/docker-entrypoint.sh
@@ -17,7 +17,7 @@ elif [ "$DOCKER_MAUTIC_ROLE" = "mautic_web" ]; then
 		nvm use default
 
 		cd /var/www || { echo "Directory not found /var/www"; exit 1; }
-		COMPOSER_ALLOW_SUPERUSER=1 COMPOSER_PROCESS_TIMEOUT=10000 composer create-project mautic/recommended-project:"${MAUTIC_VERSION}" html --no-interaction
+		COMPOSER_ALLOW_SUPERUSER=1 COMPOSER_PROCESS_TIMEOUT=10000 composer create-project mautic/recommended-project:"${MAUTIC_VERSION:-5.x-dev}" html --no-interaction
 		chown -R www-data: html
 		cd html || { echo "Directory not found /var/www/html"; exit 1; }
 		rm -rf var/cache/js

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ x-mautic-volumes: &mautic-volumes
   - ./volumes/cron:/opt/mautic/cron:z
 
 x-mautic-environments: &mautic-environments
-  MAUTIC_VERSION: 5.x-dev
+  MAUTIC_VERSION: ${MAUTIC_VERSION:-5.x-dev}
   TZ: ${TZ:-CET}
   HOST_UID: ${HOST_UID:-1000}
   HOST_GID: ${HOST_GID:-1000}
@@ -19,7 +19,7 @@ x-mautic-environments: &mautic-environments
 
 services:
   mautic_web:
-    image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
+    image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
     # build:
     #   context: .docker/
     #   dockerfile: Dockerfile.${IMAGE_TYPE:-apache}
@@ -36,7 +36,7 @@ services:
       retries: 100
 
   mautic_cron:
-    image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
+    image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
     # build:
     #   context: .docker/
     #   dockerfile: Dockerfile.${IMAGE_TYPE:-apache}
@@ -49,7 +49,7 @@ services:
         condition: service_healthy
 
   mautic_worker:
-    image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
+    image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
     # build:
     #   context: .docker/
     #   dockerfile: Dockerfile.${IMAGE_TYPE:-apache}

diff --git a/examples/basic/.env b/examples/basic/.env
@@ -0,0 +1 @@
+MAUTIC_VERSION=5.2.0
diff --git a/examples/basic/docker-compose.yml b/examples/basic/docker-compose.yml
@@ -3,7 +3,7 @@ x-mautic-volumes: &mautic-volumes
   - ./volumes/cron:/opt/mautic/cron
 
 x-mautic-environments: &mautic-environments
-  MAUTIC_VERSION: 5.x-dev
+  MAUTIC_VERSION: ${MAUTIC_VERSION:-5.x-dev}
   TZ: ${TZ:-CET}
   HOST_UID: ${HOST_UID:-1000}
   HOST_GID: ${HOST_GID:-1000}
@@ -40,7 +40,7 @@ services:
       retries: 10
 
   mautic_web:
-    image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
+    image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
     # build:
     #   context: ../../.docker/
     #   dockerfile: Dockerfile.${IMAGE_TYPE:-apache}
@@ -62,7 +62,7 @@ services:
       - 127.0.0.1:80:80
 
   mautic_cron:
-    image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
+    image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
     # build:
     #   context: ../../.docker/
     #   dockerfile: Dockerfile.${IMAGE_TYPE:-apache}
@@ -75,7 +75,7 @@ services:
         condition: service_healthy
 
   mautic_worker:
-    image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
+    image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
     # build:
     #   context: ../../.docker/
     #   dockerfile: Dockerfile.${IMAGE_TYPE:-apache}

diff --git a/examples/fpm-nginx/.env b/examples/fpm-nginx/.env
@@ -0,0 +1 @@
+MAUTIC_VERSION=5.2.0
diff --git a/examples/fpm-nginx/docker-compose.yml b/examples/fpm-nginx/docker-compose.yml
@@ -3,7 +3,7 @@ x-mautic-volumes: &mautic-volumes
   - ./volumes/cron:/opt/mautic/cron:z
 
 x-mautic-environments: &mautic-environments
-  MAUTIC_VERSION: 5.x-dev
+  MAUTIC_VERSION: ${MAUTIC_VERSION:-5.x-dev}
   TZ: ${TZ:-CET}
   HOST_UID: ${HOST_UID:-1000}
   HOST_GID: ${HOST_GID:-1000}
@@ -40,7 +40,7 @@ services:
       retries: 10
 
   mautic_web:
-    image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-fpm}
+    image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-fpm}
     # build:
     #   context: ../../.docker/
     #   dockerfile: Dockerfile.${IMAGE_TYPE:-fpm}
@@ -62,7 +62,7 @@ services:
       - 127.0.0.1:80:80
 
   mautic_cron:
-    image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-fpm}
+    image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-fpm}
     # build:
     #   context: ../../.docker/
     #   dockerfile: Dockerfile.${IMAGE_TYPE:-fpm}
@@ -75,7 +75,7 @@ services:
         condition: service_healthy
 
   mautic_worker:
-    image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-fpm}
+    image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-fpm}
     # build:
     #   context: ../../.docker/
     #   dockerfile: Dockerfile.${IMAGE_TYPE:-fpm}

diff --git a/examples/rabbitmq-worker/.env b/examples/rabbitmq-worker/.env
@@ -0,0 +1 @@
+MAUTIC_VERSION=5.2.0
diff --git a/examples/rabbitmq-worker/docker-compose.yml b/examples/rabbitmq-worker/docker-compose.yml
@@ -3,7 +3,7 @@ x-mautic-volumes: &mautic-volumes
   - ./volumes/cron:/opt/mautic/cron
 
 x-mautic-environments: &mautic-environments
-  MAUTIC_VERSION: 5.x-dev
+  MAUTIC_VERSION: ${MAUTIC_VERSION:-5.x-dev}
   TZ: ${TZ:-CET}
   HOST_UID: ${HOST_UID:-1000}
   HOST_GID: ${HOST_GID:-1000}
@@ -40,7 +40,7 @@ services:
       retries: 10
 
   mautic_web:
-    image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
+    image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
     # build:
     #   context: ../../.docker/
     #   dockerfile: Dockerfile.${IMAGE_TYPE:-apache}
@@ -63,7 +63,7 @@ services:
       - 127.0.0.1:80:80
 
   mautic_cron:
-    image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
+    image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
     # build:
     #   context: ../../.docker/
     #   dockerfile: Dockerfile.${IMAGE_TYPE:-apache}
@@ -77,7 +77,7 @@ services:
         condition: service_healthy
 
   mautic_worker:
-    image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
+    image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
     # build:
     #   context: ../../.docker/
     #   dockerfile: Dockerfile.${IMAGE_TYPE:-apache}