commit 8ba7a15b2b34819e950f8300562747ceaef96a99
author Akron <nils@diewald-online.de> Mon Jan 22 08:53:18 2024 +0100
committer Akron <nils@diewald-online.de> Tue Jan 30 15:40:43 2024 +0100
tree 34b0eb790c6c5a2d2ccecd74ca9196a159ee4a0a
parent d9d7c39327f66dd135c8ea6b71452cd3948ed3d1

Prepare Dockerfile without full

Change-Id: Icbe4fdeab37ec30c07d3adcb1d30eca579472a78

.dockerignore

diff --git a/.dockerignore b/.dockerignore
index 896da84..513c474 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,8 +1,9 @@
 *
 !/core
-!/full
-!/lite
 !/sample-index
+!/src
 !/wiki-index
+!/Changes*
+!/*.xml
 !/LICENSE
 !.dockerignore
\ No newline at end of file

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 775bc9d..3878b44 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,19 +43,17 @@
 RUN rm -r Krill-* v*.zip
 
 # Package lite
-RUN cd full && \
-    mvn clean package -P lite && \
-    find target/Kustvakt-lite-*.jar -exec mv {} ../built/Kustvakt-lite.jar ';'
+RUN mvn clean package -P lite && \
+    find target/Kustvakt-lite-*.jar -exec mv {} /kustvakt/built/Kustvakt-lite.jar ';'
 
-RUN sed 's!\(krill\.indexDir\s*=\).\+!\1\/kustvakt\/index!' full/src/main/resources/kustvakt-lite.conf \
+RUN sed 's!\(krill\.indexDir\s*=\).\+!\1\/kustvakt\/index!' src/main/resources/kustvakt-lite.conf \
     > built/kustvakt-lite.conf
 
 # Package full
-RUN cd full && \
-    mvn clean package -DskipTests=true && \
-    find target/Kustvakt-full-*.jar -exec mv {} ../built/Kustvakt-full.jar ';'
+RUN mvn clean package -DskipTests=true && \
+    find target/Kustvakt-full-*.jar -exec mv {} /kustvakt/built/Kustvakt-full.jar ';'
 
-RUN cat full/src/main/resources/kustvakt.conf | \
+RUN cat src/main/resources/kustvakt.conf | \
     sed 's!\(krill\.indexDir\s*=\).\+!\1\/kustvakt\/index!' | \
     sed 's!\(ldap\.config\s*=\).\+!\1\/kustvakt\/ldap\/ldap\.conf!' | \
     sed 's!\(oauth2\.initial\.super\.client\s*=\).\+!\1\/true!' | \
@@ -63,10 +61,10 @@
     > built/kustvakt.conf
 
 RUN sed  's!\(ldifFile\s*=\).\+!\1\/kustvakt\/ldap\/ldap.ldif!' \
-    full/src/main/resources/embedded-ldap-example.conf \
+    src/main/resources/embedded-ldap-example.conf \
     > built/ldap.conf
 
-RUN cat full/src/main/resources/example-users.ldif \
+RUN cat src/main/resources/example-users.ldif \
     > built/ldap.ldif
 
 RUN apk del git \
@@ -78,7 +76,7 @@
 RUN cd ${M2_HOME} && rm -r .m2
 
 # Cleanup
-RUN rm -r full && \
+RUN rm -r src && \
     rm -r wiki-index
 
 FROM busybox:latest AS example-index