From 6356e007a22a3d7e8e5aaa7bab421d3c31e15442 Mon Sep 17 00:00:00 2001 From: jan fockaert <jan.fockaert@merapar.com> Date: Mon, 12 Dec 2016 15:34:34 +0100 Subject: [PATCH] Build fat jar and run after mvn package --- Dockerfile | 11 +++++++++-- pom.xml | 7 +++++++ .../java/com/merapar/springbootadmin/Application.java | 4 ++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 321beb6..89a7bad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,14 @@ # Docker file for Spring Boot Admin # -FROM maven:3.3.9-jdk-8-onbuild-alpine +FROM maven:3.3.9-jdk-8-alpine MAINTAINER Merapar -ENV TZ UTC \ No newline at end of file +ENV TZ UTC + +RUN mkdir -p /usr/src/app +WORKDIR /usr/src/app + +ADD . /usr/src/app + +CMD mvn package && java -jar target/spring-boot-admin-1.4.4.jar \ No newline at end of file diff --git a/pom.xml b/pom.xml index bf7f523..76de718 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,13 @@ <name>spring-boot-admin</name> <url>http://maven.apache.org</url> + <parent> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-parent</artifactId> + <version>1.4.2.RELEASE</version> + <relativePath/> + </parent> + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> diff --git a/src/main/java/com/merapar/springbootadmin/Application.java b/src/main/java/com/merapar/springbootadmin/Application.java index 2fa7e76..52c2176 100644 --- a/src/main/java/com/merapar/springbootadmin/Application.java +++ b/src/main/java/com/merapar/springbootadmin/Application.java @@ -3,10 +3,10 @@ package com.merapar.springbootadmin; import de.codecentric.boot.admin.config.EnableAdminServer; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Configuration; -@Configuration -@EnableAutoConfiguration +@SpringBootApplication @EnableAdminServer public class Application { public static void main(String[] args) { -- GitLab