From 8dbdb70f5c10eb0127339426e7568994c7b8088c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 1 Oct 2020 11:46:04 +0300
Subject: [PATCH] remove second compose YML

---
 {src/db => db}/Dockerfile         |  0
 {src/db => db}/init-count-bits.sh |  0
 docker-compose.yml                |  3 +++
 src/docker-compose.yml            | 21 ---------------------
 4 files changed, 3 insertions(+), 21 deletions(-)
 rename {src/db => db}/Dockerfile (100%)
 rename {src/db => db}/init-count-bits.sh (100%)
 delete mode 100644 src/docker-compose.yml

diff --git a/src/db/Dockerfile b/db/Dockerfile
similarity index 100%
rename from src/db/Dockerfile
rename to db/Dockerfile
diff --git a/src/db/init-count-bits.sh b/db/init-count-bits.sh
similarity index 100%
rename from src/db/init-count-bits.sh
rename to db/init-count-bits.sh
diff --git a/docker-compose.yml b/docker-compose.yml
index 566bd6d..7e30568 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,9 @@ version: '3'
 services:
   db:
     image: cthulhoo/ttrss-db-pgsql-12-count-bits:latest
+    build:
+      context:
+        ./db
     restart: unless-stopped
     volumes:
       - db:/var/lib/postgresql/data
diff --git a/src/docker-compose.yml b/src/docker-compose.yml
deleted file mode 100644
index ee4a46f..0000000
--- a/src/docker-compose.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-version: '3'
-
-# set database password in .env
-# please don't use quote (') or (") symbols in variables
-
-services:
-  db:
-    image: cthulhoo/ttrss-db-pgsql-12-count-bits:${BUILD_TAG}
-    build:
-      context:
-        ./db
-    restart: unless-stopped
-    volumes:
-      - db:/var/lib/postgresql/data
-    environment:    
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_USER=${POSTGRES_USER}
-
-volumes:
-  db:
-