From f4a595f370ae83347af0546c5c7f99001b53cd46 Mon Sep 17 00:00:00 2001 From: io42630 Date: Sat, 20 Jan 2024 09:54:32 +0100 Subject: [PATCH] dockerize reverse --- reverse/Dockerfile | 4 + .../com/olexyn/misp/reverse => }/README.md | 6 +- reverse/install-locally.sh | 11 -- reverse/pom.xml | 106 ++++++++---------- .../java/com/olexyn/misp/reverse/Tools.java | 1 + .../misp/reverse/runnable/CheckSuppyR.java | 9 +- .../reverse/runnable/JourneyGeneratorR.java | 4 +- .../misp/reverse/runnable/JourneyR.java | 8 +- 8 files changed, 69 insertions(+), 80 deletions(-) create mode 100755 reverse/Dockerfile rename reverse/{src/main/java/com/olexyn/misp/reverse => }/README.md (77%) delete mode 100755 reverse/install-locally.sh diff --git a/reverse/Dockerfile b/reverse/Dockerfile new file mode 100755 index 0000000..5fa23f4 --- /dev/null +++ b/reverse/Dockerfile @@ -0,0 +1,4 @@ +FROM eclipse-temurin:17-alpine +COPY /target/reverse-0.1-jar-with-dependencies.jar /usr/local/lib/reverse-0.1-jar-with-dependencies.jar +EXPOSE 8090 +ENTRYPOINT ["java","-jar","/usr/local/lib/reverse-0.1-jar-with-dependencies.jar"] diff --git a/reverse/src/main/java/com/olexyn/misp/reverse/README.md b/reverse/README.md similarity index 77% rename from reverse/src/main/java/com/olexyn/misp/reverse/README.md rename to reverse/README.md index b306e30..a59ccd4 100644 --- a/reverse/src/main/java/com/olexyn/misp/reverse/README.md +++ b/reverse/README.md @@ -13,4 +13,8 @@ * Runnable * Journey fo a `Ride` through the App. * `Tools` - * Performs the actual request. \ No newline at end of file + * Performs the actual request. + +### Build +* maven clean package +* Dockerfile -> build \ No newline at end of file diff --git a/reverse/install-locally.sh b/reverse/install-locally.sh deleted file mode 100755 index ccf9951..0000000 --- a/reverse/install-locally.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -version="0.1" -artifactId="reverse" -file="target/${artifactId}-${version}.jar" -groupId="com.olexyn.misp.reverse" - - - - -mvn package -mvn install:install-file -Dfile=${file} -DgroupId=${groupId} -DartifactId=${artifactId} -Dversion=${version} -Dpackaging=jar -DgeneratePom=true diff --git a/reverse/pom.xml b/reverse/pom.xml index c4abace..e1d1a62 100644 --- a/reverse/pom.xml +++ b/reverse/pom.xml @@ -3,28 +3,31 @@ 4.0.0 - + + com.olexyn + zeeroot + 17.0.1 + com.olexyn.misp.reverse reverse 0.1 reverse - - http://www.example.com - - UTF-8 - 11 - 11 - + + + + + com.olexyn + zeebom + 1.1.1 + pom + import + + + - - junit - junit - 4.11 - test - com.olexyn.misp.helper helper @@ -34,53 +37,40 @@ org.json json - 20190722 + + org.projectlombok + lombok + + - - - - - maven-clean-plugin - 3.1.0 - - - - maven-resources-plugin - 3.0.2 - - - maven-compiler-plugin - 3.8.0 - - - maven-surefire-plugin - 2.22.1 - - - maven-jar-plugin - 3.0.2 - - - maven-install-plugin - 2.5.2 - - - maven-deploy-plugin - 2.8.2 - - - - maven-site-plugin - 3.7.1 - - - maven-project-info-reports-plugin - 3.0.0 - - - + + + maven-assembly-plugin + + + + com.olexyn.misp.reverse.Reverse + + + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + + + + diff --git a/reverse/src/main/java/com/olexyn/misp/reverse/Tools.java b/reverse/src/main/java/com/olexyn/misp/reverse/Tools.java index d07bf8d..62faa08 100644 --- a/reverse/src/main/java/com/olexyn/misp/reverse/Tools.java +++ b/reverse/src/main/java/com/olexyn/misp/reverse/Tools.java @@ -7,6 +7,7 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; + public class Tools { diff --git a/reverse/src/main/java/com/olexyn/misp/reverse/runnable/CheckSuppyR.java b/reverse/src/main/java/com/olexyn/misp/reverse/runnable/CheckSuppyR.java index 64668c1..3451feb 100644 --- a/reverse/src/main/java/com/olexyn/misp/reverse/runnable/CheckSuppyR.java +++ b/reverse/src/main/java/com/olexyn/misp/reverse/runnable/CheckSuppyR.java @@ -2,12 +2,15 @@ package com.olexyn.misp.reverse.runnable; import com.olexyn.misp.reverse.Reverse; import com.olexyn.misp.reverse.Tools; +import lombok.Getter; import org.json.JSONObject; public class CheckSuppyR implements Runnable { + @Getter private int available; - public int CHECK_SUPPLY_INTERVAL = 100; + + public int CHECK_SUPPLY_INTERVAL_MILLI = 100; private Reverse reverse; @@ -28,7 +31,7 @@ public class CheckSuppyR implements Runnable { available = resultObj.getInt("available"); - Thread.sleep(CHECK_SUPPLY_INTERVAL); + Thread.sleep(CHECK_SUPPLY_INTERVAL_MILLI); } catch (Exception ignored) { } } @@ -36,6 +39,4 @@ public class CheckSuppyR implements Runnable { } - - public int getAvailable() { return available; } } diff --git a/reverse/src/main/java/com/olexyn/misp/reverse/runnable/JourneyGeneratorR.java b/reverse/src/main/java/com/olexyn/misp/reverse/runnable/JourneyGeneratorR.java index 3fb2465..c21d4cf 100644 --- a/reverse/src/main/java/com/olexyn/misp/reverse/runnable/JourneyGeneratorR.java +++ b/reverse/src/main/java/com/olexyn/misp/reverse/runnable/JourneyGeneratorR.java @@ -9,8 +9,8 @@ public class JourneyGeneratorR implements Runnable { public int CHECK_DEPLETION_INTERVAL = 500; public int START_NEW_JOURNEY_INTERVAL = 100; - private Reverse reverse; - private CheckSuppyR checkSuppyR; + private final Reverse reverse; + private final CheckSuppyR checkSuppyR; public JourneyGeneratorR(Reverse reverse , CheckSuppyR checkSuppyR) { this.reverse = reverse; diff --git a/reverse/src/main/java/com/olexyn/misp/reverse/runnable/JourneyR.java b/reverse/src/main/java/com/olexyn/misp/reverse/runnable/JourneyR.java index 054aa65..b7abc14 100644 --- a/reverse/src/main/java/com/olexyn/misp/reverse/runnable/JourneyR.java +++ b/reverse/src/main/java/com/olexyn/misp/reverse/runnable/JourneyR.java @@ -18,10 +18,10 @@ public class JourneyR implements Runnable { @Override public void run() { try { - Ride _ride = sendPostRide(); - _ride = sendGetRequest(_ride); - sendPostRideRequestData(_ride); - } catch (Exception ignored) { } + var ride = sendPostRide(); + ride = sendGetRequest(ride); + sendPostRideRequestData(ride); + } catch (Exception ignored) { /* ignored */ } }