From 0532e8c40e155c13d1ec971544441c0be1278586 Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Sat, 11 Mar 2023 11:35:08 +0100 Subject: [PATCH] Tidy up. --- .../java/nu/marginalia/search/model/SearchProfile.java | 2 -- docker-service.gradle | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/services-core/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java index edc2edf0..6f0c7535 100644 --- a/code/services-core/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java +++ b/code/services-core/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java @@ -8,7 +8,6 @@ import nu.marginalia.index.client.model.query.SearchSetIdentifier; import java.util.Objects; public enum SearchProfile { - DEFAULT("default", SearchSetIdentifier.RETRO), MODERN("modern", SearchSetIdentifier.SMALLWEB), CORPO("corpo", SearchSetIdentifier.NONE), @@ -16,7 +15,6 @@ public enum SearchProfile { VINTAGE("vintage", SearchSetIdentifier.NONE), CORPO_CLEAN("corpo-clean", SearchSetIdentifier.NONE), ACADEMIA("academia", SearchSetIdentifier.ACADEMIA), - PLAIN_TEXT("plain-text", SearchSetIdentifier.NONE), FOOD("food", SearchSetIdentifier.NONE), CRAFTS("crafts", SearchSetIdentifier.NONE), diff --git a/docker-service.gradle b/docker-service.gradle index 6048d9ba..15086ce7 100644 --- a/docker-service.gradle +++ b/docker-service.gradle @@ -1,5 +1,3 @@ -import java.nio.file.Files - ext { dockerImage='openjdk:17-slim' serviceJvmOpts='-Dservice-host=0.0.0.0 -ea -Dsmall-ram=true ${wmsa_jvm_param} -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=4000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false' @@ -34,6 +32,11 @@ dockerPrepare { dependsOn tasks.dockerFile } +dockerfileZip { + dependsOn tasks.dockerFile +} + + docker { dockerfile = tasks.dockerFile.outputs.files.singleFile name = 'marginalia.nu/'+application.applicationName+':latest'