Dependencies updated & Dockerbuild improved (#2)

* Dependencies updated & Dockerbuild improved
julian-eggers · Jan 18, 2019 · d8eeeb4 · d8eeeb4
1 parent 489af15
commit d8eeeb4
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 /.classpath
 /.settings/
 /.project
+/Dockerfile
diff --git a/Dockerfile b/Dockerfile
diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ jeggers/docd:latest \
 docker service create \
 --name=dummy-service \
 --label DAD_SELECTION_BLOCKED=true \
-dummy/service:latestt
+dummy/service:latest
 ```
 
 In whitelist-mode you have to explicitly enable every service.

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <name>docd</name>
   <description>Automatic redeploy for docker swarm services</description>
   <url>https://github.com/julian-eggers/docd</url>
-  <version>0.5.0-RELEASE</version>
+  <version>0.6.0-RELEASE</version>
 
   <properties>
     <!-- System -->
@@ -15,20 +15,20 @@
     <java.version>11</java.version>
     <!-- Testing -->
     <jacoco.version>0.8.2</jacoco.version>
-    <powermock.version>2.0.0-RC.3</powermock.version>
-    <easymock.version>4.0.1</easymock.version>
+    <powermock.version>2.0.0</powermock.version>
+    <easymock.version>4.0.2</easymock.version>
     <!-- Other -->
     <jaxb.version>2.3.0</jaxb.version>
     <!-- Build -->
-    <coveralls.version>4.3.0</coveralls.version>
+    <write-text-files-maven-plugin.version>1.1</write-text-files-maven-plugin.version>
     <dockerfile-maven-plugin.version>1.4.8</dockerfile-maven-plugin.version>
-    <github-release-plugin.version>1.3.0</github-release-plugin.version>
+    <github-release-plugin.version>1.2.0</github-release-plugin.version>
   </properties>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.1.0.RELEASE</version>
+    <version>2.1.2.RELEASE</version>
   </parent>
 
   <dependencies>
@@ -48,28 +48,6 @@
       <artifactId>spring-boot-starter-undertow</artifactId>
     </dependency>
 
-    <!-- OXM - Java9 -->
-    <dependency>
-      <groupId>com.sun.activation</groupId>
-      <artifactId>javax.activation</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>${jaxb.version}</version><!--$NO-MVN-MAN-VER$ -->
-    </dependency>
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-core</artifactId>
-      <version>${jaxb.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
-      <version>${jaxb.version}</version>
-    </dependency>
-
     <!-- Logging & Monitoring -->
     <dependency>
       <groupId>org.jolokia</groupId>
@@ -99,7 +77,27 @@
     <dependency>
       <groupId>com.github.docker-java</groupId>
       <artifactId>docker-java</artifactId>
-      <version>3.1.0-rc-5</version>
+      <version>3.1.0-rc-8</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.activation</groupId>
+      <artifactId>javax.activation</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb.version}</version><!--$NO-MVN-MAN-VER$ -->
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-core</artifactId>
+      <version>${jaxb.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>${jaxb.version}</version>
     </dependency>
 
     <!-- Other -->
@@ -311,20 +309,34 @@
           </execution>
         </executions>
       </plugin>
+      <!-- DEPLOYMENT -->
       <plugin>
-        <groupId>org.eluder.coveralls</groupId>
-        <artifactId>coveralls-maven-plugin</artifactId>
-        <version>${coveralls.version}</version>
-        <!-- Required to support Jigsaw -->
-        <dependencies>
-          <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.2.3</version>
-          </dependency>
-        </dependencies>
+        <groupId>ru.yaal.maven</groupId>
+        <artifactId>write-text-files-maven-plugin</artifactId>
+        <version>${write-text-files-maven-plugin.version}</version>
+        <configuration>
+          <charset>UTF-8</charset>
+          <files>
+            <file>
+              <path>Dockerfile</path>
+              <lines>
+                <line>FROM adoptopenjdk/openjdk11:alpine-slim</line>
+                <line>EXPOSE 8080</line>
+                <line>ADD target/${project.name}.${project.packaging} ${project.name}.${project.packaging}</line>
+                <line>ENTRYPOINT ["java", "-jar", "-Dfile.encoding=UTF-8", "-Djava.security.egd=file:/dev/./urandom", "${project.name}.${project.packaging}"]</line>
+              </lines>
+            </file>
+          </files>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>write-text-files</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
-      <!-- DEPLOYMENT -->
       <plugin>
         <groupId>com.spotify</groupId>
         <artifactId>dockerfile-maven-plugin</artifactId>