Merge pull request #718 from Epic-Breakfast-Productions/dev

Dev
Epic-Breakfast-Productions · Oct 16, 2024 · d7ccf43 · d7ccf43
2 parents e7534d7 + 64fa4cb
commit d7ccf43
Show file tree

Hide file tree

Showing 24 changed files with 106 additions and 25 deletions.
diff --git a/deployment/Single Host/Infrastructure/jaeger/properties.json b/deployment/Single Host/Infrastructure/jaeger/properties.json
@@ -1,6 +1,6 @@
 {
 	"packageName":"oqm-infra-jaeger",
-	"version":"1.2.0",
+	"version":"1.2.1",
 	"description":"Jaeger instance for Open QuarterMaster.",
 	"homepage":"https://github.com/Epic-Breakfast-Productions/OpenQuarterMaster/tree/main/software/Infrastructure/jaeger",
 	"configs": [],

diff --git a/deployment/Single Host/Infrastructure/kafka-red-panda/properties.json b/deployment/Single Host/Infrastructure/kafka-red-panda/properties.json
@@ -1,6 +1,6 @@
 {
 	"packageName":"oqm-infra-kafka+red+panda",
-	"version":"1.0.0",
+	"version":"1.0.1",
 	"description":"Kafka instance for Open QuarterMaster using Red Panda.",
 	"homepage":"https://github.com/Epic-Breakfast-Productions/OpenQuarterMaster/tree/main/software/Infrastructure/kafka-red-panda",
 	"configs": [],

diff --git a/deployment/Single Host/Infrastructure/keycloak/oqm-infra-keycloak.service b/deployment/Single Host/Infrastructure/keycloak/oqm-infra-keycloak.service
@@ -102,7 +102,7 @@ ExecStartPost=/bin/bash -c "running=\"false\"; \
                                     echo \"Container was stopped!\"; \
                                     exit 1; \
                                 fi; \
-                                hcGet=\"$(docker run --network=oqm-internal docker.io/curlimages/curl:latest https://oqm-infra-keycloak:9000/health -k)\"; \
+                                hcGet=\"$(docker run --rm --name oqm-infra-keycloak-hc --network=oqm-internal docker.io/curlimages/curl:latest https://oqm-infra-keycloak:9000/health -k)\"; \
                                 echo \"Health check get: $hcGet\"; \
                                 status=\"$(jq --argjson hcGet \"$hcGet\" -nr '$hcGet.status')\"; \
                                 echo \"Status: $status\"; \

diff --git a/deployment/Single Host/Infrastructure/keycloak/properties.json b/deployment/Single Host/Infrastructure/keycloak/properties.json
@@ -1,6 +1,6 @@
 {
 	"packageName":"oqm-infra-keycloak",
-	"version":"1.2.0",
+	"version":"1.2.2",
 	"description":"Keycloak instance for Open QuarterMaster.",
 	"homepage":"https://github.com/Epic-Breakfast-Productions/OpenQuarterMaster/tree/main/deployment/Single%20Host/Infrastructure/keycloak",
 	"configs": [

diff --git a/deployment/Single Host/Infrastructure/makeInstallers.sh b/deployment/Single Host/Infrastructure/makeInstallers.sh
@@ -92,7 +92,7 @@ Developer: EBP
 Architecture: all
 Description: $(cat "$packageConfigFile" | jq -r '.description')
 Homepage: $(cat "$packageConfigFile" | jq -r '.homepage')
-Depends: docker, docker.io, oqm-manager-station+captain (>= 2.2.0)$(cat "$packageConfigFile" | jq -r '.dependencies.deb')
+Depends: docker.io, oqm-manager-station+captain (>= 2.2.0)$(cat "$packageConfigFile" | jq -r '.dependencies.deb')
 EOT
 	# TODO:: add conflicts
 

diff --git a/deployment/Single Host/Infrastructure/mongo/properties.json b/deployment/Single Host/Infrastructure/mongo/properties.json
@@ -1,6 +1,6 @@
 {
 	"packageName":"oqm-infra-mongodb",
-	"version":"1.2.0",
+	"version":"1.2.1",
 	"description":"MongoDb instance for Open QuarterMaster.",
 	"homepage":"https://github.com/Epic-Breakfast-Productions/OpenQuarterMaster/tree/main/software/Infrastructure/mongo",
 	"configs": [],

diff --git a/deployment/Single Host/Infrastructure/postgres/properties.json b/deployment/Single Host/Infrastructure/postgres/properties.json
@@ -1,6 +1,6 @@
 {
 	"packageName":"oqm-infra-postgres",
-	"version":"1.2.0",
+	"version":"1.2.1",
 	"description":"Postgresql instance for Open QuarterMaster.",
 	"homepage":"https://github.com/Epic-Breakfast-Productions/OpenQuarterMaster/tree/main/software/Infrastructure/postgresql",
 	"configs": [

diff --git a/deployment/Single Host/Station-Captain/properties.json b/deployment/Single Host/Station-Captain/properties.json
@@ -1,13 +1,13 @@
 {
 	"packageName":"oqm-manager-station+captain",
-	"version":"2.4.1",
+	"version":"2.4.2",
 	"description":"Utility for setting up and maintaining an instance of Open QuarterMaster.",
 	"maintainer": {
 		"name":"EBP"
 	},
 	"homepage":"https://github.com/Epic-Breakfast-Productions/OpenQuarterMaster/tree/main/software/Station%20Captain",
 	"dependencies": {
-		"deb":"bash, curl, jq, libnss-mdns, hwinfo, moreutils, dialog, docker, docker.io, unattended-upgrades, ca-certificates, python3 (>= 3.10.0), python3-dialog, python3-docker, python3-systemd, python3-argcomplete, python3-jinja2",
+		"deb":"bash, curl, jq, libnss-mdns, hwinfo, moreutils, dialog, docker.io, unattended-upgrades, ca-certificates, python3 (>= 3.10.0), python3-dialog, python3-docker, python3-systemd, python3-argcomplete, python3-jinja2, python3-distutils-extra",
 		"rpm":"bash, curl, jq, hwinfo, moreutils, dialog, docker, python3"
 	},
 	"copyright": {

diff --git a/deployment/Single Host/docs/System Requirements.md b/deployment/Single Host/docs/System Requirements.md
@@ -2,35 +2,36 @@
 
 This is a set of requirements for the entire system, not necessarily just the station captain.
 
-This system is regularly tested on Ubuntu 22.04.
+This system is regularly tested on Ubuntu 24.04.
 
 ## Software Requirements
 
 - A Modern Linux OS
-    - At the moment we only support Debian-based systems (`apt`), we plan on eventually also supporting Fedora/RHEL (`dnf`) systems. (Tested on Ubuntu 22.04, Raspbian)
+    - At the moment we only support Debian-based systems (`apt`), we plan on eventually also supporting Fedora/RHEL (`dnf`) systems.
     - Tested and verified:
       - Ubuntu 22.04
       - Lubuntu 22.04
+      - Ubuntu 24.04
       - Raspbian (current version as of Dec 2023)
 
 ## Hardware Requirements:
 
-- 2 cores on headless server, 4 cores on a host with a desktop
 - 4gb of RAM, 8gb recommended for minimum
 - CPU Requirements
+    - 2 cores on headless server, 4 cores on a host with a desktop
     - One of the following architectures:
         - 64-bit `x64` ISA, intel or AMD
             - Must include [AVX](https://en.wikipedia.org/wiki/Advanced_Vector_Extensions). Known supported:
                 - Any AMD
                 - Any modern Intel i3, i5, i7, i9
-                - Intel N95, N100
+                - Intel N95, N100, N300
         - 64-bit ARM v8
 
-Note:: it is possible certain plugins, or a large number of plugins, will require more resources or have different hardware requirements.
+> [!NOTE]
+> it is possible certain plugins, or a large number of plugins, will require more resources or have different hardware requirements.
 
 ### Proven SBC's and other 'specialty' hardware:
 
 - ARM:
-    - [Raspberry Pi 5B](https://www.raspberrypi.com/products/raspberry-pi-5/), 8Gb memory recommended. 4Gb would probably be fine for testing and minimal purposes only, but any less is probably not going to be enough for a good experience.
-
-
+    - [Raspberry Pi 5B](https://www.raspberrypi.com/products/raspberry-pi-5/
+        - 8Gb memory recommended. 4Gb would probably be fine for testing and minimal purposes only, but any less is probably not going to be enough for a good experience.
diff --git a/software/libs/open-qm-moduleDriver/.idea/.gitignore b/software/libs/open-qm-moduleDriver/.idea/.gitignore
diff --git a/software/libs/open-qm-moduleDriver/.idea/.name b/software/libs/open-qm-moduleDriver/.idea/.name
diff --git a/software/libs/open-qm-moduleDriver/.idea/compiler.xml b/software/libs/open-qm-moduleDriver/.idea/compiler.xml
diff --git a/software/libs/open-qm-moduleDriver/.idea/gradle.xml b/software/libs/open-qm-moduleDriver/.idea/gradle.xml
diff --git a/software/libs/open-qm-moduleDriver/.idea/jarRepositories.xml b/software/libs/open-qm-moduleDriver/.idea/jarRepositories.xml
diff --git a/software/libs/open-qm-moduleDriver/.idea/misc.xml b/software/libs/open-qm-moduleDriver/.idea/misc.xml
diff --git a/software/libs/open-qm-moduleDriver/.idea/vcs.xml b/software/libs/open-qm-moduleDriver/.idea/vcs.xml
diff --git a/software/oqm-core-api/build.gradle b/software/oqm-core-api/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'com.ebp.openQuarterMaster'
-version '2.1.4-DEV'
+version '2.1.5'
 
 repositories {
 	mavenCentral()

diff --git a/software/oqm-core-api/installerSrc/installerProperties.json b/software/oqm-core-api/installerSrc/installerProperties.json
@@ -6,7 +6,7 @@
 	"description": "Core API instance for Open QuarterMaster.",
 	"homepage": "https://github.com/Epic-Breakfast-Productions/OpenQuarterMaster/tree/main/software/oqm-core-api",
 	"dependencies": {
-		"deb": "curl, jq, docker.io, docker, oqm-manager-station+captain (>= 2.1.0), oqm-infra-jaeger (>= 1.1.0), oqm-infra-mongodb (>= 1.1.0), oqm-core-depot (>= 1.0.0)"
+		"deb": "curl, jq, docker.io, oqm-manager-station+captain (>= 2.1.0), oqm-infra-jaeger (>= 1.1.0), oqm-infra-mongodb (>= 1.1.0), oqm-core-depot (>= 1.0.0)"
 	},
 	"copyright": {
 		"contact":"Greg Stewart <[email protected]>",

diff --git a/software/oqm-core-base-station/build.gradle b/software/oqm-core-base-station/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'com.ebp.openQuarterMaster'
-version '1.4.4'
+version '1.4.5'
 
 repositories {
     mavenCentral()

diff --git a/software/oqm-core-base-station/installerSrc/installerProperties.json b/software/oqm-core-base-station/installerSrc/installerProperties.json
@@ -6,7 +6,7 @@
 	"description": "Base Station instance for Open QuarterMaster.",
 	"homepage": "https://github.com/Epic-Breakfast-Productions/OpenQuarterMaster/tree/main/software/open-qm-base-station",
 	"dependencies": {
-		"deb": "curl, jq, docker.io, docker, oqm-manager-station+captain (>= 2.0.0), oqm-infra-jaeger (>= 1.1.0), oqm-infra-keycloak (>= 1.1.0), oqm-core-depot, oqm-core-api (>= 2.1.0)",
+		"deb": "curl, jq, docker.io, oqm-manager-station+captain (>= 2.0.0), oqm-infra-jaeger (>= 1.1.0), oqm-infra-keycloak (>= 1.1.0), oqm-core-depot, oqm-core-api (>= 2.1.0)",
 		"debRec": "oqm-plugin-ext_item_search"
 	},
 	"copyright": {

diff --git a/software/oqm-core-base-station/src/main/resources/templates/tags/links/itemCategory.html b/software/oqm-core-base-station/src/main/resources/templates/tags/links/itemCategory.html
@@ -1 +1 @@
-<a href="/categories">{#icons/categories}{/icons/categories} Categories</a>
+<a href="/itemCategories">{#icons/categories}{/icons/categories} Categories</a>
diff --git a/software/oqm-depot/installerSrc/installerProperties.json b/software/oqm-depot/installerSrc/installerProperties.json
@@ -6,7 +6,7 @@
 	"description": "Depot instance for Open QuarterMaster.",
 	"homepage": "https://github.com/Epic-Breakfast-Productions/OpenQuarterMaster/tree/main/software/oqm-depot",
 	"dependencies": {
-		"deb": "docker.io, docker, oqm-manager-station+captain (>= 2.1.0)"
+		"deb": "docker.io, oqm-manager-station+captain (>= 2.1.0)"
 	},
 	"copyright": {
 		"contact":"Greg Stewart <[email protected]>",

diff --git a/software/oqm-depot/webroot/composer.json b/software/oqm-depot/webroot/composer.json
@@ -3,7 +3,7 @@
     "description": "OQM Depot is your entrypoint into the OQM system.",
     "type": "project",
     "license": "GPL",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "autoload": {
         "psr-4": {
             "Ebprod\\OqmCoreDepot\\": "res/script/"

diff --git a/software/oqm-depot/webroot/composer.lock b/software/oqm-depot/webroot/composer.lock
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<a href="/categories">{#icons/categories}{/icons/categories} Categories</a>
		<a href="/itemCategories">{#icons/categories}{/icons/categories} Categories</a>