mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2026-10-08 22:46:41 +00:00
Merge pull request #412 from Vaso73/fix/oci-uptime-kuma-v2
fix(oci): use Uptime Kuma v2 image
This commit is contained in:
@@ -50,10 +50,10 @@
|
|||||||
"service_name": "uptimekuma",
|
"service_name": "uptimekuma",
|
||||||
"container_name": "uptimekuma",
|
"container_name": "uptimekuma",
|
||||||
"image": {
|
"image": {
|
||||||
"reference": "louislam/uptime-kuma:latest",
|
"reference": "louislam/uptime-kuma:2",
|
||||||
"registry": "docker.io",
|
"registry": "docker.io",
|
||||||
"repository": "louislam/uptime-kuma",
|
"repository": "louislam/uptime-kuma",
|
||||||
"tag": "latest",
|
"tag": "2",
|
||||||
"digest": null,
|
"digest": null,
|
||||||
"pull_policy": "resolve-selected-tag-to-architecture-digest-at-install"
|
"pull_policy": "resolve-selected-tag-to-architecture-digest-at-install"
|
||||||
},
|
},
|
||||||
@@ -88,7 +88,7 @@
|
|||||||
"related_services": [],
|
"related_services": [],
|
||||||
"restart": "unless-stopped",
|
"restart": "unless-stopped",
|
||||||
"stop_grace_period": null,
|
"stop_grace_period": null,
|
||||||
"original_compose": "name: uptimekuma\nservices:\n uptimekuma:\n image: louislam/uptime-kuma:latest\n deploy:\n resources:\n reservations:\n memory: 128M\n network_mode: bridge\n ports:\n - target: 3001\n published: '3001'\n protocol: tcp\n restart: unless-stopped\n volumes:\n - type: bind\n source: /DATA/AppData/$AppID/app/data\n target: /app/data\n container_name: uptimekuma\n"
|
"original_compose": "name: uptimekuma\nservices:\n uptimekuma:\n image: louislam/uptime-kuma:2\n deploy:\n resources:\n reservations:\n memory: 128M\n network_mode: bridge\n ports:\n - target: 3001\n published: '3001'\n protocol: tcp\n restart: unless-stopped\n volumes:\n - type: bind\n source: /DATA/AppData/$AppID/app/data\n target: /app/data\n container_name: uptimekuma\n"
|
||||||
},
|
},
|
||||||
"compose_stack": {
|
"compose_stack": {
|
||||||
"project_name": "uptimekuma",
|
"project_name": "uptimekuma",
|
||||||
@@ -99,7 +99,7 @@
|
|||||||
"services": [
|
"services": [
|
||||||
{
|
{
|
||||||
"name": "uptimekuma",
|
"name": "uptimekuma",
|
||||||
"image": "louislam/uptime-kuma:latest",
|
"image": "louislam/uptime-kuma:2",
|
||||||
"is_main": true,
|
"is_main": true,
|
||||||
"role": "frontend",
|
"role": "frontend",
|
||||||
"vmid_offset": 0,
|
"vmid_offset": 0,
|
||||||
@@ -107,7 +107,7 @@
|
|||||||
"frontend_network": true,
|
"frontend_network": true,
|
||||||
"private_network": false,
|
"private_network": false,
|
||||||
"compose": {
|
"compose": {
|
||||||
"image": "louislam/uptime-kuma:latest",
|
"image": "louislam/uptime-kuma:2",
|
||||||
"deploy": {
|
"deploy": {
|
||||||
"resources": {
|
"resources": {
|
||||||
"reservations": {
|
"reservations": {
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
"""Uptime Kuma must use the current v2 image line, not the frozen latest tag."""
|
||||||
|
|
||||||
|
import json
|
||||||
|
from pathlib import Path
|
||||||
|
import sys
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parents[1]
|
||||||
|
sys.path.insert(0, str(ROOT / "src"))
|
||||||
|
|
||||||
|
from proxmenux_oci.catalog import Catalog
|
||||||
|
|
||||||
|
|
||||||
|
class UptimeKumaImageTagTests(unittest.TestCase):
|
||||||
|
def test_catalog_and_composed_template_use_v2(self):
|
||||||
|
entry = json.loads((ROOT / "catalog" / "apps" / "uptimekuma.json").read_text())
|
||||||
|
template = Catalog(ROOT).compose("uptimekuma")
|
||||||
|
|
||||||
|
self.assertEqual(
|
||||||
|
entry["container_contract"]["image"]["reference"],
|
||||||
|
"louislam/uptime-kuma:2",
|
||||||
|
)
|
||||||
|
self.assertEqual(entry["container_contract"]["image"]["tag"], "2")
|
||||||
|
self.assertNotIn("louislam/uptime-kuma:latest", entry["container_contract"]["original_compose"])
|
||||||
|
|
||||||
|
self.assertEqual(
|
||||||
|
template["container_contract"]["image"]["reference"],
|
||||||
|
"louislam/uptime-kuma:2",
|
||||||
|
)
|
||||||
|
service = template["compose_stack"]["services"][0]
|
||||||
|
self.assertEqual(service["image"], "louislam/uptime-kuma:2")
|
||||||
|
self.assertEqual(service["compose"]["image"], "louislam/uptime-kuma:2")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
Reference in New Issue
Block a user