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

Fixed environmental variables

Browse Source
This commit is contained in:
saber-nyan
2019-11-18 18:20:30 +03:00
parent f673cb0fcb
commit 8f241c5ad8
4 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile_app
View File

@@ -16,6 +16,13 @@ RUN gradle --no-daemon build
RUN cp build/libs/packmate-*.jar app.jar RUN cp build/libs/packmate-*.jar app.jar
ARG PACKMATE_DB_USER
ARG PACKMATE_DB_PASSWORD:
ARG PACKMATE_DB_NAME
ARG PACKMATE_LOCAL_IP
ARG PACKMATE_WEB_LOGIN
ARG PACKMATE_WEB_PASSWORD
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}

4
Dockerfile_db
View File

@@ -1,5 +1,9 @@
FROM postgres:12.0-alpine FROM postgres:12.0-alpine
ARG PACKMATE_DB_USER
ARG PACKMATE_DB_PASSWORD
ARG PACKMATE_DB_DB
ENV POSTGRES_USER ${PACKMATE_DB_USER:-packmate} ENV POSTGRES_USER ${PACKMATE_DB_USER:-packmate}
ENV POSTGRES_PASSWORD ${PACKMATE_DB_PASSWORD:-packmate_secret_password} ENV POSTGRES_PASSWORD ${PACKMATE_DB_PASSWORD:-packmate_secret_password}
ENV POSTGRES_DB ${PACKMATE_DB_DB:-packmate} ENV POSTGRES_DB ${PACKMATE_DB_DB:-packmate}

11
docker-compose.yml
View File

@@ -5,6 +5,13 @@ services:
build: build:
context: . context: .
dockerfile: Dockerfile_app dockerfile: Dockerfile_app
args:
PACKMATE_DB_USER: ${PACKMATE_DB_USER}
PACKMATE_DB_PASSWORD: ${PACKMATE_DB_PASSWORD}
PACKMATE_DB_NAME: ${PACKMATE_DB_NAME}
PACKMATE_LOCAL_IP: ${PACKMATE_LOCAL_IP}
PACKMATE_WEB_LOGIN: ${PACKMATE_WEB_LOGIN}
PACKMATE_WEB_PASSWORD: ${PACKMATE_WEB_PASSWORD}
network_mode: "host" network_mode: "host"
image: packmate-app:v1 image: packmate-app:v1
depends_on: depends_on:
@@ -15,6 +22,10 @@ services:
build: build:
context: . context: .
dockerfile: Dockerfile_db dockerfile: Dockerfile_db
args:
PACKMATE_DB_USER: ${PACKMATE_DB_USER}
PACKMATE_DB_PASSWORD: ${PACKMATE_DB_PASSWORD}
PACKMATE_DB_DB: ${PACKMATE_DB_NAME}
network_mode: "host" network_mode: "host"
image: packmate-db:v1 image: packmate-db:v1
restart: always restart: always

1
start.sh
View File

@@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
IFACE="$(ls /sys/class/net | grep '^e')" IFACE="$(ls /sys/class/net | grep '^e')"
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}"
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