From e764358929f96b4d65564f7f7a967c75c9b53207 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Wed, 7 Sep 2022 20:40:01 +0600
Subject: [PATCH] final preparings to test

---
 .gitignore                |  1 +
 Dockerfile                |  8 --------
 README.md                 |  4 ++--
 sample.Dockerfile         |  7 +++++++
 sample.deploy.sh          | 26 ++++++++++++++++++++++++++
 sample.docker-compose.yml | 22 ++++++++++++++++++++++
 6 files changed, 58 insertions(+), 10 deletions(-)
 delete mode 100644 Dockerfile
 create mode 100644 sample.Dockerfile
 create mode 100644 sample.deploy.sh
 create mode 100644 sample.docker-compose.yml

diff --git a/.gitignore b/.gitignore
index f815d61..53f6665 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,6 @@ build/
 out/
 
 local.*
+local/
 local.*/
 secret.gradle
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 654c86d..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM adoptopenjdk/openjdk11
-
-USER 1000
-
-ENTRYPOINT ["/telegram_bot/bin/telegram_bot", "/telegram_bot/local.config.json"]
-
-ADD ./build/distributions/telegram_bot.tar /
-ADD ./local.config.json /telegram_bot/
diff --git a/README.md b/README.md
index cf38ec5..a66c52c 100644
--- a/README.md
+++ b/README.md
@@ -17,10 +17,10 @@ ExtendedBot(id=ChatId(chatId=1234567890), username=Username(username=@username_o
 
 ### Docker
 
-In this template there is template-like [docker-compose](docker-compose.yml) and [docker](Dockerfile) files. Besides,
+In this template there is template-like [docker-compose](docker-compose.yml) and [docker](sample.Dockerfile) files. Besides,
 there is [Makefile](Makefile) and you may use something like `make buildAndStartCompose` to start your bot.
 
-It is important to replace `"TOKEN"` in [Dockerfile](Dockerfile) or remove and add some config as a volume.
+It is important to replace `"TOKEN"` in [Dockerfile](sample.Dockerfile) or remove and add some config as a volume.
 
 ## What next?
 
diff --git a/sample.Dockerfile b/sample.Dockerfile
new file mode 100644
index 0000000..2bea80f
--- /dev/null
+++ b/sample.Dockerfile
@@ -0,0 +1,7 @@
+FROM adoptopenjdk/openjdk11
+
+USER 1000
+
+ENTRYPOINT ["/booru_grabber_bot/bin/booru_grabber_bot", "/booru_grabber_bot/local.config.json"]
+
+ADD ./build/distributions/booru_grabber_bot.tar /
diff --git a/sample.deploy.sh b/sample.deploy.sh
new file mode 100644
index 0000000..54321d0
--- /dev/null
+++ b/sample.deploy.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+function send_notification() {
+    echo "$1"
+}
+
+function assert_success() {
+    "${@}"
+    local status=${?}
+    if [ ${status} -ne 0 ]; then
+        send_notification "### Error ${status} at: ${BASH_LINENO[*]} ###"
+        exit ${status}
+    fi
+}
+
+app=booru_grabber_bot
+version=0.0.1
+server=hub.docker.com
+
+assert_success ../gradlew build
+# scp ./build/distributions/AutoPostTestTelegramBot-1.0.0.zip ./config.json developer@insanusmokrassar.dev:/tmp/
+assert_success sudo docker build -t $app:"$version" .
+assert_success sudo docker tag $app:"$version" $server/$app:$version
+assert_success sudo docker tag $app:"$version" $server/$app:latest
+assert_success sudo docker push $server/$app:$version
+assert_success sudo docker push $server/$app:latest
diff --git a/sample.docker-compose.yml b/sample.docker-compose.yml
new file mode 100644
index 0000000..f5a39c8
--- /dev/null
+++ b/sample.docker-compose.yml
@@ -0,0 +1,22 @@
+version: "3.4"
+
+services:
+  booru_grabber_bot_postgres:
+    image: postgres
+    container_name: "booru_grabber_bot_postgres"
+    environment:
+      POSTGRES_USER: "${PG_USER}"
+      POSTGRES_PASSWORD: "${PG_PASSWORD}"
+      POSTGRES_DB: "${PG_DB}"
+    volumes:
+      - "${DATA_PATH}/db/:/var/lib/postgresql/"
+  booru_grabber_bot:
+    image: hub.docker.com/booru_grabber_bot
+    container_name: "booru_grabber_bot"
+    restart: "unless-stopped"
+    volumes:
+      - "${DATA_PATH}/config.json:/config.json"
+    links:
+      - "booru_grabber_bot_postgres:postgres"
+    depends_on:
+      - "booru_grabber_bot_postgres"