Merge pull request #288 from wunderio/NEX-194

NEX-194: DDEV setup improvements: own domain for frontend, elasticsearch improvements

Author: vermario

.ddev/config.yaml

@@ -6,7 +6,10 @@ nodejs_version: "20"
 php_version: "8.3"
 webserver_type: nginx-fpm
 xdebug_enabled: false
-additional_hostnames: []
+# This allows us to access the frontend app via https://frontend.ddev.site
+# also check the traefik config in .ddev/traefik/config/frontend.yaml.
+additional_hostnames:
+  - frontend
 additional_fqdns: []
 database:
     type: mariadb
@@ -29,30 +32,39 @@ web_environment:
   # URL OF THE FRONTEND SITE:
   # This needs to match the proxy value for the node service
   # so if you change it, remember to change it here as well.
-  - WUNDER_NEXT_FRONTEND_URL=https://next-drupal-starterkit.ddev.site:3000
+  - WUNDER_NEXT_FRONTEND_URL=https://frontend.ddev.site
   - ENVIRONMENT_NAME=ddev
   - HASH_SALT=notsosecurehashnotsosecurehashnotsosecurehash
   - NEXT_PUBLIC_DRUPAL_BASE_URL=https://next-drupal-starterkit.ddev.site
-  - NEXT_PUBLIC_FRONTEND_URL=https://next-drupal-starterkit.ddev.site:3000
+  - NEXT_PUBLIC_FRONTEND_URL=https://frontend.ddev.site
     # Environment variables for next_auth:
   - AUTH_SECRET=nextauth_secret_not_secure_used_only_locally
   - AUTH_TRUST_HOST=true
-  - AUTH_URL=https://next-drupal-starterkit.ddev.site:3000
+  - AUTH_URL=https://frontend.ddev.site
    # Environment variables for redis
   - REDIS_HOST=redis
   - REDIS_PASS=redis
    # Environment variables for elasticsearch
   - ES_HOST=elasticsearch
+  - SMTP_ADDRESS=localhost:1025
 
 corepack_enable: false
-web_extra_exposed_ports:
-  - name: "Next.js"
-    container_port: 3000
-    http_port: 2999
-    https_port: 3000
 
 hooks:
   post-start:
-    - exec: "elasticsearch-plugin install analysis-icu"
-      service: elasticsearch
     - exec: "cd next && npm i"
+    - exec-host: |
+        # Run the Elasticsearch plugin setup script
+        ddev exec -s elasticsearch /mnt/ddev_config/elasticsearch/elasticsearch-setup.sh
+        # Check for the restart marker file
+        if [ -f .ddev/elasticsearch/restart_needed ]; then
+          echo "Elasticsearch plugins installed. Restarting elasticsearch container..."
+          docker restart ddev-${DDEV_SITENAME}-elasticsearch
+          rm .ddev/elasticsearch/restart_needed
+        fi
+
+web_extra_exposed_ports:
+  - name: node-app
+    container_port: 3000
+    http_port: 3000
+    https_port: 3001

.ddev/docker-compose.elasticsearch.yaml

@@ -1,6 +1,29 @@
 #ddev-generated
 services:
   elasticsearch:
+    container_name: ddev-${DDEV_SITENAME}-elasticsearch
+    hostname: ${DDEV_SITENAME}-elasticsearch
     image: elasticsearch:8.10.2
+    expose:
+      - "9200"
+      - "9300"
+    environment:
+      - ES_JAVA_OPTS=-Xms512m -Xmx512m
+      - discovery.type=single-node
+      - bootstrap.memory_lock=true
+      - VIRTUAL_HOST=$DDEV_HOSTNAME
+      - HTTP_EXPOSE=9200:9200
+      - HTTPS_EXPOSE=9201:9200
+      - ELASTICSEARCH_PLUGINS=analysis-icu
+    labels:
+      com.ddev.site-name: ${DDEV_SITENAME}
+      com.ddev.approot: $DDEV_APPROOT
     volumes:
+      - elasticsearch:/usr/share/elasticsearch/data
+      - ".:/mnt/ddev_config"
       - ./elasticsearch/config/elasticsearch8.yml:/usr/share/elasticsearch/config/elasticsearch.yml
+    healthcheck:
+      test: ["CMD-SHELL", "curl --fail -s elasticsearch:9200"]
+
+volumes:
+  elasticsearch:

.ddev/docker-compose.elasticsearch8.yaml

@@ -1,4 +1,3 @@
-#ddev-generated
 services:
   elasticsearch:
     image: elasticsearch:8.10.2ss
@@ -11,5 +10,10 @@ services:
       # Disable authentication in local development
       xpack.security.enabled: "false"
       xpack.security.enrollment.enabled: "false"
+      # Disable default watermark, which can cause issues in local development:
+      cluster.routing.allocation.disk.watermark.low: "2gb"
+      cluster.routing.allocation.disk.watermark.high: "1gb"
+      cluster.routing.allocation.disk.watermark.flood_stage: "500mb"
+      cluster.info.update.interval: "1m"
     volumes:
       - ./elasticsearch/config/elasticsearch8.yml:/usr/share/elasticsearch/config/elasticsearch.yml

.ddev/elasticsearch/docker-compose.elasticsearch8.yaml

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# Exit if no plugins specified
+[ -z "$ELASTICSEARCH_PLUGINS" ] && echo "No plugins specified in ELASTICSEARCH_PLUGINS" && exit 0
+
+echo "Installing Elasticsearch plugins: $ELASTICSEARCH_PLUGINS"
+needs_restart=false
+
+# Process each plugin
+for plugin in $ELASTICSEARCH_PLUGINS; do
+    # Skip if already installed
+    if bin/elasticsearch-plugin list | grep -q "$plugin"; then
+        echo "✓ Plugin $plugin already installed"
+        continue
+    fi
+
+    # Install plugin
+    echo "Installing $plugin plugin..."
+    if bin/elasticsearch-plugin install "$plugin"; then
+        chown -R elasticsearch:root "/usr/share/elasticsearch/plugins/$plugin" && \
+        chmod -R 755 "/usr/share/elasticsearch/plugins/$plugin" && \
+        echo "✓ Plugin $plugin installed successfully" && \
+        needs_restart=true
+    else
+        echo "✗ Failed to install plugin $plugin"
+        exit 1
+    fi
+done
+
+# Signal for restart if needed
+if [ "$needs_restart" = true ]; then
+    echo "New plugins were installed. Elasticsearch needs to be restarted."
+
+    # Create a marker file in the mounted config directory (visible to host)
+    touch /mnt/ddev_config/elasticsearch/restart_needed
+fi
+
+exit 0

.ddev/elasticsearch/elasticsearch-setup.sh

@@ -0,0 +1,29 @@
+http:
+  routers:
+    # Router for HTTP (port 80)
+    next-drupal-starterkit-web-80-http-frontend:
+      entrypoints:
+        - http-80
+      rule: Host(`frontend.ddev.site`)
+      service: "next-drupal-starterkit-web-node-3000"
+      ruleSyntax: v3
+      tls: false
+      priority: 100
+
+    # Router for HTTPS (port 443)
+    next-drupal-starterkit-web-80-https-frontend:
+      entrypoints:
+        - http-443
+      rule: Host(`frontend.ddev.site`)
+      service: "next-drupal-starterkit-web-node-3000"
+      ruleSyntax: v3
+      tls: true
+      priority: 100
+
+  services:
+    # Here we define the service for the Next.js app, which
+    # is running on port 3000 on the web container.
+    next-drupal-starterkit-web-node-3000:
+      loadbalancer:
+        servers:
+          - url: http://next-drupal-starterkit.ddev.site:3000

.ddev/traefik/config/frontend.yaml

@@ -95,9 +95,9 @@ lando info
 
 DDEV has a single container for both the backend and frontend, so the URLs differ only by the port:
 
-| Backend                                  | Frontend                                      |
-| ---------------------------------------- | --------------------------------------------- |
-| https://next-drupal-starterkit.ddev.site | https://next-drupal-starterkit.ddev.site:3000 |
+| Backend                                  | Frontend                   |
+| ---------------------------------------- |----------------------------|
+| https://next-drupal-starterkit.ddev.site | https://frontend.ddev.site |
 
 > NOTE: localhost:3000 does not work in DDEV, you need to use the URL provided by DDEV above.
 

README.md

@@ -72,7 +72,7 @@ run_commands() {
   echo '↪️ Use this link to log into the backend as user 1:'
   ddev drush uli
   echo '🏎️ Starting the frontend site in production mode...'
-  echo '⚠️️️️⚠️️️️⚠️️️️ Note: the site will be available at https://next-drupal-starterkit.ddev.site:3000, not localhost:3000 as the output of next start suggests.'
+  echo '⚠️️️️⚠️️️️⚠️️️️ Note: the site will be available at https://frontend.ddev.site, not localhost:3000 as the output of next start suggests.'
   ddev npm run start
 }