Skip to content

Commit 2dde2df

Browse files
vitormattosvitormattos
authored
Merge pull request #7 from LibreCodeCoop/fix/default-tag
fix: default tag
2 parents 4d1b492 + c6117ed commit 2dde2df

File tree

8 files changed

+20
-17
lines changed

8 files changed

+20
-17
lines changed

‎.docker/scripts/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ elif [ "$DOCKER_MAUTIC_ROLE" = "mautic_web" ]; then
1717
nvm use default
1818

1919
cd /var/www || { echo "Directory not found /var/www"; exit 1; }
20-
COMPOSER_ALLOW_SUPERUSER=1 COMPOSER_PROCESS_TIMEOUT=10000 composer create-project mautic/recommended-project:"${MAUTIC_VERSION}" html --no-interaction
20+
COMPOSER_ALLOW_SUPERUSER=1 COMPOSER_PROCESS_TIMEOUT=10000 composer create-project mautic/recommended-project:"${MAUTIC_VERSION:-5.x-dev}" html --no-interaction
2121
chown -R www-data: html
2222
cd html || { echo "Directory not found /var/www/html"; exit 1; }
2323
rm -rf var/cache/js

‎docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ x-mautic-volumes: &mautic-volumes
33
- ./volumes/cron:/opt/mautic/cron:z
44

55
x-mautic-environments: &mautic-environments
6-
MAUTIC_VERSION: 5.x-dev
6+
MAUTIC_VERSION: ${MAUTIC_VERSION:-5.x-dev}
77
TZ: ${TZ:-CET}
88
HOST_UID: ${HOST_UID:-1000}
99
HOST_GID: ${HOST_GID:-1000}
@@ -19,7 +19,7 @@ x-mautic-environments: &mautic-environments
1919

2020
services:
2121
mautic_web:
22-
image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
22+
image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
2323
# build:
2424
# context: .docker/
2525
# dockerfile: Dockerfile.${IMAGE_TYPE:-apache}
@@ -36,7 +36,7 @@ services:
3636
retries: 100
3737

3838
mautic_cron:
39-
image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
39+
image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
4040
# build:
4141
# context: .docker/
4242
# dockerfile: Dockerfile.${IMAGE_TYPE:-apache}
@@ -49,7 +49,7 @@ services:
4949
condition: service_healthy
5050

5151
mautic_worker:
52-
image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
52+
image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
5353
# build:
5454
# context: .docker/
5555
# dockerfile: Dockerfile.${IMAGE_TYPE:-apache}

‎examples/basic/.env‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
MAUTIC_VERSION=5.2.0

‎examples/basic/docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ x-mautic-volumes: &mautic-volumes
33
- ./volumes/cron:/opt/mautic/cron
44

55
x-mautic-environments: &mautic-environments
6-
MAUTIC_VERSION: 5.x-dev
6+
MAUTIC_VERSION: ${MAUTIC_VERSION:-5.x-dev}
77
TZ: ${TZ:-CET}
88
HOST_UID: ${HOST_UID:-1000}
99
HOST_GID: ${HOST_GID:-1000}
@@ -40,7 +40,7 @@ services:
4040
retries: 10
4141

4242
mautic_web:
43-
image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
43+
image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
4444
# build:
4545
# context: ../../.docker/
4646
# dockerfile: Dockerfile.${IMAGE_TYPE:-apache}
@@ -62,7 +62,7 @@ services:
6262
- 127.0.0.1:80:80
6363

6464
mautic_cron:
65-
image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
65+
image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
6666
# build:
6767
# context: ../../.docker/
6868
# dockerfile: Dockerfile.${IMAGE_TYPE:-apache}
@@ -75,7 +75,7 @@ services:
7575
condition: service_healthy
7676

7777
mautic_worker:
78-
image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
78+
image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
7979
# build:
8080
# context: ../../.docker/
8181
# dockerfile: Dockerfile.${IMAGE_TYPE:-apache}

‎examples/fpm-nginx/.env‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
MAUTIC_VERSION=5.2.0

‎examples/fpm-nginx/docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ x-mautic-volumes: &mautic-volumes
33
- ./volumes/cron:/opt/mautic/cron:z
44

55
x-mautic-environments: &mautic-environments
6-
MAUTIC_VERSION: 5.x-dev
6+
MAUTIC_VERSION: ${MAUTIC_VERSION:-5.x-dev}
77
TZ: ${TZ:-CET}
88
HOST_UID: ${HOST_UID:-1000}
99
HOST_GID: ${HOST_GID:-1000}
@@ -40,7 +40,7 @@ services:
4040
retries: 10
4141

4242
mautic_web:
43-
image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-fpm}
43+
image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-fpm}
4444
# build:
4545
# context: ../../.docker/
4646
# dockerfile: Dockerfile.${IMAGE_TYPE:-fpm}
@@ -62,7 +62,7 @@ services:
6262
- 127.0.0.1:80:80
6363

6464
mautic_cron:
65-
image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-fpm}
65+
image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-fpm}
6666
# build:
6767
# context: ../../.docker/
6868
# dockerfile: Dockerfile.${IMAGE_TYPE:-fpm}
@@ -75,7 +75,7 @@ services:
7575
condition: service_healthy
7676

7777
mautic_worker:
78-
image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-fpm}
78+
image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-fpm}
7979
# build:
8080
# context: ../../.docker/
8181
# dockerfile: Dockerfile.${IMAGE_TYPE:-fpm}

‎examples/rabbitmq-worker/.env‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
MAUTIC_VERSION=5.2.0

‎examples/rabbitmq-worker/docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ x-mautic-volumes: &mautic-volumes
33
- ./volumes/cron:/opt/mautic/cron
44

55
x-mautic-environments: &mautic-environments
6-
MAUTIC_VERSION: 5.x-dev
6+
MAUTIC_VERSION: ${MAUTIC_VERSION:-5.x-dev}
77
TZ: ${TZ:-CET}
88
HOST_UID: ${HOST_UID:-1000}
99
HOST_GID: ${HOST_GID:-1000}
@@ -40,7 +40,7 @@ services:
4040
retries: 10
4141

4242
mautic_web:
43-
image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
43+
image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
4444
# build:
4545
# context: ../../.docker/
4646
# dockerfile: Dockerfile.${IMAGE_TYPE:-apache}
@@ -63,7 +63,7 @@ services:
6363
- 127.0.0.1:80:80
6464

6565
mautic_cron:
66-
image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
66+
image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
6767
# build:
6868
# context: ../../.docker/
6969
# dockerfile: Dockerfile.${IMAGE_TYPE:-apache}
@@ -77,7 +77,7 @@ services:
7777
condition: service_healthy
7878

7979
mautic_worker:
80-
image: ghcr.io/librecodecoop/mautic:${IMAGE_TYPE:-apache}
80+
image: ghcr.io/librecodecoop/mautic:${MAUTIC_VERSION:-5.x-dev}-${IMAGE_TYPE:-apache}
8181
# build:
8282
# context: ../../.docker/
8383
# dockerfile: Dockerfile.${IMAGE_TYPE:-apache}

0 commit comments

Comments
 (0)