use dockerfile to place jsp files in correct place instead of gradle

AO-StreetArt · Dec 12, 2018 · ffeee79 · ffeee79
1 parent 3239bbd
commit ffeee79
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ FROM openjdk:8-jdk-alpine
 MAINTAINER Alex Barry
 VOLUME /tmp
 ADD build/libs/adrestia-0.2.0.jar app.jar
-ADD src/main/resources/bootstrap.properties bootstrap.properties
-ADD src/main/resources/application.properties application.properties
+ADD src/main/webapp/WEB-INF/jsp src/main/webapp/WEB-INF/jsp
+ADD src/main/resources src/main/resources
 ENV JAVA_OPTS=""
 ENTRYPOINT exec java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar
diff --git a/build.gradle b/build.gradle
@@ -37,15 +37,6 @@ ext {
 	springCloudVersion = 'Finchley.SR1'
 }
 
-// Include webapp folder in jar
-processResources {
-    from ('src/main/webapp/WEB-INF/jsp') {
-        into '/WEB-INF/jsp'
-    }
-}
-
-jar.dependsOn(processResources)
-
 dependencies {
 	compile('org.springframework.boot:spring-boot-starter-actuator')
 	compile('org.springframework.boot:spring-boot-starter-web')