0xb00b5/0xb00b5-packmate
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Вынес настройку интерфейса в переменную окружения

Browse Source
This commit is contained in:
saber-nyan
2019-11-20 21:51:04 +03:00
parent b81af5eb1f
commit bb575f4941
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile_app
View File

@@ -22,11 +22,13 @@ ARG PACKMATE_DB_NAME
ARG PACKMATE_LOCAL_IP ARG PACKMATE_LOCAL_IP
ARG PACKMATE_WEB_LOGIN ARG PACKMATE_WEB_LOGIN
ARG PACKMATE_WEB_PASSWORD ARG PACKMATE_WEB_PASSWORD
ARG PACKMATE_INTERFACE
ENV DB_USER ${PACKMATE_DB_USER:-packmate} ENV DB_USER ${PACKMATE_DB_USER:-packmate}
ENV DB_PASSWORD ${PACKMATE_DB_PASSWORD:-packmate_secret_password} ENV DB_PASSWORD ${PACKMATE_DB_PASSWORD:-packmate_secret_password}
ENV DB_NAME ${PACKMATE_DB_DB:-packmate} 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_LOGIN ${PACKMATE_WEB_LOGIN:-BinaryBears}
ENV WEB_PASSWORD ${PACKMATE_WEB_PASSWORD:-123456} ENV WEB_PASSWORD ${PACKMATE_WEB_PASSWORD:-123456}

1
README.md
View File

@@ -22,6 +22,7 @@ git submodule update --init --recursive
Для сборки и запуска: Для сборки и запуска:
```bash ```bash
export PACKMATE_LOCAL_IP='192.168...' # IP хоста в перехватываемой сети export PACKMATE_LOCAL_IP='192.168...' # IP хоста в перехватываемой сети
export PACKMATE_INTERFACE='eth0' # Сетевой интерфейс для перехвата пакетов
# Дальше все экспорты опциональны # Дальше все экспорты опциональны
export PACKMATE_WEB_LOGIN='BinaryBears' # Имя пользователя для веб-интерфейса export PACKMATE_WEB_LOGIN='BinaryBears' # Имя пользователя для веб-интерфейса

3
docker-compose.yml
View File

@@ -9,6 +9,7 @@ services:
PACKMATE_DB_USER: ${PACKMATE_DB_USER} PACKMATE_DB_USER: ${PACKMATE_DB_USER}
PACKMATE_DB_PASSWORD: ${PACKMATE_DB_PASSWORD} PACKMATE_DB_PASSWORD: ${PACKMATE_DB_PASSWORD}
PACKMATE_DB_NAME: ${PACKMATE_DB_NAME} PACKMATE_DB_NAME: ${PACKMATE_DB_NAME}
PACKMATE_INTERFACE: ${PACKMATE_INTERFACE}
PACKMATE_LOCAL_IP: ${PACKMATE_LOCAL_IP} PACKMATE_LOCAL_IP: ${PACKMATE_LOCAL_IP}
PACKMATE_WEB_LOGIN: ${PACKMATE_WEB_LOGIN} PACKMATE_WEB_LOGIN: ${PACKMATE_WEB_LOGIN}
PACKMATE_WEB_PASSWORD: ${PACKMATE_WEB_PASSWORD} PACKMATE_WEB_PASSWORD: ${PACKMATE_WEB_PASSWORD}
@@ -16,7 +17,7 @@ services:
image: packmate-app:v1 image: packmate-app:v1
depends_on: depends_on:
- db - db
restart: always restart: on-failure
db: db:
container_name: packmate-db container_name: packmate-db
build: build:

7
start.sh
View File

@@ -1,5 +1,10 @@
#!/bin/sh #!/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 "Capturing on interface ${IFACE} with IP ${LOCAL_IP}..."
echo "--> DEBUG: Web login is ${WEB_LOGIN}:${WEB_PASSWORD}" 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 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