From efff580100a2e71bce7d63d9463bce5ac62f6a82 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Sun, 10 May 2020 23:22:45 +0200
Subject: [PATCH] Try to slim down config

---
 .drone.yml                                    |  5 ++--
 README.md                                     | 30 -------------------
 ...ose.override.yml => docker-compose.dev.yml | 14 ++++-----
 ....production.yml => docker-compose.prod.yml |  1 +
 docker-compose.yml                            |  6 ----
 5 files changed, 9 insertions(+), 47 deletions(-)
 rename docker-compose.override.yml => docker-compose.dev.yml (76%)
 rename docker-compose.production.yml => docker-compose.prod.yml (98%)
 delete mode 100644 docker-compose.yml

diff --git a/.drone.yml b/.drone.yml
index cd94a99..7882395 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,11 +3,10 @@ kind: pipeline
 name: deploy to swarm.autonomic.zone
 steps:
   - name: deployment
-    image: decentral1se/drone-stack:19.03.8-override-compose
+    image: decentral1se/drone-stack:19.03.8
     settings:
-      compose: docker-compose.yml
+      compose: docker-compose.prod.yml
       host: tcp://swarm.autonomic.zone:2376
-      override_compose: docker-compose.production.yml
       stack_name: traefik
       tlsverify: true
     environment:
diff --git a/README.md b/README.md
index 07df508..44a8e60 100644
--- a/README.md
+++ b/README.md
@@ -3,33 +3,3 @@
 [![Build Status](https://drone.autonomic.zone/api/badges/autonomic-cooperative/traefik/status.svg)](https://drone.autonomic.zone/autonomic-cooperative/traefik)
 
 > https://docs.traefik.io/
-
-> https://traefik.swarm.autonomic.zone
-
-## Development
-
-```bash
-$ git clone https://git.autonomic.zone/autonomic-cooperative/traefik && cd traefik
-$ python3 -m venv .venv && source .venv/bin/activate
-$ pip install -r requirements.txt
-$ docker-compose up
-```
-
-Traefik dashboard:
-
-> http://traefik.localhost
-
-Test application:
-
-> http://whoami.localhost
-
-Also available via (testing routing of proxy):
-
-```bash
-$ curl -H Host:whoami.localhost http://127.0.0.1
-```
-
-## Production
-
-1. Our [drone.autonomic.zone](https://drone.autonomic.zone/autonomic-cooperative/traefik/) configuration automatically deploys.
-1. For a manual deploy guide, see [this documentation](https://git.autonomic.zone/autonomic-cooperative/organising/wiki/working-with-docker-swarm).
diff --git a/docker-compose.override.yml b/docker-compose.dev.yml
similarity index 76%
rename from docker-compose.override.yml
rename to docker-compose.dev.yml
index 85db969..6d73437 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.dev.yml
@@ -3,26 +3,24 @@ version: "3.8"
 
 services:
   traefik:
-    container_name: traefik
+    image: "traefik:v2.2"
     ports:
       - "80:80"
       - "8080:8080"
+    volumes:
+      - "/var/run/docker.sock:/var/run/docker.sock"
+      - "letsencrypt:/etc/letsencrypt"
     command:
       - "--api=true"
       - "--api.insecure=true"
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
       - "--entrypoints.web.address=:80"
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.traefik.rule=Host(`traefik.localhost`)"
       - "traefik.http.routers.traefik.entrypoints=web"
       - "traefik.http.routers.traefik.service=api@internal"
 
-  whoami:
-    image: containous/whoami
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.whoami.rule=Host(`whoami.localhost`)"
+volumes:
+  letsencrypt:
diff --git a/docker-compose.production.yml b/docker-compose.prod.yml
similarity index 98%
rename from docker-compose.production.yml
rename to docker-compose.prod.yml
index c305a65..909ab4d 100644
--- a/docker-compose.production.yml
+++ b/docker-compose.prod.yml
@@ -3,6 +3,7 @@ version: "3.8"
 
 services:
   traefik:
+    image: "traefik:v2.2"
     ports:
       - "80:80"
       - "443:443"
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 1c51e5b..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-version: "3.8"
-
-services:
-  traefik:
-    image: "traefik:v2.2"