From bb575f49412780c3378d3bbd67e64b1c070763bb Mon Sep 17 00:00:00 2001
From: saber-nyan <saber-nyan@ya.ru>
Date: Wed, 20 Nov 2019 21:51:04 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=BD=D0=B5=D1=81=20=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D1=83=20=D0=B8=D0=BD=D1=82?=
 =?UTF-8?q?=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81=D0=B0=20=D0=B2=20=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=83=D1=8E=20=D0=BE?=
 =?UTF-8?q?=D0=BA=D1=80=D1=83=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile_app     | 4 +++-
 README.md          | 1 +
 docker-compose.yml | 3 ++-
 start.sh           | 7 ++++++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Dockerfile_app b/Dockerfile_app
index 5cb0e50..0c45d19 100644
--- a/Dockerfile_app
+++ b/Dockerfile_app
@@ -22,11 +22,13 @@ ARG PACKMATE_DB_NAME
 ARG PACKMATE_LOCAL_IP
 ARG PACKMATE_WEB_LOGIN
 ARG PACKMATE_WEB_PASSWORD
+ARG PACKMATE_INTERFACE
 
 ENV DB_USER ${PACKMATE_DB_USER:-packmate}
 ENV DB_PASSWORD ${PACKMATE_DB_PASSWORD:-packmate_secret_password}
 ENV DB_NAME ${PACKMATE_DB_DB:-packmate}
-ENV LOCAL_IP ${PACKMATE_LOCAL_IP:-192.168.79.131}
+ENV LOCAL_IP ${PACKMATE_LOCAL_IP}
+ENV IFACE ${PACKMATE_INTERFACE}
 ENV WEB_LOGIN ${PACKMATE_WEB_LOGIN:-BinaryBears}
 ENV WEB_PASSWORD ${PACKMATE_WEB_PASSWORD:-123456}
 
diff --git a/README.md b/README.md
index 8693c23..25822aa 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ git submodule update --init --recursive
 Для сборки и запуска:
 ```bash
 export PACKMATE_LOCAL_IP='192.168...'  # IP хоста в перехватываемой сети
+export PACKMATE_INTERFACE='eth0'  # Сетевой интерфейс для перехвата пакетов
 
 # Дальше все экспорты опциональны
 export PACKMATE_WEB_LOGIN='BinaryBears'  # Имя пользователя для веб-интерфейса
diff --git a/docker-compose.yml b/docker-compose.yml
index 4ed2f46..f09f223 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,6 +9,7 @@ services:
         PACKMATE_DB_USER: ${PACKMATE_DB_USER}
         PACKMATE_DB_PASSWORD: ${PACKMATE_DB_PASSWORD}
         PACKMATE_DB_NAME: ${PACKMATE_DB_NAME}
+        PACKMATE_INTERFACE: ${PACKMATE_INTERFACE}
         PACKMATE_LOCAL_IP: ${PACKMATE_LOCAL_IP}
         PACKMATE_WEB_LOGIN: ${PACKMATE_WEB_LOGIN}
         PACKMATE_WEB_PASSWORD: ${PACKMATE_WEB_PASSWORD}
@@ -16,7 +17,7 @@ services:
     image: packmate-app:v1
     depends_on:
       - db
-    restart: always
+    restart: on-failure
   db:
     container_name: packmate-db
     build:
diff --git a/start.sh b/start.sh
index f8f8b80..b2b9083 100755
--- a/start.sh
+++ b/start.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
-IFACE="$(ls /sys/class/net | grep '^e')"
+
+die() { echo "$*" 1>&2 ; exit 0; }  # Return 0 to stop docker container
+
+[[ -z "${LOCAL_IP}" ]] && die 'Required env variable $PACKMATE_LOCAL_IP is not set, exiting!'
+[[ -z "${IFACE}" ]] && die 'Required env variable $PACKMATE_INTERFACE is not set, exiting!'
+
 echo "Capturing on interface ${IFACE} with IP ${LOCAL_IP}..."
 echo "--> DEBUG: Web login is ${WEB_LOGIN}:${WEB_PASSWORD}"
 exec java -jar app.jar --spring.datasource.url="jdbc:postgresql://127.0.0.1:65001/${DB_NAME}" --spring.datasource.username="${DB_USER}" --spring.datasource.password="${DB_PASSWORD}" --interface-name="${IFACE}" --local-ip="${LOCAL_IP}" --account-login="${WEB_LOGIN}" --account-password="${WEB_PASSWORD}" --server.port=65000