Merge pull request #1 from FreeElephants/dev

Dev

Author: samizdam

Makefile

@@ -1,13 +1,15 @@
+$(shell cp -n dist.env .env)
+include .env
+
 install:
-	cp docker.env .env
-	docker-compose pull
-	docker network create dev-router
+	docker compose pull
+	docker network create $(DEV_ROUTER_NETWORK)
 
 run:
-	docker-compose up -d
+	docker compose up -d
 
 stop:
-	docker-compose down
+	docker compose down
 
 restart: stop run
 

README.md

@@ -1,8 +1,6 @@
 #  Development Router
 
-Automated Reverse Proxy for local docker services. 
-
-Based on https://github.com/nginx-proxy/nginx-proxy. 
+Automated Reverse Proxy and virtual hosts for local docker services.
 
 ## Usage:
 
@@ -13,18 +11,15 @@ make run
 
 1. Add to upstream service docker-compose configuration:
 ```yaml
-version: "3.7"
-
 services:
   some-service:
-    networks:
-      dev-router:
-      default:
-    environment:
-      - VIRTUAL_HOST=some-service.local
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.some-service.rule=Host(`some-service.local`)"
+      - "traefik.http.routers.some-service.entrypoints=web"
 ```
 
-2. Add to service domain to `/etc/hosts`
+2. Add virtual host name to `/etc/hosts`
 ```
 127.0.0.1   some-service.local
 ```

dist.env

@@ -0,0 +1,3 @@
+HOST_WEB_PORT=80
+HOST_UI_PORT=8080
+DEV_ROUTER_NETWORK=dev-router

docker-compose.yml

@@ -1,17 +1,24 @@
 version: "3.7"
 
 services:
-  nginx-proxy:
-    image: nginxproxy/nginx-proxy:alpine
+  traefik:
+    image: traefik:v2.2
+    restart: unless-stopped
     container_name: dev-router
-    restart: always
+    command:
+      - --api.insecure=true
+      - --providers.docker=true
+      - --providers.docker.exposedbydefault=false
+      - --entrypoints.web.address=:80
     ports:
-      - ${DEV_ROUTER_HOST_PORT}:80
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ${HOST_WEB_PORT}:80
+      - ${HOST_UI_PORT}:8080
     networks:
       dev-router:
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
 
 networks:
   dev-router:
+    name: ${DEV_ROUTER_NETWORK}
     external: true