Add backward compatibility for docker compose legacy-full
Change-Id: I24f26c848947425e85aa1600c4f016532e992a19
diff --git a/Changes b/Changes
index 7afbd9d..5dd77e3 100644
--- a/Changes
+++ b/Changes
@@ -25,6 +25,7 @@
- Allow system VC to have names with less than 3 characters (support for existing
C2 VC, #788)
- Switch Kustvakt Server to run the lite version by default.
+- Add backward compatibility for docker compose legacy-full
# version 0.79.1
diff --git a/Dockerfile b/Dockerfile
index 7702635..211a5bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
# *** WARNING *** This Dockerfile has been updated to build one image that can run both full and lite versions. The changes require updating existing docker compose files accordingly.
+# Backward compatilibity is added to support older docker compose deployments
# Use alpine linux as base image
FROM eclipse-temurin:22-jdk-alpine AS builder
@@ -38,6 +39,10 @@
RUN rm -r Krill-* v*.zip
# Kustvakt
+# --legacy-start
+RUN mvn clean package -P full && \
+ find target/Kustvakt-full-*.jar -exec mv {} /kustvakt/built/Kustvakt-full.jar ';'
+# --legacy-end
RUN mvn clean package && \
find target/Kustvakt-*.jar -exec mv {} /kustvakt/built/Kustvakt.jar ';'
RUN sed 's!\(krill\.indexDir\s*=\).\+!\1\/kustvakt\/index!' src/main/resources/kustvakt-lite.conf \
@@ -100,4 +105,23 @@
# run lite version (default)
# docker run --rm --net host -v [absolute-path-sample-index]:/kustvakt/index korap/kustvakt:{nr}
# run full version
-# docker run --rm --net host -v [absolute-path-sample-index]:/kustvakt/index korap/kustvakt:{nr} Kustvakt.jar --full
\ No newline at end of file
+# docker run --rm --net host -v [absolute-path-sample-index]:/kustvakt/index korap/kustvakt:{nr} Kustvakt.jar --full
+
+# backward compatibility with older docker compose
+FROM eclipse-temurin:22-jre-alpine AS kustvakt-full
+RUN addgroup -S korap && \
+ adduser -S kustvakt -G korap && \
+ mkdir kustvakt && \
+ chown -R kustvakt.korap /kustvakt
+WORKDIR /kustvakt
+USER kustvakt
+RUN mkdir ./data
+COPY --from=builder /kustvakt/built/Kustvakt-full.jar /kustvakt/
+COPY --from=builder /kustvakt/built/Kustvakt.jar /kustvakt
+COPY --from=builder /kustvakt/built/kustvakt.conf /kustvakt/data/
+COPY --from=builder /kustvakt/built/ldap.* /kustvakt/ldap/
+COPY --from=builder /kustvakt/built/Krill-Indexer.jar /kustvakt/
+EXPOSE 8089
+ENTRYPOINT [ "java", "-jar" ]
+CMD [ "Kustvakt-full.jar" ]
+# docker build -f Dockerfile -t korap/kustvakt:{version} --target kustvakt-full .