فهرست منبع

Refactored docker build

Lukas Cerny 4 سال پیش
والد
کامیت
c2bb8fdebd
5فایلهای تغییر یافته به همراه15 افزوده شده و 28 حذف شده
  1. 14 0
      Dockerfile
  2. 1 1
      README.md
  3. 0 7
      config/foodie.yaml
  4. 0 13
      docker/Dockerfile
  5. 0 7
      docker/start.sh

+ 14 - 0
Dockerfile

@@ -0,0 +1,14 @@
+FROM adoptopenjdk/openjdk11:jdk-11.0.10_9-debian AS builder
+ARG config_file
+COPY src /app/src
+COPY $config_file /app/config.yaml
+COPY gradle /app/gradle
+COPY build.gradle settings.gradle gradlew /app/
+WORKDIR /app/
+RUN ./gradlew assemble
+
+FROM adoptopenjdk/openjdk11:jre-11.0.10_9-alpine AS production
+WORKDIR /app
+COPY --from=builder /app/build/libs /app/bin
+COPY --from=builder /app/config.yaml /app/
+CMD java -cp "bin/*" -DlogPath="/var/log/watchdog-app" cz.senslog.watchdog.app.Main -cf config.yaml

+ 1 - 1
README.md

@@ -1,3 +1,3 @@
 ## Docker build
 
-```docker build -t <image_name> --build-arg config_file=<config_file>.yaml -f ./docker/Dockerfile .```
+``` docker build -t <image-name> --build-arg config_file=<config-file> -f ./Dockerfile .```

+ 0 - 7
config/foodie.yaml

@@ -6,13 +6,6 @@ emailServers:
     authPassword: "5jspdD"
 
 messageBrokers:
-  emailToTest:
-    type: EMAIL
-    config:
-      server: lspEmail
-      senderEmail: "watchdog@senslog.org"
-      recipientEmail: "luccerny@kiv.zcu.cz"
-      subject: "[Watchdog] TEST Report Foodie SensLog (CZ)"
   emailToAll:
     type: EMAIL
     config:

+ 0 - 13
docker/Dockerfile

@@ -1,13 +0,0 @@
-FROM java:8-alpine
-
-ARG config_file
-
-ENV APP_PARAMS "-cf config/$config_file"
-
-COPY docker/start.sh /app/
-COPY build/libs/ /app/bin
-COPY config/$config_file /app/config/$config_file
-
-WORKDIR /app
-
-ENTRYPOINT ["/bin/sh", "-C", "start.sh"]

+ 0 - 7
docker/start.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-BUILD_FOLDER="./build/libs"
-MAIN_CLASS="cz.senslog.watchdog.app.Main"
-LOG_PATH="/var/log/watchdog-app"
-
-java -cp "$BUILD_FOLDER/*" -DlogPath=$LOG_PATH $MAIN_CLASS $APP_PARAMS