Skip to content

Commit f81e67b

Browse files
committed
Streamline Docker image build
1 parent 3350900 commit f81e67b

File tree

2 files changed

+36
-25
lines changed

2 files changed

+36
-25
lines changed

Dockerfile

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
1-
FROM maven:3.5-jdk-8-alpine as build
2-
WORKDIR /app
3-
COPY ./ /app
4-
RUN mvn install -q && \
5-
mvn package -q && \
6-
ls /app/target/ && \
7-
MVN_VERSION=$(mvn -q \
8-
-Dexec.executable="echo" \
9-
-Dexec.args='${project.version}' \
10-
--non-recursive \
11-
org.codehaus.mojo:exec-maven-plugin:1.6.0:exec) && \
12-
mv /app/target/openapi-diff-${MVN_VERSION}-jar-with-dependencies.jar /app/openapi-diff.jar
1+
FROM openjdk:8-jdk-alpine AS build
2+
WORKDIR /build
3+
COPY ./ /build
4+
RUN ./mvnw -V -B -ff -P cli package -q
135

146
FROM openjdk:8-jre-alpine
157
WORKDIR /app
16-
COPY --from=0 /app/openapi-diff.jar /app
8+
COPY --from=build /build/target/openapi-diff-jar-with-dependencies.jar /app/openapi-diff.jar
179
ENTRYPOINT ["java", "-jar", "/app/openapi-diff.jar"]
1810
CMD ["--help"]

pom.xml

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,37 @@
172172
</plugins>
173173
</build>
174174
</profile>
175+
<profile>
176+
<id>cli</id>
177+
<properties>
178+
<maven.javadoc.skip>true</maven.javadoc.skip>
179+
<maven.source.skip>true</maven.source.skip>
180+
</properties>
181+
<build>
182+
<plugins>
183+
<plugin>
184+
<groupId>org.apache.maven.plugins</groupId>
185+
<artifactId>maven-assembly-plugin</artifactId>
186+
<version>3.2.0</version>
187+
<configuration>
188+
<descriptorRefs>
189+
<descriptorRef>jar-with-dependencies</descriptorRef>
190+
</descriptorRefs>
191+
<finalName>${project.artifactId}</finalName>
192+
</configuration>
193+
<executions>
194+
<execution>
195+
<id>make-assembly</id>
196+
<phase>package</phase>
197+
<goals>
198+
<goal>single</goal>
199+
</goals>
200+
</execution>
201+
</executions>
202+
</plugin>
203+
</plugins>
204+
</build>
205+
</profile>
175206
</profiles>
176207
<build>
177208
<plugins>
@@ -233,19 +264,7 @@
233264
<mainClass>com.qdesrame.openapi.diff.Main</mainClass>
234265
</manifest>
235266
</archive>
236-
<descriptorRefs>
237-
<descriptorRef>jar-with-dependencies</descriptorRef>
238-
</descriptorRefs>
239267
</configuration>
240-
<executions>
241-
<execution>
242-
<id>make-assembly</id>
243-
<phase>package</phase>
244-
<goals>
245-
<goal>single</goal>
246-
</goals>
247-
</execution>
248-
</executions>
249268
</plugin>
250269
<plugin>
251270
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)