Make docker-compose.yml for setup and docs development friendly

This enables easy local running.
Actual deployment files are moved to github.com/mailu/infra.

docs/docker-compose.yml

@@ -1,28 +1,10 @@
+# This file is used to test the mailu/docs website
+# Deployment files can be found on github.com/mailu/infra
+
 version: '3'
 
-
 services:
-  docs_master:
+  docs:
-    image: mailu/docs:master
+    image: ${DOCKER_ORG:-mailu}/docs:${MAILU_VERSION:-master}
-    networks:
+    ports:
-      - web
+      - 127.0.0.1:8000:80
-    labels:
-      - traefik.enable=true
-      - traefik.port=80
-      - traefik.main.frontend.rule=Host:${ADDRESS};PathPrefix:/master/
-
-  docs_15:
-    image: mailu/docs:1.5
-    networks:
-      - web
-    labels:
-      - traefik.enable=true
-      - traefik.port=80
-      - traefik.root.frontend.redirect.regex=.*
-      - traefik.root.frontend.redirect.replacement=/1.5/
-      - traefik.root.frontend.rule=Host:${ADDRESS};PathPrefix:/
-      - traefik.main.frontend.rule=Host:${ADDRESS};PathPrefix:/1.5/
-
-networks:
-  web:
-    external: true

setup/docker-compose.yml

@@ -1,50 +1,16 @@
-# This file is used to run the mailu/setup utility
+# This file is used to test the mailu/setup utility
+# Deployment files can be found on github.com/mailu/infra
 
 version: '3.6'
 
 services:
   redis:
     image: redis:alpine
-    networks:
-      - default
 
-  setup_master:
+  setup:
-    image: mailu/setup:master
+    image: ${DOCKER_ORG:-mailu}/setup:${MAILU_VERSION:-master}
-    networks:
-      - web
-      - default
     env_file: .env
-    environment:
-      this_version: "master"
-    labels:
-      - traefik.enable=true
-      - traefik.port=80
-      - traefik.docker.network=web
-      - traefik.main.frontend.rule=Host:${ADDRESS};PathPrefix:/master/
     depends_on:
       - redis
-
+    ports:
-  setup_release:
+      - 127.0.0.1:8001:80
-    image: mailu/setup:${RELEASE}
-    networks:
-      - web
-      - default
-    env_file: .env
-    environment:
-      this_version: ${RELEASE}
-    labels:
-      - traefik.enable=true
-      - traefik.port=80
-      - traefik.docker.network=web
-      - traefik.root.frontend.redirect.regex=.*
-      - traefik.root.frontend.redirect.replacement=/${RELEASE}/
-      - traefik.root.frontend.rule=Host:${ADDRESS};PathPrefix:/
-      - traefik.main.frontend.rule=Host:${ADDRESS};PathPrefix:/${RELEASE}/
-    depends_on:
-      - redis
-
-networks:
-  web:
-    external: true
-  default:
-    external: false

setup/server.py

@@ -11,7 +11,7 @@ import ipaddress
 import hashlib
 
 
-version = os.getenv("this_version")
+version = os.getenv("this_version", "master")
 static_url_path = "/" + version + "/static"
 app = flask.Flask(__name__, static_url_path=static_url_path)
 flask_bootstrap.Bootstrap(app)