Skip to content

Commit

Permalink
Fixed maven build
Browse files Browse the repository at this point in the history
  • Loading branch information
Sven Friedrich committed Sep 16, 2019
1 parent 928205d commit ebdedd3
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 15 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

jars/*

#.idea folder
.idea/

Expand Down
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#Build from pom with maven
FROM maven:3-jdk-11-slim as build
FROM maven:3-jdk-11 as build
WORKDIR /build
ADD * /build/
ADD pom.xml /build/
ADD src /build/src/
RUN mvn package

#Create final image
Expand All @@ -11,7 +12,7 @@ FROM adoptopenjdk:11-jre-openj9
WORKDIR /jar
COPY --from=build /build/jars/* ./
RUN mv *jar-with-dependencies.jar Musicbot.jar
RUN rm DiscordMusicbotNetwork*.jar
RUN rm discordmusicbotnetwork*.jar

#initiate parameter for run
WORKDIR /musicbot
Expand Down
19 changes: 7 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,27 @@
<modelVersion>4.0.0</modelVersion>

<groupId>de.autumnal</groupId>
<artifactId>DiscordMusicbotNetwork</artifactId>
<artifactId>discordmusicbotnetwork</artifactId>
<version>1.4.4-Beta</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>false</downloadJavadocs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>7</source>
<target>7</target>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<archive>
<manifest>
<mainClass>de/autumnal/discordmusicbotnetwork/App</mainClass>
<mainClass>de.autumnal.discordmusicbotnetwork.App</mainClass>
</manifest>
</archive>
<descriptorRefs>
Expand All @@ -52,6 +46,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
<configuration>
<outputDirectory>./jars</outputDirectory>
</configuration>
Expand Down

0 comments on commit ebdedd3

Please sign in to comment.