Improve dev https setup

Taskfile.yml

@@ -34,7 +34,6 @@ vars:
   DOCKER_COMPOSE_FILES_DEFAULT: "-f docker-compose.yml"
   DOCKER_COMPOSE_FILES: "{{.DOCKER_COMPOSE_FILES | default .DOCKER_COMPOSE_FILES_DEFAULT }}"
   DOCKER_COMPOSE_FILES_CI: "{{.DOCKER_COMPOSE_FILES}} -f docker-compose.ci.yml"
-  DOCKER_COMPOSE_FILES_DEV: "{{.DOCKER_COMPOSE_FILES}} -f docker-compose.dev.yml"
 
   # Sql dump files directory
   DIR_RESTORE_DATABASE: "restore/database"
@@ -178,8 +177,6 @@ tasks:
       - task dev:create-users
       # Show a one-time login to the local site.
       - task dev:cli -- drush user-login
-    env:
-      DOCKER_COMPOSE_FILES: "{{ .DOCKER_COMPOSE_FILES_DEV }}"
 
   dev:openid:configure:
     desc: Set openid connect settings based on .env variables. And run cron.

docker-compose.yml

@@ -38,13 +38,35 @@ x-environment:
     #LAGOON_ENVIRONMENT_TYPE: production
 
 services:
+  https:
+    image: ghcr.io/reload/https-proxy:proxy
+    ports:
+      - '80'
+      - '443'
+    depends_on:
+      - varnish
+    labels:
+      lagoon.type: none
+    volumes:
+      - 'projectroot:/app'
+      - '${HOME}/.local/share/mkcert:/rootCA:ro'
+      - '${HOME}/.local/share/dev_certificates:/cert:rw'
+    environment:
+      NGINX_DOCUMENT_ROOT: /app/web
+      NGINX_PROXY_PASS: http://varnish:8080
+      VIRTUAL_PROTO: https
+      VIRTUAL_HOST: >-
+        ${COMPOSE_PROJECT_NAME}.${DEV_TLD:-docker}
+    working_dir: /app
+
   varnish: # Caching HTTP reverse proxy that serves (mostly) anonymous requests.
     # https://docs.lagoon.sh/lagoon/docker-images/varnish
     image: uselagoon/varnish-6-drupal:latest
     depends_on:
       - nginx
     labels:
       lagoon.type: varnish
+      dev.orbstack.domains: ${COMPOSE_PROJECT_NAME}.local
     links:
       - nginx # links varnish to the nginx in this docker-compose project, or it would try to connect to any nginx running in docker
     << : *default-user # uses the defined user from top