Merge branch 'master' into ci-tooling

catalog.json

@@ -14,7 +14,7 @@
             "latest_version": "1.0.4",
             "latest_app_version": "v1",
             "latest_human_version": "v1_1.0.4",
-            "last_update": "2024-07-08 10:53:41",
+            "last_update": "2024-07-09 10:30:19",
             "name": "nginx",
             "recommended": false,
             "title": "Nginx",
@@ -33,6 +33,39 @@
                 "https://hub.docker.com/r/adguard/adguardhome"
             ],
             "icon_url": "https://seeklogo.com/images/N/nginx-logo-B38DADE410-seeklogo.com.png"
+        },
+        "other-nginx": {
+            "app_readme": "<h1>Nginx</h1>\n<p>It is a test app</p>",
+            "categories": [
+                "networking"
+            ],
+            "description": "Nginx description",
+            "healthy": true,
+            "healthy_error": null,
+            "home": "https://github.com/AdguardTeam/AdGuardHome",
+            "location": "/__w/apps/apps/trains/test/other-nginx",
+            "latest_version": "1.0.1",
+            "latest_app_version": "v1",
+            "latest_human_version": "v1_1.0.1",
+            "last_update": "2024-07-09 10:31:28",
+            "name": "other-nginx",
+            "recommended": false,
+            "title": "Other-nginx",
+            "maintainers": [
+                {
+                    "email": "dev@ixsystems.com",
+                    "name": "truenas",
+                    "url": "https://www.truenas.com/"
+                }
+            ],
+            "tags": [],
+            "screenshots": [],
+            "sources": [
+                "https://github.com/AdguardTeam/AdGuardHome",
+                "https://github.com/truenas/charts/tree/master/community/adguard-home",
+                "https://hub.docker.com/r/adguard/adguardhome"
+            ],
+            "icon_url": "https://seeklogo.com/images/N/nginx-logo-B38DADE410-seeklogo.com.png"
         }
     }
 }

ix-dev/test/other-nginx/README.md

@@ -0,0 +1,3 @@
+# Nginx
+
+It is a test app

ix-dev/test/other-nginx/app.yaml

@@ -0,0 +1,36 @@
+app_version: v1
+capabilities:
+- description: Just here as an example
+  name: NET_RAW
+categories:
+- networking
+description: Nginx description
+home: https://github.com/AdguardTeam/AdGuardHome
+host_mounts: []
+icon: https://media.sys.truenas.net/apps/adguard-home/icons/icon.svg
+keywords:
+- dns
+- adblock
+lib_version: 0.0.1
+lib_version_hash: f074617a82a86d2a6cc78a4c8a4296fc9d168e456f12713e50c696557b302133
+maintainers:
+- email: dev@ixsystems.com
+  name: truenas
+  url: https://www.truenas.com/
+name: other-nginx
+run_as_context:
+- description: Test app.
+  gid: 0
+  group_name: root
+  uid: 0
+  user_name: root
+screenshots:
+- https://media.sys.truenas.net/apps/adguard-home/screenshots/screenshot1.png
+- https://media.sys.truenas.net/apps/adguard-home/screenshots/screenshot2.png
+sources:
+- https://github.com/AdguardTeam/AdGuardHome
+- https://github.com/truenas/charts/tree/master/community/adguard-home
+- https://hub.docker.com/r/adguard/adguardhome
+title: Other Nginx
+train: test
+version: 1.0.1

ix-dev/test/other-nginx/item.yaml

@@ -0,0 +1,5 @@
+icon_url: https://seeklogo.com/images/N/nginx-logo-B38DADE410-seeklogo.com.png
+categories:
+  - networking
+screenshots: []
+tags: []

ix-dev/test/other-nginx/questions.yaml

@@ -0,0 +1,18 @@
+groups:
+  - name: Network Configuration
+    description: Configure Network for Nginx
+
+questions:
+  - variable: network
+    label: ""
+    group: Network Configuration
+    schema:
+      type: dict
+      attrs:
+        - variable: web_port
+          label: WebUI Port
+          description: The port for Nginx WebUI
+          schema:
+            type: int
+            default: 8081
+            required: true

ix-dev/test/other-nginx/templates/docker-compose.yaml

@@ -0,0 +1,42 @@
+services:
+  {{ ix_lib.base.test.container_name() }}:
+    image: nginx
+    ports:
+      - {{ values.network.web_port }}:80
+    depends_on:
+      perms:
+        condition: service_completed_successfully
+    healthcheck:
+      test: "curl --fail --silent http://localhost:80"
+      interval: 10s
+      timeout: 10s
+      retries: 5
+      start_period: 30s
+    volumes:
+      - /mnt/nginx/dir_0:/mnt/directories/dir1
+      - docker-volume-nginx:/mnt/directories/dir2
+  perms:
+    image: bash
+    user: root
+    deploy:
+      resources:
+        limits:
+          cpus: "1.0"
+          memory: 512m
+    entrypoint:
+      - bash
+      - -c
+    command:
+      - |
+        echo "applying permissions..."
+        chmod 777 /mnt/directories/dir1
+        chmod 777 /mnt/directories/dir2
+        sleep 10
+        echo "Done applying permissions"
+        exit 0
+    volumes:
+      - /usr/docker-nginx:/mnt/directories/dir1
+      - docker-volume-nginx:/mnt/directories/dir2
+
+volumes:
+  docker-volume-nginx: {}

ix-dev/test/other-nginx/templates/library/base_v0_0_1/test.py

@@ -0,0 +1,2 @@
+def container_name():
+    return "nginx"

ix-dev/test/other-nginx/templates/test_values/basic-values.yaml

@@ -0,0 +1,2 @@
+network:
+  web_port: 8081

ix-dev/test/other-nginx/to_keep_versions.yaml

@@ -0,0 +1 @@
+- 1.0.0

trains/test/nginx/app_versions.json

@@ -4,7 +4,7 @@
         "supported": true,
         "healthy_error": null,
         "location": "/__w/apps/apps/trains/test/nginx/1.0.4",
-        "last_update": "2024-07-08 10:53:41",
+        "last_update": "2024-07-09 10:30:19",
         "required_features": [],
         "human_version": "v1_1.0.4",
         "version": "1.0.4",
@@ -97,7 +97,7 @@
         "supported": true,
         "healthy_error": null,
         "location": "/__w/apps/apps/trains/test/nginx/1.0.3",
-        "last_update": "2024-07-08 10:52:17",
+        "last_update": "2024-07-09 10:30:19",
         "required_features": [],
         "human_version": "v1_1.0.3",
         "version": "1.0.3",

trains/test/other-nginx/1.0.0/README.md

@@ -0,0 +1,3 @@
+# Nginx
+
+It is a test app

trains/test/other-nginx/1.0.0/app.yaml

@@ -0,0 +1,36 @@
+app_version: v1
+capabilities:
+- description: Just here as an example
+  name: NET_RAW
+categories:
+- networking
+description: Nginx description
+home: https://github.com/AdguardTeam/AdGuardHome
+host_mounts: []
+icon: https://media.sys.truenas.net/apps/adguard-home/icons/icon.svg
+keywords:
+- dns
+- adblock
+lib_version: 0.0.1
+lib_version_hash: f074617a82a86d2a6cc78a4c8a4296fc9d168e456f12713e50c696557b302133
+maintainers:
+- email: dev@ixsystems.com
+  name: truenas
+  url: https://www.truenas.com/
+name: other-nginx
+run_as_context:
+- description: Test app.
+  gid: 0
+  group_name: root
+  uid: 0
+  user_name: root
+screenshots:
+- https://media.sys.truenas.net/apps/adguard-home/screenshots/screenshot1.png
+- https://media.sys.truenas.net/apps/adguard-home/screenshots/screenshot2.png
+sources:
+- https://github.com/AdguardTeam/AdGuardHome
+- https://github.com/truenas/charts/tree/master/community/adguard-home
+- https://hub.docker.com/r/adguard/adguardhome
+title: Other Nginx
+train: test
+version: 1.0.0

trains/test/other-nginx/1.0.0/questions.yaml

@@ -0,0 +1,18 @@
+groups:
+  - name: Network Configuration
+    description: Configure Network for Nginx
+
+questions:
+  - variable: network
+    label: ""
+    group: Network Configuration
+    schema:
+      type: dict
+      attrs:
+        - variable: web_port
+          label: WebUI Port
+          description: The port for Nginx WebUI
+          schema:
+            type: int
+            default: 8081
+            required: true

trains/test/other-nginx/1.0.0/templates/docker-compose.yaml

@@ -0,0 +1,42 @@
+services:
+  {{ ix_lib.base.test.container_name() }}:
+    image: nginx
+    ports:
+      - {{ values.network.web_port }}:80
+    depends_on:
+      perms:
+        condition: service_completed_successfully
+    healthcheck:
+      test: "curl --fail --silent http://localhost:80"
+      interval: 10s
+      timeout: 10s
+      retries: 5
+      start_period: 30s
+    volumes:
+      - /mnt/nginx/dir_0:/mnt/directories/dir1
+      - docker-volume-nginx:/mnt/directories/dir2
+  perms:
+    image: bash
+    user: root
+    deploy:
+      resources:
+        limits:
+          cpus: "1.0"
+          memory: 512m
+    entrypoint:
+      - bash
+      - -c
+    command:
+      - |
+        echo "applying permissions..."
+        chmod 777 /mnt/directories/dir1
+        chmod 777 /mnt/directories/dir2
+        sleep 10
+        echo "Done applying permissions"
+        exit 0
+    volumes:
+      - /usr/docker-nginx:/mnt/directories/dir1
+      - docker-volume-nginx:/mnt/directories/dir2
+
+volumes:
+  docker-volume-nginx: {}

trains/test/other-nginx/1.0.0/templates/library/base_v0_0_1/test.py

@@ -0,0 +1,2 @@
+def container_name():
+    return "nginx"

trains/test/other-nginx/1.0.0/templates/test_values/basic-values.yaml

@@ -0,0 +1,2 @@
+network:
+  web_port: 8081

trains/test/other-nginx/1.0.1/README.md

@@ -0,0 +1,3 @@
+# Nginx
+
+It is a test app

trains/test/other-nginx/1.0.1/app.yaml

@@ -0,0 +1,36 @@
+app_version: v1
+capabilities:
+- description: Just here as an example
+  name: NET_RAW
+categories:
+- networking
+description: Nginx description
+home: https://github.com/AdguardTeam/AdGuardHome
+host_mounts: []
+icon: https://media.sys.truenas.net/apps/adguard-home/icons/icon.svg
+keywords:
+- dns
+- adblock
+lib_version: 0.0.1
+lib_version_hash: f074617a82a86d2a6cc78a4c8a4296fc9d168e456f12713e50c696557b302133
+maintainers:
+- email: dev@ixsystems.com
+  name: truenas
+  url: https://www.truenas.com/
+name: other-nginx
+run_as_context:
+- description: Test app.
+  gid: 0
+  group_name: root
+  uid: 0
+  user_name: root
+screenshots:
+- https://media.sys.truenas.net/apps/adguard-home/screenshots/screenshot1.png
+- https://media.sys.truenas.net/apps/adguard-home/screenshots/screenshot2.png
+sources:
+- https://github.com/AdguardTeam/AdGuardHome
+- https://github.com/truenas/charts/tree/master/community/adguard-home
+- https://hub.docker.com/r/adguard/adguardhome
+title: Other Nginx
+train: test
+version: 1.0.1

trains/test/other-nginx/1.0.1/questions.yaml

@@ -0,0 +1,18 @@
+groups:
+  - name: Network Configuration
+    description: Configure Network for Nginx
+
+questions:
+  - variable: network
+    label: ""
+    group: Network Configuration
+    schema:
+      type: dict
+      attrs:
+        - variable: web_port
+          label: WebUI Port
+          description: The port for Nginx WebUI
+          schema:
+            type: int
+            default: 8081
+            required: true

trains/test/other-nginx/1.0.1/templates/docker-compose.yaml

@@ -0,0 +1,42 @@
+services:
+  {{ ix_lib.base.test.container_name() }}:
+    image: nginx
+    ports:
+      - {{ values.network.web_port }}:80
+    depends_on:
+      perms:
+        condition: service_completed_successfully
+    healthcheck:
+      test: "curl --fail --silent http://localhost:80"
+      interval: 10s
+      timeout: 10s
+      retries: 5
+      start_period: 30s
+    volumes:
+      - /mnt/nginx/dir_0:/mnt/directories/dir1
+      - docker-volume-nginx:/mnt/directories/dir2
+  perms:
+    image: bash
+    user: root
+    deploy:
+      resources:
+        limits:
+          cpus: "1.0"
+          memory: 512m
+    entrypoint:
+      - bash
+      - -c
+    command:
+      - |
+        echo "applying permissions..."
+        chmod 777 /mnt/directories/dir1
+        chmod 777 /mnt/directories/dir2
+        sleep 10
+        echo "Done applying permissions"
+        exit 0
+    volumes:
+      - /usr/docker-nginx:/mnt/directories/dir1
+      - docker-volume-nginx:/mnt/directories/dir2
+
+volumes:
+  docker-volume-nginx: {}

trains/test/other-nginx/1.0.1/templates/library/base_v0_0_1/test.py

@@ -0,0 +1,2 @@
+def container_name():
+    return "nginx"

trains/test/other-nginx/1.0.1/templates/test_values/basic-values.yaml

@@ -0,0 +1,2 @@
+network:
+  web_port: 8081

trains/test/other-nginx/app_versions.json

@@ -0,0 +1,188 @@
+{
+    "1.0.1": {
+        "healthy": true,
+        "supported": true,
+        "healthy_error": null,
+        "location": "/__w/apps/apps/trains/test/other-nginx/1.0.1",
+        "last_update": "2024-07-09 10:31:28",
+        "required_features": [],
+        "human_version": "v1_1.0.1",
+        "version": "1.0.1",
+        "app_metadata": {
+            "app_version": "v1",
+            "capabilities": [
+                {
+                    "description": "Just here as an example",
+                    "name": "NET_RAW"
+                }
+            ],
+            "categories": [
+                "networking"
+            ],
+            "description": "Nginx description",
+            "home": "https://github.com/AdguardTeam/AdGuardHome",
+            "host_mounts": [],
+            "icon": "https://media.sys.truenas.net/apps/adguard-home/icons/icon.svg",
+            "keywords": [
+                "dns",
+                "adblock"
+            ],
+            "lib_version": "0.0.1",
+            "lib_version_hash": "f074617a82a86d2a6cc78a4c8a4296fc9d168e456f12713e50c696557b302133",
+            "maintainers": [
+                {
+                    "email": "dev@ixsystems.com",
+                    "name": "truenas",
+                    "url": "https://www.truenas.com/"
+                }
+            ],
+            "name": "other-nginx",
+            "run_as_context": [
+                {
+                    "description": "Test app.",
+                    "gid": 0,
+                    "group_name": "root",
+                    "uid": 0,
+                    "user_name": "root"
+                }
+            ],
+            "screenshots": [
+                "https://media.sys.truenas.net/apps/adguard-home/screenshots/screenshot1.png",
+                "https://media.sys.truenas.net/apps/adguard-home/screenshots/screenshot2.png"
+            ],
+            "sources": [
+                "https://github.com/AdguardTeam/AdGuardHome",
+                "https://github.com/truenas/charts/tree/master/community/adguard-home",
+                "https://hub.docker.com/r/adguard/adguardhome"
+            ],
+            "title": "Other Nginx",
+            "train": "test",
+            "version": "1.0.1"
+        },
+        "schema": {
+            "groups": [
+                {
+                    "name": "Network Configuration",
+                    "description": "Configure Network for Nginx"
+                }
+            ],
+            "questions": [
+                {
+                    "variable": "network",
+                    "label": "",
+                    "group": "Network Configuration",
+                    "schema": {
+                        "type": "dict",
+                        "attrs": [
+                            {
+                                "variable": "web_port",
+                                "label": "WebUI Port",
+                                "description": "The port for Nginx WebUI",
+                                "schema": {
+                                    "type": "int",
+                                    "default": 8081,
+                                    "required": true
+                                }
+                            }
+                        ]
+                    }
+                }
+            ]
+        },
+        "readme": "<h1>Nginx</h1>\n<p>It is a test app</p>",
+        "changelog": null
+    },
+    "1.0.0": {
+        "healthy": true,
+        "supported": true,
+        "healthy_error": null,
+        "location": "/__w/apps/apps/trains/test/other-nginx/1.0.0",
+        "last_update": "2024-07-09 10:30:19",
+        "required_features": [],
+        "human_version": "v1_1.0.0",
+        "version": "1.0.0",
+        "app_metadata": {
+            "app_version": "v1",
+            "capabilities": [
+                {
+                    "description": "Just here as an example",
+                    "name": "NET_RAW"
+                }
+            ],
+            "categories": [
+                "networking"
+            ],
+            "description": "Nginx description",
+            "home": "https://github.com/AdguardTeam/AdGuardHome",
+            "host_mounts": [],
+            "icon": "https://media.sys.truenas.net/apps/adguard-home/icons/icon.svg",
+            "keywords": [
+                "dns",
+                "adblock"
+            ],
+            "lib_version": "0.0.1",
+            "lib_version_hash": "f074617a82a86d2a6cc78a4c8a4296fc9d168e456f12713e50c696557b302133",
+            "maintainers": [
+                {
+                    "email": "dev@ixsystems.com",
+                    "name": "truenas",
+                    "url": "https://www.truenas.com/"
+                }
+            ],
+            "name": "other-nginx",
+            "run_as_context": [
+                {
+                    "description": "Test app.",
+                    "gid": 0,
+                    "group_name": "root",
+                    "uid": 0,
+                    "user_name": "root"
+                }
+            ],
+            "screenshots": [
+                "https://media.sys.truenas.net/apps/adguard-home/screenshots/screenshot1.png",
+                "https://media.sys.truenas.net/apps/adguard-home/screenshots/screenshot2.png"
+            ],
+            "sources": [
+                "https://github.com/AdguardTeam/AdGuardHome",
+                "https://github.com/truenas/charts/tree/master/community/adguard-home",
+                "https://hub.docker.com/r/adguard/adguardhome"
+            ],
+            "title": "Other Nginx",
+            "train": "test",
+            "version": "1.0.0"
+        },
+        "schema": {
+            "groups": [
+                {
+                    "name": "Network Configuration",
+                    "description": "Configure Network for Nginx"
+                }
+            ],
+            "questions": [
+                {
+                    "variable": "network",
+                    "label": "",
+                    "group": "Network Configuration",
+                    "schema": {
+                        "type": "dict",
+                        "attrs": [
+                            {
+                                "variable": "web_port",
+                                "label": "WebUI Port",
+                                "description": "The port for Nginx WebUI",
+                                "schema": {
+                                    "type": "int",
+                                    "default": 8081,
+                                    "required": true
+                                }
+                            }
+                        ]
+                    }
+                }
+            ]
+        },
+        "readme": "<h1>Nginx</h1>\n<p>It is a test app</p>",
+        "changelog": null
+    }
+}

trains/test/other-nginx/item.yaml

@@ -0,0 +1,5 @@
+icon_url: https://seeklogo.com/images/N/nginx-logo-B38DADE410-seeklogo.com.png
+categories:
+  - networking
+screenshots: []
+tags: []