Moved docker to its own module

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
This commit is contained in:
Andrew DeMaria
2017-08-03 17:16:32 -06:00
parent 3fcc3ea896
commit 86345a9c2c
6 changed files with 67 additions and 26 deletions
-15
View File
@@ -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/
+4
View File
@@ -0,0 +1,4 @@
!target/airsonic.war
.gitignore
pom.xml
target/
+1 -1
View File
@@ -8,7 +8,7 @@ ENV UID=1001 GID=1001 AIRSONIC_PORT=4040 AIRSONIC_DIR=/airsonic
WORKDIR $AIRSONIC_DIR WORKDIR $AIRSONIC_DIR
COPY dockerfiles/run.sh /usr/local/bin/run.sh 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 \ RUN apk --no-cache add \
ffmpeg \ ffmpeg \
+61
View File
@@ -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>
+1 -10
View File
@@ -78,6 +78,7 @@
<module>subsonic-rest-api</module> <module>subsonic-rest-api</module>
<module>airsonic-sonos-api</module> <module>airsonic-sonos-api</module>
<module>airsonic-main</module> <module>airsonic-main</module>
<module>install/docker</module>
</modules> </modules>
<dependencyManagement> <dependencyManagement>
@@ -169,16 +170,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </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> </plugins>
</pluginManagement> </pluginManagement>