From 658e3255eb50311b41166b8e122dc3f7b5d3d70a Mon Sep 17 00:00:00 2001
From: serega6531 <serega6531@yandex.ru>
Date: Tue, 17 Mar 2020 00:15:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=BE=D1=80=D0=B3=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D1=84=D0=B0=D0=B9=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                                | 4 ++--
 Dockerfile_app => docker/Dockerfile_app           | 0
 Dockerfile_db => docker/Dockerfile_db             | 4 ++--
 postgresql.conf => docker/postgresql.conf         | 0
 update_db_config.sh => docker/update_db_config.sh | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename Dockerfile_app => docker/Dockerfile_app (100%)
 rename Dockerfile_db => docker/Dockerfile_db (62%)
 rename postgresql.conf => docker/postgresql.conf (100%)
 rename update_db_config.sh => docker/update_db_config.sh (100%)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4b279b5..c969e43 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
     container_name: packmate-app
     build:
       context: .
-      dockerfile: Dockerfile_app
+      dockerfile: docker/Dockerfile_app
     network_mode: "host"
     image: packmate-app:v1
     command: [
@@ -31,7 +31,7 @@ services:
     container_name: packmate-db
     build:
       context: .
-      dockerfile: Dockerfile_db
+      dockerfile: docker/Dockerfile_db
       args:
         POSTGRES_USER: ${PACKMATE_DB_USER:-packmate}
         POSTGRES_PASSWORD: ${PACKMATE_DB_PASSWORD:-K604YnL3G1hp2RDkCZNjGpxbyNpNHTRb}
diff --git a/Dockerfile_app b/docker/Dockerfile_app
similarity index 100%
rename from Dockerfile_app
rename to docker/Dockerfile_app
diff --git a/Dockerfile_db b/docker/Dockerfile_db
similarity index 62%
rename from Dockerfile_db
rename to docker/Dockerfile_db
index e45f946..00b4865 100644
--- a/Dockerfile_db
+++ b/docker/Dockerfile_db
@@ -8,7 +8,7 @@ ENV POSTGRES_USER ${POSTGRES_USER}
 ENV POSTGRES_PASSWORD ${POSTGRES_PASSWORD}
 ENV POSTGRES_DB ${POSTGRES_DB}
 
-COPY postgresql.conf /tmp/postgresql.conf
-COPY update_db_config.sh /docker-entrypoint-initdb.d/_update_db_config.sh
+COPY docker/postgresql.conf /tmp/postgresql.conf
+COPY docker/update_db_config.sh /docker-entrypoint-initdb.d/_update_db_config.sh
 
 EXPOSE 65001:65001
diff --git a/postgresql.conf b/docker/postgresql.conf
similarity index 100%
rename from postgresql.conf
rename to docker/postgresql.conf
diff --git a/update_db_config.sh b/docker/update_db_config.sh
similarity index 100%
rename from update_db_config.sh
rename to docker/update_db_config.sh