build docker image for nginx-www using spotify docker plugin

Author: adam-sandor

samples/nginx-www/Dockerfile

@@ -1,18 +1,7 @@
-FROM maven:3.6.1-jdk-12 AS build
-
-WORKDIR /build
-
-COPY pom.xml .
-
-RUN mvn package
-
-COPY src ./src
-
-RUN mvn package
-
 FROM openjdk:12-alpine
 
-WORKDIR /app
-COPY --from=build /build/target/nginx-www-operator.jar .
+ENTRYPOINT ["java", "-jar", "/usr/share/operator/operator.jar"]
+
+ARG JAR_FILE
+ADD target/${JAR_FILE} /usr/share/operator/operator.jar
 
-CMD java -jar nginx-www-operator.jar

samples/nginx-www/deploy.sh

@@ -5,7 +5,7 @@
 
     <groupId>com.github.containersolutions</groupId>
     <artifactId>nginx-www-operator</artifactId>
-    <version>0.2.1-SNAPSHOT</version>
+    <version>0.3.2-SNAPSHOT</version>
 
     <name>Operator SDK - Samples - Nginx WWW</name>
     <description>Nginx Sample</description>
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.github.containersolutions</groupId>
             <artifactId>operator-framework</artifactId>
-            <version>0.2.0</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -49,39 +49,25 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.4.12</version>
                 <executions>
                     <execution>
-                        <phase>package</phase>
+                        <id>default</id>
                         <goals>
-                            <goal>shade</goal>
+                            <goal>build</goal>
+                            <goal>push</goal>
                         </goals>
-                        <configuration>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <manifestEntries>
-                                        <Main-Class>com.github.containersolutions.operator.sample.NginxWwwOperator</Main-Class>
-                                        <Build-Number>1.0</Build-Number>
-                                        <Multi-Release>true</Multi-Release>
-                                    </manifestEntries>
-                                </transformer>
-                            </transformers>
-                            <filters>
-                                <filter>
-                                    <artifact>io.fabric8:openshift-client</artifact>
-                                    <excludes>
-                                        <exclude>io/fabric8/kubernetes/client/Config*</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <finalName>${project.artifactId}</finalName>
-                        </configuration>
                     </execution>
                 </executions>
+                <configuration>
+                    <repository>adamsandor83</repository>
+                    <tag>${project.version}</tag>
+                    <buildArgs>
+                        <JAR_FILE>nginx-www-operator.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
             </plugin>
         </plugins>
     </build>

samples/nginx-www/pom.xml

@@ -89,7 +89,7 @@ public Optional<NginxWww> createOrUpdateResource(NginxWww nginx, Context<NginxWw
     }
 
     @Override
-    public void deleteResource(NginxWww nginx, Context<NginxWww> context) {
+    public boolean deleteResource(NginxWww nginx, Context<NginxWww> context) {
         log.info("Execution deleteResource for: {}", nginx.getMetadata().getName());
 
         log.info("Deleting ConfigMap {}", configMapName(nginx));
@@ -115,6 +115,7 @@ public void deleteResource(NginxWww nginx, Context<NginxWww> context) {
         if (service.get() != null) {
             service.delete();
         }
+        return true;
     }
 
     private static String configMapName(NginxWww nginx) {