Adjust dockerfile to solely rely on full folder
Change-Id: I4a429caf829dbac45893e8c572db61f36520d6be
diff --git a/Dockerfile b/Dockerfile
index e3cd768..bade66b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,20 +32,17 @@
RUN rm -r Krill
-# Install Kustvakt core
-RUN mvn -f core/pom.xml clean install
-
# Package lite
-RUN cd lite && \
- mvn clean package && \
+RUN cd full && \
+ mvn clean package -P lite && \
find target/Kustvakt-lite-*.jar -exec mv {} ../built/Kustvakt-lite.jar ';'
-RUN sed 's!\(krill\.indexDir\s*=\).\+!\1\/kustvakt\/index!' lite/src/main/resources/kustvakt-lite.conf \
+RUN sed 's!\(krill\.indexDir\s*=\).\+!\1\/kustvakt\/index!' full/src/main/resources/kustvakt-lite.conf \
> built/kustvakt-lite.conf
# Package full
RUN cd full && \
- mvn clean package && \
+ mvn clean package -DskipTests=true && \
find target/Kustvakt-full-*.jar -exec mv {} ../built/Kustvakt-full.jar ';'
RUN cat full/src/main/resources/kustvakt.conf | \
@@ -63,10 +60,9 @@
> built/ldap.ldif
# Cleanup
-RUN rm -r core && \
- rm -r full && \
- rm -r lite && \
- rm -r sample-index
+RUN rm -r full && \
+ rm -r sample-index && \
+ rm -r wiki-index
RUN apk del git \
maven
@@ -94,7 +90,6 @@
CMD [ "Kustvakt-lite.jar" ]
-
FROM openjdk:19-alpine AS kustvakt-full
RUN addgroup -S korap && \