Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: default tag #7

Merged
merged 1 commit into from
Dec 11, 2024
Merged

fix: default tag #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .docker/scripts/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
Expand All @@ -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}
Expand All @@ -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}
Expand Down
1 change: 1 addition & 0 deletions examples/basic/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MAUTIC_VERSION=5.2.0
8 changes: 4 additions & 4 deletions examples/basic/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand All @@ -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}
Expand Down
1 change: 1 addition & 0 deletions examples/fpm-nginx/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MAUTIC_VERSION=5.2.0
8 changes: 4 additions & 4 deletions examples/fpm-nginx/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand All @@ -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}
Expand Down
1 change: 1 addition & 0 deletions examples/rabbitmq-worker/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MAUTIC_VERSION=5.2.0
8 changes: 4 additions & 4 deletions examples/rabbitmq-worker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand All @@ -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}
Expand Down
Loading