Docker profile moved to properties

Author: piotter121

Dockerfile

@@ -1,20 +1,20 @@
-FROM maven:3.5.2-jdk-8 as builder
+FROM maven:3.6.0-jdk-11 as builder
 
 RUN mkdir --parents /usr/src/app
 WORKDIR /usr/src/app
 COPY pom.xml /usr/src/app/
-RUN mvn dependency:go-offline -P docker-build
+RUN mvn dependency:go-offline -P docker
 
-ARG skipTests=true
+ARG skipTests=false
 COPY src /usr/src/app/src/
-RUN mvn -DskipTests=${skipTests} clean package -P docker-build
+RUN mvn -DskipTests=${skipTests} clean package -P docker
 
-FROM openjdk:8-jre-alpine
+FROM openjdk:11-jre-slim
 COPY --from=builder /usr/src/app/target/dependency/BOOT-INF/lib /app/lib
 COPY --from=builder /usr/src/app/target/dependency/META-INF /app/META-INF
 COPY --from=builder /usr/src/app/target/dependency/BOOT-INF/classes /app
 
 VOLUME /tmp
 EXPOSE 8080
 
-ENTRYPOINT ["java","-cp","app:app/lib/*","pl.edu.pw.ee.pyskp.documentworkflow.DocumentWorkflowSystemApplication"]
+ENTRYPOINT ["java","-cp","app:app/lib/*", "-Dspring.profiles.active=docker","pl.edu.pw.ee.pyskp.documentworkflow.DocumentWorkflowSystemApplication"]

pom.xml

@@ -147,22 +147,7 @@
 
     <profiles>
         <profile>
-            <id>local-dev</id>
-            <properties>
-                <spring.data.mongodb.host>localhost</spring.data.mongodb.host>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
-        <profile>
-            <id>docker-build</id>
-            <properties>
-                <spring.data.mongodb.host>mongodb</spring.data.mongodb.host>
-            </properties>
-        </profile>
-        <profile>
-            <id>prometheus</id>
+            <id>docker</id>
             <dependencies>
                 <dependency>
                     <groupId>io.micrometer</groupId>

src/main/resources/application-docker.properties

@@ -0,0 +1,7 @@
+spring.data.mongodb.host=mongodb
+spring.data.mongodb.authentication-database=admin
+spring.data.mongodb.username=root
+spring.data.mongodb.password=root
+spring.data.mongodb.database=dws
+# Logging properties
+logging.level.pl.edu.pw.ee.pyskp.documentworkflow=info

src/main/resources/application.properties

@@ -1,16 +1,15 @@
-spring.data.mongodb.host=@spring.data.mongodb.host@
+spring.data.mongodb.host=localhost
 spring.data.mongodb.authentication-database=admin
 spring.data.mongodb.username=root
 spring.data.mongodb.password=root
 spring.data.mongodb.database=dws
-
+# Logging properties
 logging.level.pl.edu.pw.ee.pyskp.documentworkflow=debug
-
+# Internal security
 dws.security.cors.path=/**
 dws.security.cors.allowed-origins[0]=http://localhost:4200
 dws.security.cors.allowed-origins[1]=http://localhost
-dws.security.cors.allowed-origins[2]=http://skrobcia
 dws.security.cors.allowed-headers=*
 dws.security.cors.allowed-methods=*
-#Actuator
+# Actuator
 management.endpoints.web.exposure.include=*

src/test/java/pl/edu/pw/ee/pyskp/documentworkflow/DocumentWorkflowSystemApplicationTests.java

@@ -3,14 +3,16 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
+@TestPropertySource("classpath:application-test.properties")
 public class DocumentWorkflowSystemApplicationTests {
 
-	@Test
-	public void contextLoads() {
-	}
+    @Test
+    public void contextLoads() {
+    }
 
 }