From 86345a9c2c2305c90ea4aae88ac6dcf3d0b6716e Mon Sep 17 00:00:00 2001
From: Andrew DeMaria <lostonamountain@gmail.com>
Date: Thu, 3 Aug 2017 17:01:21 -0600
Subject: [PATCH] Moved docker to its own module

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
---
 .dockerignore                           | 15 ------
 install/docker/.dockerignore            |  4 ++
 Dockerfile => install/docker/Dockerfile |  2 +-
 install/docker/pom.xml                  | 61 +++++++++++++++++++++++++
 {dockerfiles => install/docker}/run.sh  |  0
 pom.xml                                 | 11 +----
 6 files changed, 67 insertions(+), 26 deletions(-)
 delete mode 100644 .dockerignore
 create mode 100644 install/docker/.dockerignore
 rename Dockerfile => install/docker/Dockerfile (90%)
 create mode 100644 install/docker/pom.xml
 rename {dockerfiles => install/docker}/run.sh (100%)

diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 82f10424..00000000
--- a/.dockerignore
+++ /dev/null
@@ -1,15 +0,0 @@
-*.md
-*.xml
-*.yml
-*.txt
-*.html
-
-.gitignore
-.git/
-contrib/
-airsonic-main/
-!airsonic-main/target/airsonic.war
-subsonic-rest-api/
-airsonic-sonos-api/
-repo/
-target/
diff --git a/install/docker/.dockerignore b/install/docker/.dockerignore
new file mode 100644
index 00000000..62ed4a05
--- /dev/null
+++ b/install/docker/.dockerignore
@@ -0,0 +1,4 @@
+!target/airsonic.war
+.gitignore
+pom.xml
+target/
diff --git a/Dockerfile b/install/docker/Dockerfile
similarity index 90%
rename from Dockerfile
rename to install/docker/Dockerfile
index 333b094e..77be01af 100644
--- a/Dockerfile
+++ b/install/docker/Dockerfile
@@ -8,7 +8,7 @@ ENV UID=1001 GID=1001 AIRSONIC_PORT=4040 AIRSONIC_DIR=/airsonic
 WORKDIR $AIRSONIC_DIR
 
 COPY dockerfiles/run.sh /usr/local/bin/run.sh
-COPY airsonic-main/target/airsonic.war airsonic.war
+COPY target/dependency/airsonic-main-6.3-SNAPSHOT.war airsonic.war
 
 RUN apk --no-cache add \
     ffmpeg \
diff --git a/install/docker/pom.xml b/install/docker/pom.xml
new file mode 100644
index 00000000..5d22b330
--- /dev/null
+++ b/install/docker/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <relativePath>../../pom.xml</relativePath>
+        <artifactId>airsonic</artifactId>
+        <version>6.3-SNAPSHOT</version>
+        <groupId>org.airsonic.player</groupId>
+    </parent>
+    <packaging>pom</packaging>
+    <artifactId>airsonic-docker</artifactId>
+    <name>Airsonic Docker Image</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.airsonic.player</groupId>
+            <artifactId>airsonic-main</artifactId>
+            <version>6.3-SNAPSHOT</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.3.4</version>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>airsonic/airsonic</repository>
+                    <tag>${project.version}</tag>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/dockerfiles/run.sh b/install/docker/run.sh
similarity index 100%
rename from dockerfiles/run.sh
rename to install/docker/run.sh
diff --git a/pom.xml b/pom.xml
index c4c59c82..910d636b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,6 +78,7 @@
         <module>subsonic-rest-api</module>
         <module>airsonic-sonos-api</module>
         <module>airsonic-main</module>
+        <module>install/docker</module>
     </modules>
 
     <dependencyManagement>
@@ -169,16 +170,6 @@
                         </execution>
                     </executions>
                 </plugin>
-                <plugin>
-                    <groupId>com.spotify</groupId>
-                    <artifactId>dockerfile-maven-plugin</artifactId>
-                    <version>1.3.4</version>
-                    <inherited>false</inherited>
-                    <configuration>
-                        <repository>airsonic/airsonic</repository>
-                        <tag>${project.version}</tag>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>