From cc5f1198ca1812d6f810545d3debbaf2343926eb Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Tue, 9 Jul 2024 13:24:50 +0300 Subject: [PATCH 1/7] add second test app --- ix-dev/test/other-nginx/README.md | 3 ++ ix-dev/test/other-nginx/app.yaml | 36 ++++++++++++++++ ix-dev/test/other-nginx/item.yaml | 5 +++ ix-dev/test/other-nginx/questions.yaml | 18 ++++++++ .../other-nginx/templates/docker-compose.yaml | 42 +++++++++++++++++++ .../templates/library/base_v0_0_1/__init__.py | 0 .../templates/library/base_v0_0_1/test.py | 2 + .../templates/test_values/basic-values.yaml | 2 + 8 files changed, 108 insertions(+) create mode 100644 ix-dev/test/other-nginx/README.md create mode 100644 ix-dev/test/other-nginx/app.yaml create mode 100644 ix-dev/test/other-nginx/item.yaml create mode 100644 ix-dev/test/other-nginx/questions.yaml create mode 100644 ix-dev/test/other-nginx/templates/docker-compose.yaml create mode 100644 ix-dev/test/other-nginx/templates/library/base_v0_0_1/__init__.py create mode 100644 ix-dev/test/other-nginx/templates/library/base_v0_0_1/test.py create mode 100644 ix-dev/test/other-nginx/templates/test_values/basic-values.yaml diff --git a/ix-dev/test/other-nginx/README.md b/ix-dev/test/other-nginx/README.md new file mode 100644 index 0000000000..0aa2984cee --- /dev/null +++ b/ix-dev/test/other-nginx/README.md @@ -0,0 +1,3 @@ +# Nginx + +It is a test app diff --git a/ix-dev/test/other-nginx/app.yaml b/ix-dev/test/other-nginx/app.yaml new file mode 100644 index 0000000000..10f0722202 --- /dev/null +++ b/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.0 diff --git a/ix-dev/test/other-nginx/item.yaml b/ix-dev/test/other-nginx/item.yaml new file mode 100644 index 0000000000..782f9f2a10 --- /dev/null +++ b/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: [] diff --git a/ix-dev/test/other-nginx/questions.yaml b/ix-dev/test/other-nginx/questions.yaml new file mode 100644 index 0000000000..75e35a9e6a --- /dev/null +++ b/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 diff --git a/ix-dev/test/other-nginx/templates/docker-compose.yaml b/ix-dev/test/other-nginx/templates/docker-compose.yaml new file mode 100644 index 0000000000..f67e46dcf4 --- /dev/null +++ b/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: {} diff --git a/ix-dev/test/other-nginx/templates/library/base_v0_0_1/__init__.py b/ix-dev/test/other-nginx/templates/library/base_v0_0_1/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ix-dev/test/other-nginx/templates/library/base_v0_0_1/test.py b/ix-dev/test/other-nginx/templates/library/base_v0_0_1/test.py new file mode 100644 index 0000000000..ea5a314a0d --- /dev/null +++ b/ix-dev/test/other-nginx/templates/library/base_v0_0_1/test.py @@ -0,0 +1,2 @@ +def container_name(): + return "nginx" diff --git a/ix-dev/test/other-nginx/templates/test_values/basic-values.yaml b/ix-dev/test/other-nginx/templates/test_values/basic-values.yaml new file mode 100644 index 0000000000..5f4f1fe8c9 --- /dev/null +++ b/ix-dev/test/other-nginx/templates/test_values/basic-values.yaml @@ -0,0 +1,2 @@ +network: + web_port: 8081 From 2e824ddf6e24614338135263e37c8abbee33ab76 Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Tue, 9 Jul 2024 13:29:00 +0300 Subject: [PATCH 2/7] bump version --- ix-dev/test/other-nginx/app.yaml | 2 +- ix-dev/test/other-nginx/to_keep_versions.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 ix-dev/test/other-nginx/to_keep_versions.yaml diff --git a/ix-dev/test/other-nginx/app.yaml b/ix-dev/test/other-nginx/app.yaml index 10f0722202..0365e954dd 100644 --- a/ix-dev/test/other-nginx/app.yaml +++ b/ix-dev/test/other-nginx/app.yaml @@ -33,4 +33,4 @@ sources: - https://hub.docker.com/r/adguard/adguardhome title: Other Nginx train: test -version: 1.0.0 +version: 1.0.1 diff --git a/ix-dev/test/other-nginx/to_keep_versions.yaml b/ix-dev/test/other-nginx/to_keep_versions.yaml new file mode 100644 index 0000000000..f6b9a92c4a --- /dev/null +++ b/ix-dev/test/other-nginx/to_keep_versions.yaml @@ -0,0 +1 @@ +- 1.0.0 From b667ac1e3c959b4aa7f6e01a26daa3c6459bb754 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Tue, 9 Jul 2024 10:29:22 +0000 Subject: [PATCH 3/7] Publish new changes in catalog [skip ci] --- trains/test/other-nginx/1.0.0/README.md | 3 ++ trains/test/other-nginx/1.0.0/app.yaml | 36 ++++++++++++++++ trains/test/other-nginx/1.0.0/questions.yaml | 18 ++++++++ .../1.0.0/templates/docker-compose.yaml | 42 +++++++++++++++++++ .../templates/library/base_v0_0_1/__init__.py | 0 .../templates/library/base_v0_0_1/test.py | 2 + .../templates/test_values/basic-values.yaml | 2 + trains/test/other-nginx/item.yaml | 5 +++ 8 files changed, 108 insertions(+) create mode 100644 trains/test/other-nginx/1.0.0/README.md create mode 100644 trains/test/other-nginx/1.0.0/app.yaml create mode 100644 trains/test/other-nginx/1.0.0/questions.yaml create mode 100644 trains/test/other-nginx/1.0.0/templates/docker-compose.yaml create mode 100644 trains/test/other-nginx/1.0.0/templates/library/base_v0_0_1/__init__.py create mode 100644 trains/test/other-nginx/1.0.0/templates/library/base_v0_0_1/test.py create mode 100644 trains/test/other-nginx/1.0.0/templates/test_values/basic-values.yaml create mode 100644 trains/test/other-nginx/item.yaml diff --git a/trains/test/other-nginx/1.0.0/README.md b/trains/test/other-nginx/1.0.0/README.md new file mode 100644 index 0000000000..0aa2984cee --- /dev/null +++ b/trains/test/other-nginx/1.0.0/README.md @@ -0,0 +1,3 @@ +# Nginx + +It is a test app diff --git a/trains/test/other-nginx/1.0.0/app.yaml b/trains/test/other-nginx/1.0.0/app.yaml new file mode 100644 index 0000000000..10f0722202 --- /dev/null +++ b/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 diff --git a/trains/test/other-nginx/1.0.0/questions.yaml b/trains/test/other-nginx/1.0.0/questions.yaml new file mode 100644 index 0000000000..75e35a9e6a --- /dev/null +++ b/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 diff --git a/trains/test/other-nginx/1.0.0/templates/docker-compose.yaml b/trains/test/other-nginx/1.0.0/templates/docker-compose.yaml new file mode 100644 index 0000000000..f67e46dcf4 --- /dev/null +++ b/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: {} diff --git a/trains/test/other-nginx/1.0.0/templates/library/base_v0_0_1/__init__.py b/trains/test/other-nginx/1.0.0/templates/library/base_v0_0_1/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/trains/test/other-nginx/1.0.0/templates/library/base_v0_0_1/test.py b/trains/test/other-nginx/1.0.0/templates/library/base_v0_0_1/test.py new file mode 100644 index 0000000000..ea5a314a0d --- /dev/null +++ b/trains/test/other-nginx/1.0.0/templates/library/base_v0_0_1/test.py @@ -0,0 +1,2 @@ +def container_name(): + return "nginx" diff --git a/trains/test/other-nginx/1.0.0/templates/test_values/basic-values.yaml b/trains/test/other-nginx/1.0.0/templates/test_values/basic-values.yaml new file mode 100644 index 0000000000..5f4f1fe8c9 --- /dev/null +++ b/trains/test/other-nginx/1.0.0/templates/test_values/basic-values.yaml @@ -0,0 +1,2 @@ +network: + web_port: 8081 diff --git a/trains/test/other-nginx/item.yaml b/trains/test/other-nginx/item.yaml new file mode 100644 index 0000000000..782f9f2a10 --- /dev/null +++ b/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: [] From 0463d7d14118d4a9a28545639a5a98a4bcc9b40d Mon Sep 17 00:00:00 2001 From: sonicaj Date: Tue, 9 Jul 2024 10:29:24 +0000 Subject: [PATCH 4/7] Update catalog changes [skip ci] --- catalog.json | 35 ++++++++- trains/test/nginx/app_versions.json | 4 +- trains/test/other-nginx/app_versions.json | 95 +++++++++++++++++++++++ 3 files changed, 131 insertions(+), 3 deletions(-) create mode 100644 trains/test/other-nginx/app_versions.json diff --git a/catalog.json b/catalog.json index d5c4162a71..fe9297df32 100644 --- a/catalog.json +++ b/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:28:13", "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": "

Nginx

\n

It is a test app

", + "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.0", + "latest_app_version": "v1", + "latest_human_version": "v1_1.0.0", + "last_update": "2024-07-09 10:29:22", + "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" } } } \ No newline at end of file diff --git a/trains/test/nginx/app_versions.json b/trains/test/nginx/app_versions.json index cbf88ff52a..4068fdcd40 100644 --- a/trains/test/nginx/app_versions.json +++ b/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:28:13", "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:28:13", "required_features": [], "human_version": "v1_1.0.3", "version": "1.0.3", diff --git a/trains/test/other-nginx/app_versions.json b/trains/test/other-nginx/app_versions.json new file mode 100644 index 0000000000..7f6047e5c0 --- /dev/null +++ b/trains/test/other-nginx/app_versions.json @@ -0,0 +1,95 @@ +{ + "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:29:22", + "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": "

Nginx

\n

It is a test app

", + "changelog": null + } +} \ No newline at end of file From c4cecb27c8268e8ce6f84c0614ecd66ded5f6fef Mon Sep 17 00:00:00 2001 From: sonicaj Date: Tue, 9 Jul 2024 10:31:28 +0000 Subject: [PATCH 5/7] Publish new changes in catalog [skip ci] --- trains/test/other-nginx/1.0.1/README.md | 3 ++ trains/test/other-nginx/1.0.1/app.yaml | 36 ++++++++++++++++ trains/test/other-nginx/1.0.1/questions.yaml | 18 ++++++++ .../1.0.1/templates/docker-compose.yaml | 42 +++++++++++++++++++ .../templates/library/base_v0_0_1/__init__.py | 0 .../templates/library/base_v0_0_1/test.py | 2 + .../templates/test_values/basic-values.yaml | 2 + 7 files changed, 103 insertions(+) create mode 100644 trains/test/other-nginx/1.0.1/README.md create mode 100644 trains/test/other-nginx/1.0.1/app.yaml create mode 100644 trains/test/other-nginx/1.0.1/questions.yaml create mode 100644 trains/test/other-nginx/1.0.1/templates/docker-compose.yaml create mode 100644 trains/test/other-nginx/1.0.1/templates/library/base_v0_0_1/__init__.py create mode 100644 trains/test/other-nginx/1.0.1/templates/library/base_v0_0_1/test.py create mode 100644 trains/test/other-nginx/1.0.1/templates/test_values/basic-values.yaml diff --git a/trains/test/other-nginx/1.0.1/README.md b/trains/test/other-nginx/1.0.1/README.md new file mode 100644 index 0000000000..0aa2984cee --- /dev/null +++ b/trains/test/other-nginx/1.0.1/README.md @@ -0,0 +1,3 @@ +# Nginx + +It is a test app diff --git a/trains/test/other-nginx/1.0.1/app.yaml b/trains/test/other-nginx/1.0.1/app.yaml new file mode 100644 index 0000000000..0365e954dd --- /dev/null +++ b/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 diff --git a/trains/test/other-nginx/1.0.1/questions.yaml b/trains/test/other-nginx/1.0.1/questions.yaml new file mode 100644 index 0000000000..75e35a9e6a --- /dev/null +++ b/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 diff --git a/trains/test/other-nginx/1.0.1/templates/docker-compose.yaml b/trains/test/other-nginx/1.0.1/templates/docker-compose.yaml new file mode 100644 index 0000000000..f67e46dcf4 --- /dev/null +++ b/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: {} diff --git a/trains/test/other-nginx/1.0.1/templates/library/base_v0_0_1/__init__.py b/trains/test/other-nginx/1.0.1/templates/library/base_v0_0_1/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/trains/test/other-nginx/1.0.1/templates/library/base_v0_0_1/test.py b/trains/test/other-nginx/1.0.1/templates/library/base_v0_0_1/test.py new file mode 100644 index 0000000000..ea5a314a0d --- /dev/null +++ b/trains/test/other-nginx/1.0.1/templates/library/base_v0_0_1/test.py @@ -0,0 +1,2 @@ +def container_name(): + return "nginx" diff --git a/trains/test/other-nginx/1.0.1/templates/test_values/basic-values.yaml b/trains/test/other-nginx/1.0.1/templates/test_values/basic-values.yaml new file mode 100644 index 0000000000..5f4f1fe8c9 --- /dev/null +++ b/trains/test/other-nginx/1.0.1/templates/test_values/basic-values.yaml @@ -0,0 +1,2 @@ +network: + web_port: 8081 From d75e922ba14935029912badd3f64356a05bf2820 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Tue, 9 Jul 2024 10:31:30 +0000 Subject: [PATCH 6/7] Update catalog changes [skip ci] --- catalog.json | 8 +- trains/test/nginx/app_versions.json | 4 +- trains/test/other-nginx/app_versions.json | 95 ++++++++++++++++++++++- 3 files changed, 100 insertions(+), 7 deletions(-) diff --git a/catalog.json b/catalog.json index fe9297df32..e5fede92ba 100644 --- a/catalog.json +++ b/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-09 10:28:13", + "last_update": "2024-07-09 10:30:19", "name": "nginx", "recommended": false, "title": "Nginx", @@ -44,10 +44,10 @@ "healthy_error": null, "home": "https://github.com/AdguardTeam/AdGuardHome", "location": "/__w/apps/apps/trains/test/other-nginx", - "latest_version": "1.0.0", + "latest_version": "1.0.1", "latest_app_version": "v1", - "latest_human_version": "v1_1.0.0", - "last_update": "2024-07-09 10:29:22", + "latest_human_version": "v1_1.0.1", + "last_update": "2024-07-09 10:31:28", "name": "other-nginx", "recommended": false, "title": "Other-nginx", diff --git a/trains/test/nginx/app_versions.json b/trains/test/nginx/app_versions.json index 4068fdcd40..f545adbda6 100644 --- a/trains/test/nginx/app_versions.json +++ b/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-09 10:28:13", + "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-09 10:28:13", + "last_update": "2024-07-09 10:30:19", "required_features": [], "human_version": "v1_1.0.3", "version": "1.0.3", diff --git a/trains/test/other-nginx/app_versions.json b/trains/test/other-nginx/app_versions.json index 7f6047e5c0..12c5ee593c 100644 --- a/trains/test/other-nginx/app_versions.json +++ b/trains/test/other-nginx/app_versions.json @@ -1,10 +1,103 @@ { + "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": "

Nginx

\n

It is a test app

", + "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:29:22", + "last_update": "2024-07-09 10:30:19", "required_features": [], "human_version": "v1_1.0.0", "version": "1.0.0", From 7266872bfbc185fa200cde41d9e4a3fe4b0f102d Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Tue, 9 Jul 2024 16:09:46 +0500 Subject: [PATCH 7/7] Remove temp abc file --- abc | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 abc diff --git a/abc b/abc deleted file mode 100644 index e69de29bb2..0000000000