From 547f3caa7a4581c7dcdd087800129ebbfec49b85 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 5 Mar 2021 17:49:21 +0300
Subject: [PATCH] remove caddy containers

---
 docker-compose.yml     | 25 -------------------------
 src/docker-compose.yml | 17 -----------------
 src/web-ssl/Caddyfile  |  9 ---------
 src/web-ssl/Dockerfile |  4 ----
 src/web/Caddyfile      |  7 -------
 src/web/Dockerfile     |  3 ---
 6 files changed, 65 deletions(-)
 delete mode 100644 src/web-ssl/Caddyfile
 delete mode 100644 src/web-ssl/Dockerfile
 delete mode 100644 src/web/Caddyfile
 delete mode 100644 src/web/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
index 1872598..9f77c76 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,31 +46,6 @@ services:
       - app
     command: /opt/tt-rss/updater.sh
 
-#  web:
-#    image: cthulhoo/ttrss-web
-#    restart: unless-stopped
-#    ports:
-#      - ${HTTP_PORT}:2015
-#    volumes:
-#      - app:/var/www/html:ro
-#    depends_on:
-#      - app
-
-#  web-ssl:
-#    image: cthulhoo/ttrss-web-ssl
-#    restart: unless-stopped
-#    environment:
-#      - CADDYPATH=/certs
-#      - HTTP_HOST=${HTTP_HOST}
-#    ports:
-#      - 80:80
-#      - 443:443
-#    volumes:
-#      - app:/var/www/html:ro
-#      - certs:/certs
-#    depends_on:
-#      - app
-
   web-nginx:
     image: cthulhoo/ttrss-web-nginx
     restart: unless-stopped
diff --git a/src/docker-compose.yml b/src/docker-compose.yml
index e7fc418..81e723f 100644
--- a/src/docker-compose.yml
+++ b/src/docker-compose.yml
@@ -8,23 +8,6 @@ services:
         ./app
     restart: unless-stopped
 
-#  web:
-#    image: cthulhoo/ttrss-web:latest
-#    build: ./web
-#    restart: unless-stopped
-#    depends_on:
-#      - app
-
-#  web-ssl:
-#    image: cthulhoo/ttrss-web-ssl:latest
-#    build: ./web-ssl
-#    restart: unless-stopped
-#    environment:
-#      - CADDYPATH=/certs
-#      - HTTP_HOST=${HTTP_HOST}
-#    depends_on:
-#      - app
-
   web-nginx:
     image: cthulhoo/ttrss-web-nginx:latest
     build: ./web-nginx
diff --git a/src/web-ssl/Caddyfile b/src/web-ssl/Caddyfile
deleted file mode 100644
index 076829c..0000000
--- a/src/web-ssl/Caddyfile
+++ /dev/null
@@ -1,9 +0,0 @@
-{%HTTP_HOST%}
-tls ttrss@{%HTTP_HOST%}
-
-root /var/www/html
-log stdout
-errors stderr
-internal /tt-rss/cache
-internal /tt-rss/backups
-fastcgi / app:9000 php
diff --git a/src/web-ssl/Dockerfile b/src/web-ssl/Dockerfile
deleted file mode 100644
index 458a259..0000000
--- a/src/web-ssl/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM abiosoft/caddy:no-stats
-
-COPY Caddyfile /etc/
-ENV ACME_AGREE=true
\ No newline at end of file
diff --git a/src/web/Caddyfile b/src/web/Caddyfile
deleted file mode 100644
index 19999ab..0000000
--- a/src/web/Caddyfile
+++ /dev/null
@@ -1,7 +0,0 @@
-0.0.0.0
-root /var/www/html
-log stdout
-errors stderr
-internal /tt-rss/cache
-internal /tt-rss/backups
-fastcgi / app:9000 php
diff --git a/src/web/Dockerfile b/src/web/Dockerfile
deleted file mode 100644
index 4d081e8..0000000
--- a/src/web/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM abiosoft/caddy:no-stats
-
-COPY Caddyfile /etc/