imgfloat/server
1
0
Fork 0
mirror of https://github.com/imgfloat/server.git synced 2026-02-05 03:39:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove package.json references and client version

Browse Source
This commit is contained in:
Andreas Krühlmann
2026-01-09 18:59:20 +01:00
parent 0b5488be00
commit 77152f5d22
4 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@@ -10,7 +10,6 @@ RUN mvn -B package -DskipTests
FROM eclipse-temurin:17-jre FROM eclipse-temurin:17-jre
WORKDIR /app WORKDIR /app
COPY --from=build /app/target/imgfloat-*.jar app.jar COPY --from=build /app/target/imgfloat-*.jar app.jar
COPY package.json ./
EXPOSE 8080 8443 EXPOSE 8080 8443
ENV JAVA_OPTS="" ENV JAVA_OPTS=""
ENTRYPOINT ["sh", "-c", "exec java ${JAVA_OPTS} -jar app.jar"] ENTRYPOINT ["sh", "-c", "exec java ${JAVA_OPTS} -jar app.jar"]

3
Makefile
View File

@@ -19,9 +19,6 @@ RUNTIME_ENV = IMGFLOAT_ASSETS_PATH=$(IMGFLOAT_ASSETS_PATH) \
SPRING_SERVLET_MULTIPART_MAX_FILE_SIZE=$(SPRING_SERVLET_MULTIPART_MAX_FILE_SIZE) \ SPRING_SERVLET_MULTIPART_MAX_FILE_SIZE=$(SPRING_SERVLET_MULTIPART_MAX_FILE_SIZE) \
SPRING_SERVLET_MULTIPART_MAX_REQUEST_SIZE=$(SPRING_SERVLET_MULTIPART_MAX_REQUEST_SIZE) SPRING_SERVLET_MULTIPART_MAX_REQUEST_SIZE=$(SPRING_SERVLET_MULTIPART_MAX_REQUEST_SIZE)
node_modules: package-lock.json
npm install
.PHONY: build .PHONY: build
build: build:
mvn compile mvn compile

11
pom.xml
View File

@@ -128,17 +128,6 @@
</dependencies> </dependencies>
<build> <build>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>${project.basedir}</directory>
<includes>
<include>package.json</include>
</includes>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>

22
src/main/java/dev/kruhlmann/imgfloat/service/VersionService.java
View File

@@ -20,13 +20,11 @@ public class VersionService {
private static final Pattern PACKAGE_VERSION_PATTERN = Pattern.compile("\"version\"\\s*:\\s*\"([^\"]+)\""); private static final Pattern PACKAGE_VERSION_PATTERN = Pattern.compile("\"version\"\\s*:\\s*\"([^\"]+)\"");
private final String serverVersion; private final String serverVersion;
private final String clientVersion;
private final String releaseVersion; private final String releaseVersion;
public VersionService() throws IOException { public VersionService() throws IOException {
this.serverVersion = resolveServerVersion(); this.serverVersion = resolveServerVersion();
this.clientVersion = resolveClientVersion(); this.releaseVersion = normalizeReleaseVersion(serverVersion);
this.releaseVersion = normalizeReleaseVersion(this.clientVersion);
} }
public String getVersion() { public String getVersion() {
@@ -143,22 +141,4 @@ public class VersionService {
} }
return null; return null;
} }
private String resolveClientVersion() throws IOException {
Path packageJsonPath = Paths.get("package.json");
if (!Files.exists(packageJsonPath) || !Files.isRegularFile(packageJsonPath)) {
throw new FileNotFoundException("package.json not found at " + packageJsonPath.toAbsolutePath());
}
String packageJson = Files.readString(packageJsonPath, StandardCharsets.UTF_8);
Matcher matcher = PACKAGE_VERSION_PATTERN.matcher(packageJson);
if (matcher.find()) {
String version = matcher.group(1);
if (version != null && !version.isBlank()) {
return version.trim();
}
}
throw new IllegalStateException("Version not found or invalid in package.json");
}
} }