Setup docker config

drallieiv · Apr 28, 2021 · c304f76 · c304f76
1 parent 4fc315a
commit c304f76
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/maven-publish-snapshot.yml b/.github/workflows/maven-publish-snapshot.yml
@@ -25,6 +25,6 @@ jobs:
       run: mvn -B package --file pom.xml
 
     - name: Publish to GitHub Packages Apache Maven
-      run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml
+      run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml -fae
       env:
         GITHUB_TOKEN: ${{ github.token }}
diff --git a/KinanCity-core/Dockerfile b/KinanCity-core/Dockerfile
@@ -6,6 +6,9 @@ VOLUME ["/opt/data"]
 RUN apt-get update && apt-get install -y --no-install-recommends curl wget && rm -rf /var/lib/apt/lists/*
 
 # Download last KinanCity core jar
-RUN curl -s https://api.github.com/repos/drallieiv/KinanCity/releases | grep "browser_download_url" | grep "KinanCity-core" | grep "jar" | head -n 1 | cut -d '"' -f 4 | xargs wget -O KinanCity-core.jar
+RUN curl -s https://api.github.com/repos/drallieiv/KinanCity/releases/latest | grep "browser_download_url" | grep "kinancity-core" | head -n 1 | cut -d '"' -f 4 | xargs wget -O kinancity-core.jar
 
-ENTRYPOINT ["java" "-jar KinanCity-core.jar -o /opt/data/result.csv"]
+COPY scripts/run.sh /run.sh
+RUN chmod +x /run.sh
+
+ENTRYPOINT ["/run.sh"]
diff --git a/KinanCity-core/scripts/run.sh b/KinanCity-core/scripts/run.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -jar kinancity-core.jar -o /opt/data/result.csv
diff --git a/KinanCity-core/src/main/java/com/kinancity/core/KinanCityCli.java b/KinanCity-core/src/main/java/com/kinancity/core/KinanCityCli.java
@@ -190,6 +190,9 @@ private static Options setupCliOptions() {
 		options.addOption(CliOptions.CK.asOption());
 		options.addOption(CliOptions.CP.asOption());
 
+    // Output File
+    options.addOption(CliOptions.OUTPUT.asOption());
+
 		// Number of Threads
 		options.addOption(CliOptions.NB_THREADS.asOption());
 

diff --git a/KinanCity-mail/pom.xml b/KinanCity-mail/pom.xml
@@ -7,7 +7,6 @@
 		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>kinancity-mail</artifactId>
-	<version>2.0.2</version>
 
 	<description>Email validation for KinanCity</description>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/sh
		java -jar kinancity-core.jar -o /opt/data/result.csv