diff --git a/Dockerfile b/Dockerfile index ca634ec..8a8d1dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,18 @@ -FROM eclipse-temurin:25.0.1_8-jdk-ubi10-minimal@sha256:2f088232687048be4cebe42d16d818170772c3bd5d57a22d65ef85cb09c10f72 AS builder +FROM node:24.11.0@sha256:e5bbac0e9b8a6e3b96a86a82bbbcf4c533a879694fd613ed616bae5116f6f243 AS builder_node +WORKDIR /dashboard +COPY package.json package-lock.json ./ +RUN npm clean-install +COPY . ./ +RUN npm run build + +FROM eclipse-temurin:25.0.1_8-jdk-ubi10-minimal@sha256:2f088232687048be4cebe42d16d818170772c3bd5d57a22d65ef85cb09c10f72 AS builder_java WORKDIR /dashboard/ COPY . . +COPY --from=builder_node /dashboard/src/main/resources/static/styles.css ./ RUN ./gradlew build bootJar FROM eclipse-temurin:25.0.1_8-jre-ubi10-minimal@sha256:861de197973049618f02bb190eafa78b9359b568f0570c0de6837211146e63f9 WORKDIR /opt/app/ - ENV TZ=Europe/Berlin - -COPY --from=builder /dashboard/build/libs/dashboard-0.0.1-SNAPSHOT.jar ./ - +COPY --from=builder_java /dashboard/build/libs/dashboard-0.0.1-SNAPSHOT.jar ./ ENTRYPOINT ["java", "-jar", "dashboard-0.0.1-SNAPSHOT.jar"] diff --git a/package.json b/package.json index d14e322..f8f044f 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "author": "", "type": "commonjs", "scripts": { - "watch": "npx @tailwindcss/cli -i ./input.css -o ./src/main/resources/static/styles.css --watch" + "watch": "npx @tailwindcss/cli -i ./input.css -o ./src/main/resources/static/styles.css --watch", + "build": "npx @tailwindcss/cli -i ./input.css -o ./src/main/resources/static/styles.css --minify" }, "devDependencies": { "@tailwindcss/cli": "4.1.17", diff --git a/src/main/java/de/wundenbergs/dashboard/IndexController.java b/src/main/java/de/wundenbergs/dashboard/IndexController.java index 7ffcb04..691fb84 100644 --- a/src/main/java/de/wundenbergs/dashboard/IndexController.java +++ b/src/main/java/de/wundenbergs/dashboard/IndexController.java @@ -18,6 +18,7 @@ public class IndexController { new Item("https://pihole.wundenbergs.de/admin", "Pihole", "assets/pihole.png"), new Item("https://spend-sparrow.de", "Spend-Sparrow", "assets/spend-sparrow.svg"), new Item("https://jellyfin.wundenbergs.de", "Jellyfin", "assets/jellyfin.svg"), + new Item("https://traefik.wundenbergs.de", "Traefik", "assets/traefik.svg"), new Item("https://192.168.188.102:8006/", "Proxmox", "assets/proxmox.svg")); @GetMapping("/") diff --git a/src/main/resources/static/assets/traefik.svg b/src/main/resources/static/assets/traefik.svg new file mode 100644 index 0000000..402f5e0 --- /dev/null +++ b/src/main/resources/static/assets/traefik.svg @@ -0,0 +1,316 @@ + + + +image/svg+xml