Rudolf-Barbu · lauren12133 · Feb 17, 2022 · Feb 17, 2022 · Feb 17, 2022 · Feb 17, 2022
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -0,0 +1,28 @@
+name: docker-image
+on: 
+  release:
+    types: [published]
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+      - name: Login to DockerHub
+        uses: docker/login-action@v4 
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Get the tag name
+        run: echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v7.0.0
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64,linux/s390x,linux/riscv64
+          tags: antonyleons/ward:latest,antonyleons/ward:${{ env.TAG }}
diff --git a/.github/workflows/test-build-jar.yml b/.github/workflows/test-build-jar.yml
@@ -0,0 +1,21 @@
+name: test-build-jar
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+jobs:
+  build-and-upload:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
+        with:
+          java-version: '25'
+          distribution: 'temurin'
+      - run: mvn clean install
+      - run: mvn clean package
+      - uses: actions/upload-artifact@v7
+        with:
+          name: Ward.jar
+          path: target/*.jar
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,7 @@
+# Default ignored files
+.idea/
+target/
+*.iml
+.vscode/
+setup.ini
+.DS_Store
diff --git a/.run/Ward.run.xml b/.run/Ward.run.xml
@@ -0,0 +1,10 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Ward" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" />
+    <module name="ward" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="dev.leons.ward.Ward" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/Dockerfile b/Dockerfile
@@ -1,26 +1,24 @@
-# Base image with maven installed already
-FROM maven:3.6.3-jdk-8 as builder
+# Base image with Maven installed already
+FROM maven:3.9-eclipse-temurin-25 AS builder
 
-# Copy whole project inside docker
+# Copy the entire project into the Docker image
 COPY . .
 
 # Build project
 RUN mvn clean package
 
+# Base image containing OpenJDK 25
+FROM eclipse-temurin:25-jre
 
-# Base image containing OpenJDK 8, maintained by RedHat
-FROM openjdk:8-jre-alpine
-
-# Update apt repo and install sudo package
-RUN apk update && \
-    apk add --no-cache dmidecode eudev && \
-    rm -rf /var/cache/apk/*
-
-# Copy jar and pom from builder image to working directory
+# Copy the JAR file and pom.xml from the builder image to the working directory
 COPY --from=builder target/*.jar /ward.jar
 COPY --from=builder pom.xml /pom.xml
 
+# Expose port 4000
 EXPOSE 4000
 
-# Run jar as sudo user on entry point
-ENTRYPOINT java -jar ward.jar
+# Set production profile
+ENV SPRING_PROFILES_ACTIVE=prod
+
+# Run the JAR file as sudo user on entry point
+ENTRYPOINT ["java", "-jar", "ward.jar"]
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 B-Software
+Copyright (c) 2022 B-Software
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,120 +1,54 @@
 <h3 align = "center">
-    <img src = "https://steamuserimages-a.akamaihd.net/ugc/1297549742976925024/97F3CBA92B2FEF3652F5A06EC90FB5FF89E5D224/" alt = "Logo" />
+<img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/AntonyLeons/ward/docker-image.yml">
+<img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/antonyleons/ward?style=plastic">
+</h3>
+<h3 align = "center">
+    <img src = "images/logo.png" alt = "Logo" />
 </h3>
 
 ---
 
-### About
+## [Demo](https://status.leons.dev)
 
-Ward is a simple and and minimalistic server monitoring tool. Ward supports adaptive design system. Also it supports dark theme.
-It shows only principal information and can be used, if you want to see nice looking dashboard instead looking on bunch of numbers and graphs.
-Ward works nice on all popular operating systems, because it uses [OSHI](https://github.com/oshi/oshi).
+# Quick start
 
-**All features tested on:** `Windows` `Linux`
+## Docker
 
-<p align = "center">
-    <img src = "https://steamuserimages-a.akamaihd.net/ugc/1601547572022736987/1D8D2E576D957DDB9CE34E13D5944AF841E8AAD8/" alt = "Preview Image" />
-    <h7 align = "center">Preview Image</h7>
-</p>
+* `docker run --restart unless-stopped -it -d --name ward  -p 4000:4000 -e WARD_PORT=4000 -e WARD_THEME=dark --cap-add SYS_PTRACE antonyleons/ward`
+* Go to localhost:4000 in web browser
 
----
+Also see the example [docker-compose.yml](https://github.com/AntonyLeons/Ward/blob/main/docker-compose.yml) file in the root directory.
 
-### Features
-
-<table>
-    <tr>
-        <td width = "600.5">Processor name</td>
-        <td rowspan = "5">
-            <img src = "https://steamuserimages-a.akamaihd.net/ugc/1601547572022743136/D62DF59CFA60F5749F2DC7BFE5E9256BCF59E066/" alt = "Card 1" align = "center" />
-        </td>
-    </tr>
-    <tr>
-        <td>Processor utilization percentage</td>
-    </tr>
-    <tr>
-        <td>Processor cores count (Logical and physical ones)</td>
-    </tr>
-    <tr>
-        <td>Current frequency of the processor</td>
-    </tr>
-    <tr>
-        <td>Does the processor supports 64-bit instructions</td>
-    </tr>
-</table>
+## Java
 
-<br>
+Download the latest release from [here](https://github.com/AntonyLeons/Ward/releases/latest)
 
-<table>
-    <tr>
-        <td width = "600.5">Type of operating system and it's version</td>
-        <td rowspan = "5">
-            <img src = "https://steamuserimages-a.akamaihd.net/ugc/1601547572022744630/F9E0CACAA81C882B2F4E401E65090BE9F1FE96F6/" alt = "Card 2" align = "center" />
-        </td>
-    </tr>
-    <tr>
-        <td>RAM utilization percentage</td>
-    </tr>
-    <tr>
-        <td>Amount of total installed RAM</td>
-    </tr>
-    <tr>
-        <td>Generation of the installed RAM (If you have dmidecode)</td>
-    </tr>
-    <tr>
-        <td>Current processes count</td>
-    </tr>
-</table>
+```console
+java -jar ward.jar
+```
 
-<br>
+### About
 
-<table>
-    <tr>
-        <td width = "600.5">Host0 storage name</td>
-        <td rowspan = "5">
-            <img src = "https://steamuserimages-a.akamaihd.net/ugc/1601547572022746249/D6C5612E2D6AB759CC10438C2D93F7EC80F83D83/" alt = "Card 3" align = "center" />
-        </td>
-    </tr>
-    <tr>
-        <td>Storage utilization percentage</td>
-    </tr>
-    <tr>
-        <td>Total current storage installed (Including external drives)</td>
-    </tr>
-    <tr>
-        <td>Installed disks count</td>
-    </tr>
-    <tr>
-        <td>Total amount of virtual memory (Swap in Linux)</td>
-    </tr>
-</table>
+Ward is a simple and minimalistic server monitoring tool. Ward supports adaptive design system. Also, it supports dark theme.
+It shows only principal information and can be used, if you want to see nice looking dashboard instead looking on bunch of numbers and graphs.
+Ward works nice on all popular operating systems, because it uses [OSHI](https://github.com/oshi/oshi).
 
-<br>
+**All features tested on:** `Windows` `Linux`
 
-<table>
-    <tr>
-        <td width = "916.5">
-            <img src = "https://steamuserimages-a.akamaihd.net/ugc/1601547572022740496/79ED24E5E626C7029DA4BDEFFBB04C3E0BF61DB1/" alt = "Card 4" align = "center" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            This block contain uptime and chart sections. Uptime represent time since last boot on Linux, and time between hard resets on Windows.
-            Also it have paginator which can be useful to get author contacts.
-            Chart section display last fifteen seconds of server utilization. (Proccesor, ram, storage)
-            You can hide separated datasets by clicking on rectangles on the top right corner of chart section.
-        </td>
-    </tr>
-</table>
+<p align = "center">
+    <img src = "images/preview.png" alt = "Preview Image" />
+    <h6 align = "center">Preview Image</h6>
+</p>
 
 ---
 
 ### Installation
+
     Create your own jar
 
-    1. Clone the project
-    2. Import project in your IDE as Maven project
-    3. mvn clean package
-    4. jar will be in the target folder
+    • Clone the project
+    • Import project in your IDE as Maven project
+    • mvn clean package
 
 <br>
 
@@ -130,6 +64,38 @@ Ward works nice on all popular operating systems, because it uses [OSHI](https:/
 
     1. Clone the project
     2. docker build --tag ward
-    3. docker run --rm -it --name ward -p 4000:4000 -p <application port>:<application port> --privileged ward
-    4. Go to localhost:4000 in web browser, input the same application port
-    5. If you get error after being redirected to application port try hitting refresh
+    3. docker run --restart unless-stopped -it -d --name ward  -p 4000:4000 -e WARD_PORT=4000 -e WARD_THEME=dark --cap-add SYS_PTRACE ward
+    4. Go to localhost:4000 in web browser
+
+### Config
+
+If you want to change Ward's configuration, you can edit `setup.ini`. When using Docker, use the environment variables `WARD_NAME`,`WARD_THEME`, `WARD_PORT` to automatically regenerate this file at startup. Using any environment variable listed will enable the defaults below and immediately start Ward without the GUI setup.
+
+| Setting         | Env var         | Description                                  | Default |
+|-----------------|-----------------|----------------------------------------------|---------|
+| serverName      | WARD_NAME       | Name shown in the interface.                 | Ward    |
+| port            | WARD_PORT       | Port to listen on.                           | 4000    |
+| theme           | WARD_THEME      | Either `light` or `dark`.                    | light   |
+| enableFog       | WARD_FOG        | Either `true` or `false`.                    | true    |
+| backgroundColor | WARD_BACKGROUND | HexColor for background when fog is disabled | default |
+
+Environment variables take priority and will regenerate this file with your variables. If no environment variables are set, `setup.ini` is generated once you navigate to Ward's webpage and complete the initial setup. You can also make this file yourself before starting Ward, and place it in the same directory.
+
+For example:
+
+```ini
+[setup]
+serverName = my-server
+theme = dark
+port = 8200
+enableFog = true
+backgroundColor = #303030
+```
+
+### Credits
+
+Original Creator: <https://github.com/Rudolf-Barbu/Ward>
+<a href="https://www.flaticon.com/free-icons/control-panel" title="control panel icons">Control panel icons created by Freepik - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/processor" title="processor icons">Processor icons created by Those Icons - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/ram" title="ram icons">Ram icons created by srip - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/hard-disk" title="hard disk icons">Hard disk icons created by Freepik - Flaticon</a>
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,15 @@
+services:
+    run:
+        restart: unless-stopped
+        container_name: ward
+        ports:
+            - '4000:4000'
+        environment:
+            - WARD_PORT=4000
+            - WARD_THEME=light
+            - WARD_NAME=Ward
+            - WARD_FOG=true
+            - WARD_BACKGROUND=#3c3c3c # disable fog to use background
+        cap_add:
+            - SYS_PTRACE
+        image: antonyleons/ward
diff --git a/images/logo.png b/images/logo.png
diff --git a/images/preview.png b/images/preview.png