add licenses to images

SeldonIO · Jul 10, 2018 · 41569bd · 41569bd
1 parent 98c4ac7
commit 41569bd
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/api-frontend/Dockerfile b/api-frontend/Dockerfile
@@ -2,7 +2,8 @@ FROM openjdk:8u171-jre-alpine3.7
 
 ARG APP_VERSION=UNKOWN_VERSION
 
-ADD /target/seldon-apife-${APP_VERSION}.jar app.jar
+COPY /target/seldon-apife-${APP_VERSION}.jar app.jar
+COPY /target/generated-resources /licenses/
 
 ENTRYPOINT [ "sh", "-c", "java -Djava.security.egd=file:/dev/./urandom $JAVA_OPTS -jar app.jar $SPRING_OPTS" ]
 
diff --git a/api-frontend/Makefile.ci b/api-frontend/Makefile.ci
@@ -6,7 +6,7 @@ build: clean build_image
 
 
 build_jar: update_proto
-	mvn clean package -B
+	@set -x && mvn clean verify -Dlicense.useMissingFile -B
 
 write_version: build_jar
 	ls target/seldon-apife-*.jar | sed -n 's/target\/seldon-apife-\(.*\).jar$$/\1/p' > $(VERSION_FILE) && cat $(VERSION_FILE)

diff --git a/cluster-manager/Dockerfile b/cluster-manager/Dockerfile
@@ -2,7 +2,8 @@ FROM openjdk:8u171-jre-alpine3.7
 
 ARG APP_VERSION=UNKOWN_VERSION
 
-ADD /target/seldon-cluster-manager-${APP_VERSION}.jar app.jar
+COPY /target/seldon-cluster-manager-${APP_VERSION}.jar app.jar
+COPY /target/generated-resources /licenses/
 
 ENTRYPOINT [ "sh", "-c", "java -Djava.security.egd=file:/dev/./urandom $JAVA_OPTS -jar app.jar $SPRING_OPTS" ]
 
diff --git a/cluster-manager/Makefile.ci b/cluster-manager/Makefile.ci
@@ -5,8 +5,8 @@ VERSION_FILE=target/version.txt
 build: clean build_image
 
 
-build_jar: update_proto 
-	mvn clean package -B
+build_jar: update_proto
+	@set -x && mvn clean verify -Dlicense.useMissingFile -B
 
 write_version: build_jar
 	ls target/seldon-cluster-manager-*.jar | sed -n 's/target\/seldon-cluster-manager-\(.*\).jar$$/\1/p' > $(VERSION_FILE) && cat $(VERSION_FILE)

diff --git a/engine/Dockerfile b/engine/Dockerfile
@@ -4,7 +4,8 @@ ARG APP_VERSION=UNKOWN_VERSION
 
 #RUN apt-get update && apt-get install -y curl libblas-dev
 
-ADD /target/seldon-engine-${APP_VERSION}.jar app.jar
+COPY /target/seldon-engine-${APP_VERSION}.jar app.jar
+COPY /target/generated-resources /licenses/
 
 ENTRYPOINT [ "sh", "-c", "java -Djava.security.egd=file:/dev/./urandom $JAVA_OPTS -jar app.jar" ]
 
diff --git a/engine/Makefile.ci b/engine/Makefile.ci
@@ -6,7 +6,7 @@ build: clean build_image
 
 
 build_jar: update_proto
-	mvn clean package -B
+	@set -x && mvn clean verify -Dlicense.useMissingFile -B
 
 write_version: build_jar
 	ls target/seldon-engine-*.jar | sed -n 's/target\/seldon-engine-\(.*\).jar$$/\1/p' > $(VERSION_FILE) && cat $(VERSION_FILE)