adds development versions

docker-compose.yml

@@ -15,7 +15,7 @@ services:
      - $path/pathfinder/export/sql/eve_universe.sql.zip:/eve_universe.sql.zip
     restart: always
   pf-redis:
-    image: redis:latest
+    image: redis:6.2.5-alpine3.14
     container_name: "$CONTAINER_NAME-redis"
     command: ["redis-server", "--appendonly", "yes"]
     hostname: redis
@@ -46,29 +46,64 @@ services:
     build: '.'
     env_file:
     - .env
-    # labels:
-    #   caddy: map.goryn.wtf
-    #   caddy.reverse_proxy: "{{upstreams 80}}"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=web"
+      - "traefik.http.services.pf.loadbalancer.server.port=80"
+      - "traefik.http.routers.pf.rule=Host(`${DOMAIN}`)"
+      - "traefik.http.routers.pf.entrypoints=web"
+      - "traefik.http.routers.pf-secure.rule=Host(`${DOMAIN}`)"
+      - "traefik.http.routers.pf-secure.entrypoints=websecure"
+      - "traefik.http.routers.pf-secure.tls=true"
+      - "traefik.http.routers.pf-secure.tls.certresolver=letsencrypt"
+      - "traefik.http.middlewares.redirecthttps.redirectscheme.scheme=https"
+      - "traefik.http.routers.pf.middlewares=redirecthttps"
     networks:
       - pf
-      # - caddy
-    ports:
-     - 80:80
-     - 8030:8030
+      - web
     healthcheck:
       disable: true
     volumes:
       - ${path}/config/pathfinder/config.ini:/var/www/html/pathfinder/app/templateConfig.ini
       - ${path}/config/pathfinder/pathfinder.ini:/var/www/html/pathfinder/app/pathfinder.ini
-      - ${path}/config/pathfinder/plugins.ini:/var/www/html/pathfinder/app/plugins.ini
+      - ${path}/config/pathfinder/plugin.ini:/var/www/html/pathfinder/app/plugin.ini
     depends_on:
-      - pfdb   
+      - pfdb
       - pf-redis
       - pf-socket
     restart: always
+  traefik:
+    image: "traefik:v2.3"
+    container_name: "traefik"
+    command:
+      - "--log.level=ERROR"
+      - "--api.insecure=true"
+      - "--providers.docker=true"
+      - "--providers.docker.exposedbydefault=false"
+      - "--entrypoints.web.address=:80"
+      - "--entrypoints.websecure.address=:443"
+      - "--certificatesresolvers.letsencrypt.acme.httpchallenge=true"
+      - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web"
+      # Remove below line when ready for production
+      - "--certificatesresolvers.letsencrypt.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
+      - "--certificatesresolvers.letsencrypt.acme.email=MYEMAIL@someemailprobablygmail.com"
+      - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
+    ports:
+      - "80:80"
+      - "443:443"
+      - "8080:8080"
+    volumes:
+      - "/var/run/docker.sock:/var/run/docker.sock:ro"
+      - "./letsencrypt:/letsencrypt"
+    networks:
+      - web
+    restart: always
 
 volumes:
+     data:
      db_data:
      redis_data:
 networks:
     pf:
+    web:
+       external: true