Securise app version and upgrade validate_app

package.json

@@ -24,5 +24,8 @@
     "gh-pages": "^3.1.0",
     "prettier": "^2.0.5",
     "yaml": "^1.10.0"
+  },
+  "devDependencies": {
+    "js-yaml": "^4.1.0"
   }
 }

public/v4/apps/ackee.yml

@@ -4,7 +4,7 @@ services:
     $$cap_appname:
         depends_on:
             - $$cap_appname-mongodb
-        image: electerious/ackee:$$cap_ackee_version
+        image: electerious/ackee:$$cap_app_version
         restart: always
         environment:
             WAIT_HOSTS: srv-captain--$$cap_appname-mongodb:27017
@@ -24,7 +24,7 @@ services:
             notExposeAsWebApp: 'true'
 caproverOneClickApp:
     variables:
-        - id: $$cap_ackee_version
+        - id: $$cap_app_version
           label: Ackee Version
           defaultValue: '3.4.2'
           description: Check out their docker page for the valid tags https://hub.docker.com/r/electerious/ackee/tags

public/v4/apps/activepieces.yml

@@ -1,19 +1,17 @@
 captainVersion: 4
 services:
     $$cap_appname:
-        image: index.docker.io/activepieces/activepieces:$$cap_activepieces_version
+        image: index.docker.io/activepieces/activepieces:$$cap_app_version
         environment:
             AP_QUEUE_MODE: MEMORY
             AP_DB_TYPE: SQLITE3
             AP_FRONTEND_URL: http://$$cap_appname.$$cap_root_domain
         volumes:
             - $$cap_appname-data:/root/.activepieces
         restart: always
-        caproverExtra:
-            containerHttpPort: '80'
 caproverOneClickApp:
     variables:
-        - id: $$cap_activepieces_version
+        - id: $$cap_app_version
           label: Activepieces Version
           defaultValue: '0.12.2'
           description: Check out their Docker page for the valid tags https://hub.docker.com/r/activepieces/activepieces/tags

public/v4/apps/actual.yml

@@ -1,14 +1,14 @@
 captainVersion: 4
 services:
     '$$cap_appname':
-        image: actualbudget/actual-server:$$cap_version
+        image: actualbudget/actual-server:$$cap_app_version
         volumes:
             - '$$cap_appname-data:/data'
         caproverExtra:
             containerHttpPort: '5006'
 caproverOneClickApp:
     variables:
-        - id: '$$cap_version'
+        - id: $$cap_app_version
           label: Actual Version
           defaultValue: '23.8.1-alpine'
           description: Paste version from release notes https://actualbudget.org/blog/tags/release or check out their Docker page for the list of all valid tags https://hub.docker.com/r/actualbudget/actual-server/tags

public/v4/apps/adguard-home.yml

@@ -2,7 +2,7 @@ captainVersion: 4
 services:
     # AdGuard
     $$cap_appname:
-        image: adguard/adguardhome:$$cap_adguard_version
+        image: adguard/adguardhome:$$cap_app_version
         restart: always
         ports:
             - 53:53
@@ -16,7 +16,7 @@ services:
             containerHttpPort: '3000'
 caproverOneClickApp:
     variables:
-        - id: $$cap_adguard_version
+        - id: $$cap_app_version
           label: AdGuard Home Version
           defaultValue: 'v0.107.29'
           description: Check out their docker page for the valid tags https://hub.docker.com/r/adguard/adguardhome/tags

public/v4/apps/adminer.yml

@@ -1,7 +1,7 @@
 captainVersion: 4
 services:
     $$cap_appname:
-        image: adminer:$$cap_adminer_version
+        image: adminer:$$cap_app_version
         restart: always
         environment:
             ADMINER_PLUGINS: $$cap_adminer_plugins
@@ -10,7 +10,7 @@ services:
             containerHttpPort: '8080'
 caproverOneClickApp:
     variables:
-        - id: $$cap_adminer_version
+        - id: $$cap_app_version
           label: Adminer Version Tag
           description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/adminer/tags/
           defaultValue: '4'

public/v4/apps/affine.yml

@@ -2,7 +2,7 @@ captainVersion: 4
 services:
     #affine:
     $$cap_appname:
-        image: ghcr.io/toeverything/affine-graphql:$$cap_affine_version
+        image: ghcr.io/toeverything/affine-graphql:$$cap_app_version
         command:
             [
                 'sh',
@@ -81,7 +81,7 @@ caproverOneClickApp:
     variables:
         - defaultValue: stable-4b9e2ab
           description: Check out their Docker page for the valid tags https://github.com/toeverything/AFFiNE/pkgs/container/affine-graphql
-          id: $$cap_affine_version
+          id: $$cap_app_version
           label: Affine version
           validRegex: /^([^\s^\/])+$/
 

public/v4/apps/airflow.yml

@@ -21,7 +21,7 @@ caproverOneClickApp:
         - id: $$cap_postgresql_version
           label: Bitnami's Posgresql Version
           defaultValue: '12.12.0'
-          description: Check the tag version on https://hub.docker.com/r/bitnami/postgresql
+          description: Check the tag version on https://hub.docker.com/r/bitnami/postgresql/tags
         - id: $$cap_postgresql_name
           label: Postresql database name
           defaultValue: airflow_db
@@ -38,24 +38,24 @@ caproverOneClickApp:
         - id: $$cap_redis_version
           label: Bitnami's redis Version
           defaultValue: '7.0.4'
-          description: Check the tag version on https://hub.docker.com/r/bitnami/redis
+          description: Check the tag version on https://hub.docker.com/r/bitnami/redis/tags
         - id: $$cap_redis_password
           label: Redis password
           defaultValue: $$cap_gen_random_hex(16)
           description: Password to redis db
         # Airflow
-        - id: $$cap_airflow_version
+        - id: $$cap_app_version
           label: Bitnami's airflow Version
           defaultValue: '2.3.3'
-          description: Check the tag version on https://hub.docker.com/r/bitnami/airflow
+          description: Check the tag version on https://hub.docker.com/r/bitnami/airflow/tags
         - id: $$cap_airflow_worker_version
           label: Bitnami's airflow worker Version
           defaultValue: '2.3.3'
-          description: Check the tag version on https://hub.docker.com/r/bitnami/airflow-worker
+          description: Check the tag version on https://hub.docker.com/r/bitnami/airflow-worker/tags
         - id: $$cap_airflow_scheduler_version
           label: Bitnami's airflow scheduler Version
           defaultValue: '2.3.3'
-          description: Check the tag version on https://hub.docker.com/r/bitnami/airflow-scheduler
+          description: Check the tag version on https://hub.docker.com/r/bitnami/airflow-scheduler/tags
         - id: $$cap_airflow_user
           label: Airflow user
           defaultValue: 'airflow_user'
@@ -138,7 +138,7 @@ services:
         depends_on:
             - $$cap_appname-db
             - $$cap_appname-redis
-        image: 'bitnami/airflow:$$cap_airflow_version'
+        image: 'bitnami/airflow:$$cap_app_version'
         user:
         environment:
             AIRFLOW_EXECUTOR: CeleryExecutor

public/v4/apps/apprise.yml

@@ -2,7 +2,7 @@ captainVersion: 4
 services:
     # Apprise
     $$cap_appname:
-        image: caronc/apprise:$$cap_apprise_version
+        image: caronc/apprise:$$cap_app_version
         restart: always
         volume:
             - $$cap_appname-data:/config
@@ -11,7 +11,7 @@ services:
 
 caproverOneClickApp:
     variables:
-        - id: $$cap_apprise_version
+        - id: $$cap_app_version
           label: Apprise Version
           defaultValue: 'v0.7.0'
           description: Check out their docker page for the valid tags https://hub.docker.com/r/caronc/apprise/tags

public/v4/apps/appsmith.yml

@@ -1,7 +1,7 @@
 captainVersion: 4
 services:
     $$cap_appname-appsmith:
-        image: index.docker.io/appsmith/appsmith-ce:$$cap_appsmith_version
+        image: index.docker.io/appsmith/appsmith-ce:$$cap_app_version
         volumes:
             - $$cap_appname-stacks-data:/appsmith-stacks
         restart: always
@@ -11,7 +11,7 @@ services:
             APPSMITH_DISABLE_INTERCOM: true
 caproverOneClickApp:
     variables:
-        - id: $$cap_appsmith_version
+        - id: $$cap_app_version
           label: Appsmith Version
           defaultValue: v1.6.5
           description: Check out their Docker page for the valid tags https://hub.docker.com/r/appsmith/appsmith-ce/tags

public/v4/apps/appwrite.yml

@@ -40,7 +40,7 @@ services:
             _APP_INFLUXDB_PORT: $$cap_APP_INFLUXDB_PORT
 
     $$cap_appname:
-        image: appwrite/appwrite:$$cap_APP_VERSION
+        image: appwrite/appwrite:$$cap_app_version
         volumes:
             - $$cap_appname-uploads:/storage/uploads
             - $$cap_appname-cache:/storage/cache
@@ -149,7 +149,7 @@ services:
         caproverExtra:
             notExposeAsWebApp: 'true'
             dockerfileLines:
-                - FROM appwrite/appwrite:$$cap_APP_VERSION
+                - FROM appwrite/appwrite:$$cap_app_version
                 - ENTRYPOINT ["realtime"]
         depends_on:
             - $$cap_appname-redis
@@ -216,7 +216,7 @@ services:
         caproverExtra:
             notExposeAsWebApp: 'true'
             dockerfileLines:
-                - FROM appwrite/appwrite:$$cap_APP_VERSION
+                - FROM appwrite/appwrite:$$cap_app_version
                 - ENTRYPOINT ["worker-databases"]
         depends_on:
             - $$cap_appname-redis
@@ -241,7 +241,7 @@ services:
         caproverExtra:
             notExposeAsWebApp: 'true'
             dockerfileLines:
-                - FROM appwrite/appwrite:$$cap_APP_VERSION
+                - FROM appwrite/appwrite:$$cap_app_version
                 - ENTRYPOINT ["worker-builds"]
         depends_on:
             - $$cap_appname-redis
@@ -301,7 +301,7 @@ services:
         caproverExtra:
             notExposeAsWebApp: 'true'
             dockerfileLines:
-                - FROM appwrite/appwrite:$$cap_APP_VERSION
+                - FROM appwrite/appwrite:$$cap_app_version
                 - ENTRYPOINT ["worker-audits"]
         depends_on:
             - $$cap_appname-redis
@@ -325,7 +325,7 @@ services:
         caproverExtra:
             notExposeAsWebApp: 'true'
             dockerfileLines:
-                - FROM appwrite/appwrite:$$cap_APP_VERSION
+                - FROM appwrite/appwrite:$$cap_app_version
                 - ENTRYPOINT ["worker-webhooks"]
         depends_on:
             - $$cap_appname-redis
@@ -346,7 +346,7 @@ services:
         caproverExtra:
             notExposeAsWebApp: 'true'
             dockerfileLines:
-                - FROM appwrite/appwrite:$$cap_APP_VERSION
+                - FROM appwrite/appwrite:$$cap_app_version
                 - ENTRYPOINT ["worker-deletes"]
         depends_on:
             - $$cap_appname-redis
@@ -400,7 +400,7 @@ services:
         caproverExtra:
             notExposeAsWebApp: 'true'
             dockerfileLines:
-                - FROM appwrite/appwrite:$$cap_APP_VERSION
+                - FROM appwrite/appwrite:$$cap_app_version
                 - ENTRYPOINT ["worker-functions"]
         depends_on:
             - $$cap_appname-redis
@@ -435,7 +435,7 @@ services:
         caproverExtra:
             notExposeAsWebApp: 'true'
             dockerfileLines:
-                - FROM appwrite/appwrite:$$cap_APP_VERSION
+                - FROM appwrite/appwrite:$$cap_app_version
                 - ENTRYPOINT ["worker-mails"]
         depends_on:
             - $$cap_appname-redis
@@ -461,7 +461,7 @@ services:
         caproverExtra:
             notExposeAsWebApp: 'true'
             dockerfileLines:
-                - FROM appwrite/appwrite:$$cap_APP_VERSION
+                - FROM appwrite/appwrite:$$cap_app_version
                 - ENTRYPOINT ["worker-messaging"]
         depends_on:
             - $$cap_appname-redis
@@ -481,7 +481,7 @@ services:
         caproverExtra:
             notExposeAsWebApp: 'true'
             dockerfileLines:
-                - FROM appwrite/appwrite:$$cap_APP_VERSION
+                - FROM appwrite/appwrite:$$cap_app_version
                 - ENTRYPOINT ["worker-certificates"]
         depends_on:
             - $$cap_appname-redis
@@ -513,7 +513,7 @@ services:
         caproverExtra:
             notExposeAsWebApp: 'true'
             dockerfileLines:
-                - FROM appwrite/appwrite:$$cap_APP_VERSION
+                - FROM appwrite/appwrite:$$cap_app_version
                 - ENTRYPOINT ["worker-migrations"]
         depends_on:
             - $$cap_appname-mariadb
@@ -549,7 +549,7 @@ services:
         caproverExtra:
             notExposeAsWebApp: 'true'
             dockerfileLines:
-                - FROM appwrite/appwrite:$$cap_APP_VERSION
+                - FROM appwrite/appwrite:$$cap_app_version
                 - ENTRYPOINT ["maintenance"]
         depends_on:
             - $$cap_appname-redis
@@ -581,7 +581,7 @@ services:
         caproverExtra:
             notExposeAsWebApp: 'true'
             dockerfileLines:
-                - FROM appwrite/appwrite:$$cap_APP_VERSION
+                - FROM appwrite/appwrite:$$cap_app_version
                 - ENTRYPOINT ["usage"]
         depends_on:
             - $$cap_appname-influxdb
@@ -610,7 +610,7 @@ services:
         caproverExtra:
             notExposeAsWebApp: 'true'
             dockerfileLines:
-                - FROM appwrite/appwrite:$$cap_APP_VERSION
+                - FROM appwrite/appwrite:$$cap_app_version
                 - ENTRYPOINT ["schedule"]
         depends_on:
             - $$cap_appname-redis
@@ -663,7 +663,7 @@ caproverOneClickApp:
             Now you can access Appwrite at http://$$cap_appname.$$cap_root_domain
     variables:
         - label: Appwrite Version Tag
-          id: $$cap_APP_VERSION
+          id: $$cap_app_version
           description: Check out their valid tags at https://hub.docker.com/r/appwrite/appwrite/tags
           defaultValue: '1.4.13'
           validRegex: "/^([^\\s^\\/])+$/"