Fix/dev (#358)

* doc: update link

* fix: dc dev

* chore: update mariadb

* chore: update mail container

* chore: switch to laravel-php

Author: ainsofs

.env

@@ -23,12 +23,10 @@ DB_DRIVER=mysql
 
 ### --- MARIADB ----
 
-MARIADB_TAG=10.8-3.21.0
-#MARIADB_TAG=10.7-3.21.0
-#MARIADB_TAG=10.6-3.21.0
-#MARIADB_TAG=10.5-3.21.0
-#MARIADB_TAG=10.4-3.21.0
-#MARIADB_TAG=10.3-3.21.0
+# MARIADB_TAG=11.4-3.32.6
+MARIADB_TAG=10.11-3.32.6
+#MARIADB_TAG=10.6-3.32.6
+#MARIADB_TAG=10.5-3.32.6
 
 ### --- VANILLA DRUPAL ----
 
@@ -39,16 +37,17 @@ DRUPAL_TAG=9-4.45.1
 
 # Linux (uid 1000 gid 1000)
 
-PHP_TAG=8.1-dev-4.36.4
-# PHP_TAG=8.1-dev-4.37.4
-#PHP_TAG=8.0-dev-4.37.4
-#PHP_TAG=7.4-dev-4.37.4
+# PHP_TAG=8.4-dev-0.25.6
+#PHP_TAG=8.3-dev-0.25.6
+#PHP_TAG=8.2-dev-0.25.6
+PHP_TAG=8.1-dev-0.25.6
 
 # macOS (uid 501 gid 20)
 
-#PHP_TAG=8.1-dev-macos-4.37.4
-#PHP_TAG=8.0-dev-macos-4.37.4
-#PHP_TAG=7.4-dev-macos-4.37.4
+#PHP_TAG=8.4-dev-macos-0.25.6
+#PHP_TAG=8.3-dev-macos-0.25.6
+#PHP_TAG=8.2-dev-macos-0.25.6
+#PHP_TAG=8.1-dev-macos-0.25.6
 
 ### --- NGINX ----
 
@@ -131,4 +130,4 @@ ZOOKEEPER_TAG=3.8
 EMAIL=admin@localhost
 CERT_RESOLVER=
 TRAEFIK_USER=admin
-TRAEFIK_PASSWORD_HASH=$2y$10$zi5n43jq9S63gBqSJwHTH.nCai2vB0SW/ABPGg2jSGmJBVRo0A.ni
+# TRAEFIK_PASSWORD_HASH=$2y$10$zi5n43jq9S63gBqSJwHTH.nCai2vB0SW/ABPGg2jSGmJBVRo0A.ni

docker-compose.ssl.yml compose.ssl.ymldocker-compose.ssl.yml renamed to compose.ssl.yml

@@ -26,16 +26,19 @@ services:
 
   php:
     # image: wodby/drupal-php:$PHP_TAG
-    image: wodby/php:$PHP_TAG
+    image: wodby/laravel-php:$PHP_TAG
     user: root
     command: "php-fpm -R"
     container_name: "${PROJECT_NAME}_php"
     environment:
       # APP_KEY: $APP_KEY
       LARAVEL_APP_DEBUG: "true"
-      SSMTP_MAILHUB: mailhog:1025
-      #      SSMTP_MAILHUB: opensmtpd:25
-      PHP_SENDMAIL_PATH: '"/usr/bin/dos2unix -u | /usr/sbin/ssmtp -t -f"'
+      # By default xdebug extension also disabled.
+      PHP_EXTENSIONS_DISABLE: xhprof,spx
+      PHP_MAIL_MIXED_LF_AND_CRLF: "On"
+      # Mailpit:
+      MSMTP_HOST: mailpit
+      MSMTP_PORT: 1025
       # DB_HOST: $DB_HOST
       # DB_PORT: $DB_PORT
       # DB_USERNAME: $DB_USER
@@ -69,6 +72,7 @@ services:
     #      MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","goog:chromeOptions":{"args":["--disable-gpu","--headless"]}}, "http://chrome:9515"]'
     volumes:
       - ./:/var/www/html:cached
+      - ~/.cache/composer:/home/wodby/.cache/composer
   ## Alternative for macOS users: Mutagen https://wodby.com/docs/stacks/drupal/local#docker-for-mac
   #    - drupal:/var/www/html
   ## For XHProf and Xdebug profiler traces
@@ -104,15 +108,23 @@ services:
     #    - drupal:/var/www/html
     labels:
       - "traefik.http.routers.${PROJECT_NAME}_nginx.rule=Host(`${PROJECT_BASE_URL}`)"
+      - "traefik.http.services.${PROJECT_NAME}_nginx.loadbalancer.server.port=80"
 
-  mailhog:
-    image: mailhog/mailhog
-    container_name: "${PROJECT_NAME}_mailhog"
-    ports:
-      - 8025:8025
+  mailpit:
+    image: axllent/mailpit
+    container_name: "${PROJECT_NAME}_mailpit"
     labels:
-      - "traefik.http.services.${PROJECT_NAME}_mailhog.loadbalancer.server.port=8025"
-      - "traefik.http.routers.${PROJECT_NAME}_mailhog.rule=Host(`mailhog.${PROJECT_BASE_URL}`)"
+      - "traefik.http.services.${PROJECT_NAME}_mailpit.loadbalancer.server.port=8025"
+      - "traefik.http.routers.${PROJECT_NAME}_mailpit.rule=Host(`mailpit.${PROJECT_BASE_URL}`)"
+
+  # mailhog:
+  #   image: mailhog/mailhog
+  #   container_name: "${PROJECT_NAME}_mailhog"
+  #   ports:
+  #     - 8025:8025
+  #   labels:
+  #     - "traefik.http.services.${PROJECT_NAME}_mailhog.loadbalancer.server.port=8025"
+  #     - "traefik.http.routers.${PROJECT_NAME}_mailhog.rule=Host(`mailhog.${PROJECT_BASE_URL}`)"
 
   #  postgres:
   #    image: wodby/postgres:$POSTGRES_TAG
@@ -174,16 +186,17 @@ services:
   #    labels:
   #    - "traefik.http.routers.${PROJECT_NAME}_adminer.rule=Host(`adminer.${PROJECT_BASE_URL}`)"
 
-  pma:
-    image: phpmyadmin/phpmyadmin
-    container_name: "${PROJECT_NAME}_pma"
-    environment:
-      PMA_HOST: $DB_HOST
-      PMA_USER: $DB_USER
-      PMA_PASSWORD: $DB_PASSWORD
-      UPLOAD_LIMIT: 1G
-    labels:
-      - "traefik.http.routers.${PROJECT_NAME}_pma.rule=Host(`pma.${PROJECT_BASE_URL}`)"
+  # pma:
+  #   image: phpmyadmin/phpmyadmin
+  #   container_name: "${PROJECT_NAME}_pma"
+  #   environment:
+  #     PMA_HOST: $DB_HOST
+  #     PMA_USER: $DB_USER
+  #     PMA_PASSWORD: $DB_PASSWORD
+  #     UPLOAD_LIMIT: 1G
+  #   labels:
+  #     - "traefik.http.routers.${PROJECT_NAME}_pma.rule=Host(`pma.${PROJECT_BASE_URL}`)"
+  #     - "traefik.http.services.${PROJECT_NAME}_pma.loadbalancer.server.port=80"
 
   # pma_testing:
   #   image: phpmyadmin/phpmyadmin

docker-compose.yml compose.ymldocker-compose.yml renamed to compose.yml

@@ -1,5 +1,8 @@
 include .env
 
+## Detect Docker Compose command (v2 'docker compose' or legacy 'docker-compose')
+DOCKER_COMPOSE ?= $(shell docker compose version >/dev/null 2>&1 && echo "docker compose" || echo "docker-compose")
+
 default: up
 
 COMPOSER_ROOT ?= /var/www/html
@@ -19,20 +22,20 @@ endif
 .PHONY: up
 up:
 	@echo "Starting up containers for $(PROJECT_NAME)..."
-	docker compose pull
-	docker compose up -d --remove-orphans
+	$(DOCKER_COMPOSE) pull
+	$(DOCKER_COMPOSE) up -d --remove-orphans
 
 ## ssl	:	Start up containers with SSL support.
 .PHONY: ssl
 ssl:
 	@echo "Starting up containers for $(PROJECT_NAME)..."
-	docker compose pull
-	docker compose -f docker-compose.yml -f docker-compose.ssl.yml up -d --remove-orphans
+	$(DOCKER_COMPOSE) pull
+	$(DOCKER_COMPOSE) -f compose.yml -f compose.ssl.yml up -d --remove-orphans
 
 ## gitpod	:	Start up containers in gitpod.
 .PHONY: gitpod
 gitpod:
-	docker compose --env-file .env.gitpod up -d --remove-orphans
+	$(DOCKER_COMPOSE) --env-file .env.gitpod up -d --remove-orphans
 
 .PHONY: mutagen
 mutagen:
@@ -46,13 +49,13 @@ down: stop
 .PHONY: start
 start:
 	@echo "Starting containers for $(PROJECT_NAME) from where you left off..."
-	@docker compose start
+	@$(DOCKER_COMPOSE) start
 
 ## stop	:	Stop containers.
 .PHONY: stop
 stop:
 	@echo "Stopping containers for $(PROJECT_NAME)..."
-	@docker compose stop
+	@$(DOCKER_COMPOSE) stop
 
 ## prune	:	Remove containers and their volumes.
 ##		You can optionally pass an argument with the service name to prune single container
@@ -61,7 +64,7 @@ stop:
 .PHONY: prune
 prune:
 	@echo "Removing containers for $(PROJECT_NAME)..."
-	@docker compose down -v $(filter-out $@,$(MAKECMDGOALS))
+	@$(DOCKER_COMPOSE) down -v $(filter-out $@,$(MAKECMDGOALS))
 
 ## ps	:	List running containers.
 .PHONY: ps

docker.mk

@@ -36,7 +36,7 @@ make artisan queue:work
 Access the Dev site on:
 
 ```
-sita-membership.docker.localhost:8000
+http://sita-membership.docker.localhost:8000
 ```
 
 Create test accounts and dumy data (see [Test accounts](#test-accounts))