diff --git a/goofy-server/pom.xml b/goofy-server/pom.xml index 0f9f3cd23814be4cc247b62a1fb8ab52537d3b65..5c48e19a39c4d8c0d7a2c9583930d3c009975ef4 100644 --- a/goofy-server/pom.xml +++ b/goofy-server/pom.xml @@ -18,6 +18,8 @@ <properties> <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> + + <spring-boot.build-image.imageName>docker.ozg-sh.de/goofy:build-latest</spring-boot.build-image.imageName> </properties> <dependencies> @@ -281,7 +283,8 @@ <username>admin</username> <password>admin</password> <!-- <repository>default-route-openshift-image-registry.apps.lab.okd.local/sh-kiel-dev/goofy</repository> --> - <repository>registry.ozg-sh.de/sh-land/goofy</repository> +<!-- <repository>registry.ozg-sh.de/sh-land/goofy</repository> --> + <repository>docker.ozg-sh.de/goofy</repository> <tag>${git.branch}-${project.version}</tag> <useMavenSettingsForAuth>true</useMavenSettingsForAuth> <buildArgs> diff --git a/goofy-server/src/main/java/de/itvsh/goofy/WebConfig.java b/goofy-server/src/main/java/de/itvsh/goofy/WebConfig.java index f4e10ec2620b042b75ad3a6d4e322bbdc88c89bb..e8afd1244eb0d4bafc45439564cd9fe7a41137c7 100644 --- a/goofy-server/src/main/java/de/itvsh/goofy/WebConfig.java +++ b/goofy-server/src/main/java/de/itvsh/goofy/WebConfig.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.util.concurrent.TimeUnit; import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.http.CacheControl; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; @@ -35,7 +34,8 @@ public class WebConfig implements WebMvcConfigurer { protected Resource getResource(String resourcePath, Resource location) throws IOException { Resource requestedResource = location.createRelative(resourcePath); return requestedResource.exists() && requestedResource.isReadable() ? requestedResource - : new ClassPathResource(RESOURCE_LOCATION + "index.html"); +// : new ClassPathResource(RESOURCE_LOCATION + "index.html"); + : super.getResource("index.html", location); } });