Переписал упаковку в Docker, обновил фронтэнд

Dockerfile_app

@@ -17,22 +17,4 @@ RUN ./gradlew --no-daemon build
 
 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
-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}
-ENV IFACE ${PACKMATE_INTERFACE}
-ENV WEB_LOGIN ${PACKMATE_WEB_LOGIN:-BinaryBears}
-ENV WEB_PASSWORD ${PACKMATE_WEB_PASSWORD:-123456}
-
 EXPOSE 65000:65000
-
-CMD ./start.sh

Dockerfile_db

@@ -1,12 +1,12 @@
-FROM postgres:12.0-alpine
+FROM postgres:12.2-alpine
 
-ARG PACKMATE_DB_USER
+ARG POSTGRES_USER
-ARG PACKMATE_DB_PASSWORD
+ARG POSTGRES_PASSWORD
-ARG PACKMATE_DB_DB
+ARG POSTGRES_DB
 
-ENV POSTGRES_USER ${PACKMATE_DB_USER:-packmate}
+ENV POSTGRES_USER ${POSTGRES_USER}
-ENV POSTGRES_PASSWORD ${PACKMATE_DB_PASSWORD:-packmate_secret_password}
+ENV POSTGRES_PASSWORD ${POSTGRES_PASSWORD}
-ENV POSTGRES_DB ${PACKMATE_DB_DB:-packmate}
+ENV POSTGRES_DB ${POSTGRES_DB}
 
 COPY postgresql.conf /tmp/postgresql.conf
 COPY update_db_config.sh /docker-entrypoint-initdb.d/_update_db_config.sh

docker-compose.yml

@@ -1,20 +1,27 @@
 version: "3.4"
 services:
   packmate:
+    environment:
+      DB_USER: ${PACKMATE_DB_USER:-BinaryBears}
+      DB_PASSWORD: ${PACKMATE_DB_PASSWORD:-K604YnL3G1hp2RDkCZNjGpxbyNpNHTRb}
+      DB_NAME: ${PACKMATE_DB_NAME:-packmate}
+      INTERFACE: ${PACKMATE_INTERFACE}
+      LOCAL_IP: ${PACKMATE_LOCAL_IP}
+      WEB_LOGIN: ${PACKMATE_WEB_LOGIN:-BinaryBears}
+      WEB_PASSWORD: ${PACKMATE_WEB_PASSWORD:-13371337}
     container_name: packmate-app
     build:
       context: .
       dockerfile: Dockerfile_app
-      args:
-        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}
     network_mode: "host"
     image: packmate-app:v1
+    command: [
+      "/usr/bin/java", "-Djava.net.preferIPv4Stack=true", "-Djava.net.preferIPv4Addresses=true",
+      "-jar", "/app/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=$${INTERFACE}", "--local-ip=$${LOCAL_IP}", "--account-login=$${WEB_LOGIN}",
+      "--account-password=$${WEB_PASSWORD}", "--server.port=65000", "--server.address=0.0.0.0"
+    ]
     depends_on:
       - db
     restart: unless-stopped
@@ -24,9 +31,9 @@ services:
       context: .
       dockerfile: Dockerfile_db
       args:
-        PACKMATE_DB_USER: ${PACKMATE_DB_USER}
+        POSTGRES_USER: ${PACKMATE_DB_USER:-BinaryBears}
-        PACKMATE_DB_PASSWORD: ${PACKMATE_DB_PASSWORD}
+        POSTGRES_PASSWORD: ${PACKMATE_DB_PASSWORD:-K604YnL3G1hp2RDkCZNjGpxbyNpNHTRb}
-        PACKMATE_DB_DB: ${PACKMATE_DB_NAME}
+        POSTGRES_DB: ${PACKMATE_DB_NAME:-packmate}
     network_mode: "host"
     image: packmate-db:v1
     restart: unless-stopped

start.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-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 -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true -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 --server.address='0.0.0.0'