From d194e150706ada2c62cfe42830520d9f1b94d48e Mon Sep 17 00:00:00 2001 From: Simon Belbeoch Date: Mon, 11 Nov 2024 15:39:11 +0100 Subject: [PATCH 1/6] standardize the cap_app_version --- package-lock.json | 23 ++++++++++++++ package.json | 3 ++ public/v4/apps/ackee.yml | 4 +-- public/v4/apps/activepieces.yml | 6 ++-- public/v4/apps/actual.yml | 4 +-- public/v4/apps/adguard-home.yml | 4 +-- public/v4/apps/adminer.yml | 4 +-- public/v4/apps/affine.yml | 4 +-- public/v4/apps/airflow.yml | 4 +-- public/v4/apps/apprise.yml | 4 +-- public/v4/apps/appsmith.yml | 4 +-- public/v4/apps/appwrite.yml | 32 ++++++++++---------- public/v4/apps/arangodb.yml | 4 +-- public/v4/apps/archivebox.yml | 4 +-- public/v4/apps/audiobookshelf.yml | 4 +-- public/v4/apps/azuracast.yml | 6 ++-- public/v4/apps/baikal.yml | 4 +-- public/v4/apps/baserow.yml | 4 +-- public/v4/apps/bazarr.yml | 4 +-- public/v4/apps/bitwardenrs.yml | 4 +-- public/v4/apps/bookstack.yml | 4 +-- public/v4/apps/botpress.yml | 6 ++-- public/v4/apps/boxy-hq-only.yml | 4 +-- public/v4/apps/browserless.yml | 4 +-- public/v4/apps/btcpayserver.yml | 4 +-- public/v4/apps/budibase.yml | 4 +-- public/v4/apps/cachet.yml | 4 +-- public/v4/apps/calcom.yml | 4 +-- public/v4/apps/call-only.yml | 4 +-- public/v4/apps/chadburn.yml | 4 +-- public/v4/apps/changedetection.yml | 4 +-- public/v4/apps/chaskiq.yml | 6 ++-- public/v4/apps/chatwoot-botpress-bridge.yml | 4 +-- public/v4/apps/chatwoot.yml | 6 ++-- public/v4/apps/checkmk.yml | 4 +-- public/v4/apps/chevereto.yml | 4 +-- public/v4/apps/claper.yml | 4 +-- public/v4/apps/cloudflare-tunnel.yml | 4 +-- public/v4/apps/cockpit.yml | 4 +-- public/v4/apps/collabora-online.yml | 4 +-- public/v4/apps/commento.yml | 4 +-- public/v4/apps/coral.yml | 4 +-- public/v4/apps/corteza.yml | 6 ++-- public/v4/apps/couchbase.yml | 4 +-- public/v4/apps/couchdb-clouseau.yml | 4 +-- public/v4/apps/couchdb.yml | 4 +-- public/v4/apps/countly.yml | 4 +-- public/v4/apps/crater.yml | 4 +-- public/v4/apps/cronicle.yml | 4 +-- public/v4/apps/cyberchef.yml | 4 +-- public/v4/apps/databag.yml | 4 +-- public/v4/apps/davos.yml | 4 +-- public/v4/apps/deluge.yml | 4 +-- public/v4/apps/discourse.yml | 6 ++-- public/v4/apps/docmost.yml | 4 +-- public/v4/apps/docuseal.yml | 4 +-- public/v4/apps/dokuwiki.yml | 4 +-- public/v4/apps/dolibarr.yml | 4 +-- public/v4/apps/dozzle.yml | 4 +-- public/v4/apps/dragonflydb.yml | 4 +-- public/v4/apps/drone-gitea.yml | 4 +-- public/v4/apps/droppy.yml | 4 +-- public/v4/apps/duplicati.yml | 4 +-- public/v4/apps/eclipse-mosquitto.yml | 4 +-- public/v4/apps/elasticsearch.yml | 4 +-- public/v4/apps/elkarbackup.yml | 4 +-- public/v4/apps/emailengine.yml | 4 +-- public/v4/apps/etesync.yml | 4 +-- public/v4/apps/etherpad.yml | 4 +-- public/v4/apps/excalidraw.yml | 4 +-- public/v4/apps/fider.yml | 4 +-- public/v4/apps/filebrowser.yml | 4 +-- public/v4/apps/filerun.yml | 4 +-- public/v4/apps/filestash.yml | 4 +-- public/v4/apps/filezilla.yml | 4 +-- public/v4/apps/firefly-iii.yml | 4 +-- public/v4/apps/fireflyiii-data-importer.yml | 4 +-- public/v4/apps/firefox.yml | 4 +-- public/v4/apps/flagsmith.yml | 4 +-- public/v4/apps/flaresolverr.yml | 4 +-- public/v4/apps/focalboard.yml | 4 +-- public/v4/apps/forge_minecraft.yml | 4 +-- public/v4/apps/formance-ledger.yml | 6 ++-- public/v4/apps/formbricks.yml | 4 +-- public/v4/apps/formio.yml | 4 +-- public/v4/apps/foundryvtt.yml | 4 +-- public/v4/apps/freshrss.yml | 4 +-- public/v4/apps/fusionauth.yml | 4 +-- public/v4/apps/ghost-only.yml | 4 +-- public/v4/apps/ghost.yml | 4 +-- public/v4/apps/ghostfolio.yml | 4 +-- public/v4/apps/gitea.yml | 4 +-- public/v4/apps/gitlab-ce.yml | 4 +-- public/v4/apps/gitlab-runner.yml | 4 +-- public/v4/apps/glitchtip.yml | 6 ++-- public/v4/apps/gogostv2.yml | 4 +-- public/v4/apps/gogostv3.yml | 4 +-- public/v4/apps/gotenberg.yml | 4 +-- public/v4/apps/gotify.yml | 4 +-- public/v4/apps/grafana.yml | 4 +-- public/v4/apps/grocy.yml | 4 +-- public/v4/apps/guacamole.yml | 4 +-- public/v4/apps/hasura-only.yml | 4 +-- public/v4/apps/hasura.yml | 4 +-- public/v4/apps/healthchecks.yml | 4 +-- public/v4/apps/hedgedoc.yml | 4 +-- public/v4/apps/heimdall.yml | 4 +-- public/v4/apps/homarr.yml | 4 +-- public/v4/apps/homepage.yml | 4 +-- public/v4/apps/humhub.yml | 4 +-- public/v4/apps/imagor-local.yml | 4 +-- public/v4/apps/imagor-s3.yml | 4 +-- public/v4/apps/imgproxy.yml | 4 +-- public/v4/apps/immich.yml | 6 ++-- public/v4/apps/influxdb.yml | 4 +-- public/v4/apps/influxdb2.yml | 4 +-- public/v4/apps/invidious.yml | 4 +-- public/v4/apps/invoiceninja.yml | 6 ++-- public/v4/apps/iredmail.yml | 4 +-- public/v4/apps/jellyfin.yml | 4 +-- public/v4/apps/jenkins.yml | 4 +-- public/v4/apps/jitsi.yml | 10 +++--- public/v4/apps/joomla.yml | 4 +-- public/v4/apps/joplin.yml | 4 +-- public/v4/apps/jsreport.yml | 4 +-- public/v4/apps/kanboard-sqlite.yml | 4 +-- public/v4/apps/keila.yml | 4 +-- public/v4/apps/keycloak.yml | 6 ++-- public/v4/apps/keydb.yml | 4 +-- public/v4/apps/kibana.yml | 4 +-- public/v4/apps/kimai2.yml | 4 +-- public/v4/apps/kutt.yml | 4 +-- public/v4/apps/lago.yml | 11 ++++--- public/v4/apps/languagetool.yml | 4 +-- public/v4/apps/leantime.yml | 4 +-- public/v4/apps/libreddit.yml | 4 +-- public/v4/apps/limesurvey.yml | 4 +-- public/v4/apps/linkding.yml | 4 +-- public/v4/apps/listmonk.yml | 4 +-- public/v4/apps/litestream.yml | 4 +-- public/v4/apps/logzio-collector.yml | 4 +-- public/v4/apps/lychee.yml | 4 +-- public/v4/apps/maildev.yml | 4 +-- public/v4/apps/mailtrain.yml | 4 +-- public/v4/apps/mariadb.yml | 4 +-- public/v4/apps/mastodon.yml | 8 ++--- public/v4/apps/matomo.yml | 4 +-- public/v4/apps/matrix-conduit.yml | 4 +-- public/v4/apps/matrix-synapse.yml | 4 +-- public/v4/apps/mattermost-ee.yml | 4 +-- public/v4/apps/mautic-only.yml | 4 +-- public/v4/apps/mautic.yml | 4 +-- public/v4/apps/memos.yml | 4 +-- public/v4/apps/mercure.yml | 4 +-- public/v4/apps/metabase.yml | 4 +-- public/v4/apps/minecraft-bedrock.yml | 4 +-- public/v4/apps/miniflux.yml | 4 +-- public/v4/apps/minio.yml | 4 +-- public/v4/apps/mixpost.yml | 4 +-- public/v4/apps/mongo-express.yml | 4 +-- public/v4/apps/mongodb.yml | 4 +-- public/v4/apps/monica.yml | 4 +-- public/v4/apps/moodle.yml | 4 +-- public/v4/apps/mssql.yml | 4 +-- public/v4/apps/mumble.yml | 4 +-- public/v4/apps/mysql-backup.yml | 4 +-- public/v4/apps/mysql.yml | 4 +-- public/v4/apps/n8n-io-sqlite.yml | 4 +-- public/v4/apps/n8n-io.yml | 4 +-- public/v4/apps/neo4j.yml | 4 +-- public/v4/apps/netbox.yml | 4 +-- public/v4/apps/nextcloud.yml | 6 ++-- public/v4/apps/nexus3.yml | 4 +-- public/v4/apps/nginx-reverse-proxy.yml | 4 +-- public/v4/apps/nightscout.yml | 4 +-- public/v4/apps/nocodb.yml | 4 +-- public/v4/apps/node-exporter.yml | 4 +-- public/v4/apps/node-red.yml | 4 +-- public/v4/apps/novu.yml | 12 ++++---- public/v4/apps/ntfy.yml | 4 +-- public/v4/apps/odoo.yml | 4 +-- public/v4/apps/offen-docker-backup.yml | 4 +-- public/v4/apps/offen-local-docker-backup.yml | 4 +-- public/v4/apps/ombi.yml | 4 +-- public/v4/apps/onlyoffice-documentserver.yml | 2 +- public/v4/apps/openspeedtest.yml | 4 +-- public/v4/apps/openvpn-as.yml | 4 +-- public/v4/apps/openvscode-server.yml | 4 +-- public/v4/apps/orangehrm.yml | 4 +-- public/v4/apps/organizr.yml | 4 +-- public/v4/apps/outline.yml | 4 +-- public/v4/apps/overseerr.yml | 4 +-- public/v4/apps/owncast.yml | 4 +-- public/v4/apps/papermerge.yml | 4 +-- public/v4/apps/parse.yml | 4 +-- public/v4/apps/passbolt.yml | 4 +-- public/v4/apps/peertube.yml | 4 +-- public/v4/apps/penpot.yml | 8 ++--- public/v4/apps/percona.yml | 6 ++-- public/v4/apps/pgadmin4.yml | 4 +-- public/v4/apps/pgweb.yml | 4 +-- public/v4/apps/photoprism.yml | 4 +-- public/v4/apps/photoview.yml | 4 +-- public/v4/apps/phpldapadmin.yml | 4 +-- public/v4/apps/phpmyadmin.yml | 4 +-- public/v4/apps/pigallery2.yml | 4 +-- public/v4/apps/planka.yml | 4 +-- public/v4/apps/plausible.yml | 4 +-- public/v4/apps/plex-arm.yml | 4 +-- public/v4/apps/plex.yml | 4 +-- public/v4/apps/pocketbase.yml | 4 +-- public/v4/apps/portainer.yml | 4 +-- public/v4/apps/poste-io.yml | 4 +-- public/v4/apps/postgres.yml | 4 +-- public/v4/apps/posthog.yml | 10 +++--- public/v4/apps/prisma.yml | 4 +-- public/v4/apps/privatebin.yml | 4 +-- public/v4/apps/projectsend.yml | 4 +-- public/v4/apps/prometheus.yml | 4 +-- public/v4/apps/prowlarr.yml | 4 +-- public/v4/apps/pydio.yml | 4 +-- public/v4/apps/pyload.yml | 4 +-- public/v4/apps/qbittorrent.yml | 4 +-- public/v4/apps/rabbitmq.yml | 4 +-- public/v4/apps/radarr.yml | 4 +-- public/v4/apps/radicale.yml | 4 +-- public/v4/apps/rainloop.yml | 4 +-- public/v4/apps/rallly.yml | 4 +-- public/v4/apps/raneto.yml | 4 +-- public/v4/apps/readarr.yml | 4 +-- public/v4/apps/redash.yml | 10 +++--- public/v4/apps/redis.yml | 5 +-- public/v4/apps/redmine-mysql.yml | 4 +-- public/v4/apps/redmine.yml | 4 +-- public/v4/apps/remark42.yml | 4 +-- public/v4/apps/request-baskets.yml | 4 +-- public/v4/apps/resilio-sync.yml | 4 +-- public/v4/apps/rstudio.yml | 4 +-- public/v4/apps/saleor.yml | 6 ++-- public/v4/apps/seafile.yml | 4 +-- public/v4/apps/seatable.yml | 4 +-- public/v4/apps/sentry.yml | 12 ++++---- public/v4/apps/serpbear.yml | 4 +-- public/v4/apps/shiori.yml | 4 +-- public/v4/apps/shopware.yml | 4 +-- public/v4/apps/sinusbot.yml | 4 +-- public/v4/apps/smokeping.yml | 4 +-- public/v4/apps/sonarqube.yml | 4 +-- public/v4/apps/sonarr.yml | 4 +-- public/v4/apps/sourcegraph.yml | 4 +-- public/v4/apps/spigot.yml | 4 +-- public/v4/apps/squidex.yml | 4 +-- public/v4/apps/statping.yml | 4 +-- public/v4/apps/stirling-pdf.yml | 4 +-- public/v4/apps/strapi-postgres.yml | 4 +-- public/v4/apps/strapi.yml | 4 +-- public/v4/apps/supertokens.yml | 4 +-- public/v4/apps/surrealdb.yml | 4 +-- public/v4/apps/syncthing.yml | 4 +-- public/v4/apps/tautulli.yml | 4 +-- public/v4/apps/teamspeak.yml | 4 +-- public/v4/apps/telegraf.yml | 4 +-- public/v4/apps/teslamate.yml | 4 +-- public/v4/apps/the-lounge.yml | 4 +-- public/v4/apps/thingsboard-postgres.yml | 4 +-- public/v4/apps/thumbor.yml | 4 +-- public/v4/apps/traggo.yml | 4 +-- public/v4/apps/transfer-sh.yml | 4 +-- public/v4/apps/transmission.yml | 4 +-- public/v4/apps/trudesk.yml | 4 +-- public/v4/apps/tubesync.yml | 4 +-- public/v4/apps/typebot.yml | 6 ++-- public/v4/apps/ubooquity.yml | 4 +-- public/v4/apps/umami-mysql.yml | 4 +-- public/v4/apps/umami-only.yml | 4 +-- public/v4/apps/umami-postgresql.yml | 4 +-- public/v4/apps/uptime-kuma.yml | 4 +-- public/v4/apps/valkey.yml | 4 +-- public/v4/apps/verdaccio.yml | 4 +-- public/v4/apps/vscode-coder.yml | 5 +-- public/v4/apps/vsts.yml | 4 +-- public/v4/apps/vvveb-only.yml | 4 +-- public/v4/apps/vvveb.yml | 4 +-- public/v4/apps/wakapi.yml | 4 +-- public/v4/apps/wallabag.yml | 4 +-- public/v4/apps/weblate.yml | 4 +-- public/v4/apps/webtop.yml | 4 +-- public/v4/apps/wiki-js.yml | 4 +-- public/v4/apps/woodpecker.yml | 6 ++-- public/v4/apps/wordpress-only.yml | 4 +-- public/v4/apps/wordpress.yml | 4 +-- public/v4/apps/yagpdb.yml | 4 +-- public/v4/apps/yourls.yml | 4 +-- public/v4/apps/zammad.yml | 18 +++++------ scripts/validate_version.js | 21 +++++++++++++ 295 files changed, 694 insertions(+), 646 deletions(-) create mode 100644 scripts/validate_version.js diff --git a/package-lock.json b/package-lock.json index a2f343b03..fc809680f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,8 +13,18 @@ "gh-pages": "^3.1.0", "prettier": "^2.0.5", "yaml": "^1.10.0" + }, + "devDependencies": { + "js-yaml": "^4.1.0" } }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, "node_modules/array-union": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", @@ -294,6 +304,19 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "license": "ISC" }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", diff --git a/package.json b/package.json index f0ab70aa1..64faaed85 100644 --- a/package.json +++ b/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" } } diff --git a/public/v4/apps/ackee.yml b/public/v4/apps/ackee.yml index 5a26df4ec..6c33c07a7 100644 --- a/public/v4/apps/ackee.yml +++ b/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 diff --git a/public/v4/apps/activepieces.yml b/public/v4/apps/activepieces.yml index 82b96b656..f6209e4a4 100644 --- a/public/v4/apps/activepieces.yml +++ b/public/v4/apps/activepieces.yml @@ -1,7 +1,7 @@ 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 @@ -9,11 +9,9 @@ services: 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 diff --git a/public/v4/apps/actual.yml b/public/v4/apps/actual.yml index 98dc37eb3..65cb64bc2 100644 --- a/public/v4/apps/actual.yml +++ b/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 diff --git a/public/v4/apps/adguard-home.yml b/public/v4/apps/adguard-home.yml index bd8086304..bcc22f34c 100644 --- a/public/v4/apps/adguard-home.yml +++ b/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 diff --git a/public/v4/apps/adminer.yml b/public/v4/apps/adminer.yml index 660e74598..d6164b997 100644 --- a/public/v4/apps/adminer.yml +++ b/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' diff --git a/public/v4/apps/affine.yml b/public/v4/apps/affine.yml index bb7c2c1bf..ebb54c3f9 100644 --- a/public/v4/apps/affine.yml +++ b/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^\/])+$/ diff --git a/public/v4/apps/airflow.yml b/public/v4/apps/airflow.yml index 75fc43b59..024c23db0 100644 --- a/public/v4/apps/airflow.yml +++ b/public/v4/apps/airflow.yml @@ -44,7 +44,7 @@ caproverOneClickApp: 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 @@ -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 diff --git a/public/v4/apps/apprise.yml b/public/v4/apps/apprise.yml index 7473231d3..97207227e 100644 --- a/public/v4/apps/apprise.yml +++ b/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 diff --git a/public/v4/apps/appsmith.yml b/public/v4/apps/appsmith.yml index 7f15673b7..f89b16cfe 100644 --- a/public/v4/apps/appsmith.yml +++ b/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 diff --git a/public/v4/apps/appwrite.yml b/public/v4/apps/appwrite.yml index 564426abd..b4cb41a83 100644 --- a/public/v4/apps/appwrite.yml +++ b/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^\\/])+$/" diff --git a/public/v4/apps/arangodb.yml b/public/v4/apps/arangodb.yml index 59d487208..5cab487b2 100644 --- a/public/v4/apps/arangodb.yml +++ b/public/v4/apps/arangodb.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname-db: - image: arangodb:$$cap_arango_version + image: arangodb:$$cap_app_version volumes: - $$cap_appname-db-data:/var/lib/arangodb3 - $$cap_appname-db-apps-data:/var/lib/arangodb3-apps @@ -12,7 +12,7 @@ services: containerHttpPort: '8529' caproverOneClickApp: variables: - - id: $$cap_arango_version + - id: $$cap_app_version label: ArangoDB Version defaultValue: '3.4' description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/arangodb/tags/ diff --git a/public/v4/apps/archivebox.yml b/public/v4/apps/archivebox.yml index e144eb454..e77527ff7 100644 --- a/public/v4/apps/archivebox.yml +++ b/public/v4/apps/archivebox.yml @@ -10,12 +10,12 @@ services: restart: always caproverExtra: dockerfileLines: - - FROM archivebox/archivebox:$$cap_archivebox_version + - FROM archivebox/archivebox:$$cap_app_version - CMD ["server", "--quick-init", "0.0.0.0:8000"] containerHttpPort: '8000' caproverOneClickApp: variables: - - id: $$cap_archivebox_version + - id: $$cap_app_version label: archivebox Version defaultValue: sha-5940dd6 description: Check out their Docker page for the valid tags https://hub.docker.com/r/archivebox/archivebox/tags diff --git a/public/v4/apps/audiobookshelf.yml b/public/v4/apps/audiobookshelf.yml index b3ff713ac..b816a6ff5 100644 --- a/public/v4/apps/audiobookshelf.yml +++ b/public/v4/apps/audiobookshelf.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: ghcr.io/advplyr/audiobookshelf:$$cap_version + image: ghcr.io/advplyr/audiobookshelf:$$cap_app_version volumes: - $$cap_appname-config:/config - $$cap_path_to_audiobooks:/audiobooks @@ -11,7 +11,7 @@ services: caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: Audiobookshelf Version defaultValue: '2.2.14' description: Check out their Docker page for the valid tags https://hub.docker.com/r/advplyr/audiobookshelf/tags diff --git a/public/v4/apps/azuracast.yml b/public/v4/apps/azuracast.yml index 74cc025cc..c1d743d82 100644 --- a/public/v4/apps/azuracast.yml +++ b/public/v4/apps/azuracast.yml @@ -4,7 +4,7 @@ services: caproverExtra: containerHttpPort: '80' websocketSupport: 'true' - image: ghcr.io/azuracast/azuracast:$$cap_AZURACAST_VERSION + image: ghcr.io/azuracast/azuracast:$$cap_app_version hostname: $$cap_appname.$$cap_root_domain restart: unless-stopped ports: @@ -157,7 +157,7 @@ services: - '8495:8495' - '8496:8496' environment: - AZURACAST_VERSION: $$cap_AZURACAST_VERSION + AZURACAST_VERSION: $$cap_app_version AZURACAST_SFTP_PORT: $$cap_AZURACAST_SFTP_PORT MYSQL_ROOT_PASSWORD: $$cap_AZURACAST_DB_PASSWORD PUID: $$cap_AZURACAST_PUID @@ -188,7 +188,7 @@ caproverOneClickApp: description: Self-hosted web radio management suite documentation: https://www.azuracast.com/docs variables: - - id: $$cap_AZURACAST_VERSION + - id: $$cap_app_version label: Version description: Valid values include "latest" for Rolling Release, "stable" for Stable release channel, and any specific version. defaultValue: 'latest' diff --git a/public/v4/apps/baikal.yml b/public/v4/apps/baikal.yml index 2c3a6d84a..ceb292781 100644 --- a/public/v4/apps/baikal.yml +++ b/public/v4/apps/baikal.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: '$$cap_appname': - image: ckulka/baikal:$$cap_version + image: ckulka/baikal:$$cap_app_version volumes: - '$$cap_appname-data:/var/www/baikal/Specific' - '$$cap_appname-config:/var/www/baikal/config' @@ -9,7 +9,7 @@ services: containerHttpPort: '80' caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: Baikal Version defaultValue: '0.9.2-nginx' description: Check out their Docker page for the valid tags https://hub.docker.com/r/ckulka/baikal/tags diff --git a/public/v4/apps/baserow.yml b/public/v4/apps/baserow.yml index 74827d628..dd1a6b673 100644 --- a/public/v4/apps/baserow.yml +++ b/public/v4/apps/baserow.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: baserow/baserow:$$cap_BASEROW_VERSION + image: baserow/baserow:$$cap_app_version environment: BASEROW_PUBLIC_URL: http://$$cap_appname.$$cap_root_domain FROM_EMAIL: $$cap_BASEROW_FROM_EMAIL @@ -35,7 +35,7 @@ caproverOneClickApp: description: Open Source No-Code Database And Airtable Alternative documentation: https://baserow.io/docs variables: - - id: $$cap_BASEROW_VERSION + - id: $$cap_app_version label: Version description: >- Check out their valid tags at https://hub.docker.com/r/baserow/baserow/tags diff --git a/public/v4/apps/bazarr.yml b/public/v4/apps/bazarr.yml index 23c33241c..5d1495d2c 100644 --- a/public/v4/apps/bazarr.yml +++ b/public/v4/apps/bazarr.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: linuxserver/bazarr:$$cap_bazarr_version + image: linuxserver/bazarr:$$cap_app_version environment: TZ: $$cap_tz PUID: $$cap_puid @@ -15,7 +15,7 @@ services: containerHttpPort: 6767 caproverOneClickApp: variables: - - id: $$cap_bazarr_version + - id: $$cap_app_version label: Bazarr Version defaultValue: '1.0.1' description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/bazarr/tags diff --git a/public/v4/apps/bitwardenrs.yml b/public/v4/apps/bitwardenrs.yml index d133374c0..df3d5f54a 100644 --- a/public/v4/apps/bitwardenrs.yml +++ b/public/v4/apps/bitwardenrs.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: vaultwarden/server:$$cap_bitwardenrs_version + image: vaultwarden/server:$$cap_app_version environment: DOMAIN: https://$$cap_appname.$$cap_root_domain WEBSOCKET_ENABLED: true @@ -14,7 +14,7 @@ services: restart: unless-stopped caproverOneClickApp: variables: - - id: $$cap_bitwardenrs_version + - id: $$cap_app_version label: vaultwarden Version defaultValue: 1.30.1 description: Check out their Docker page for the valid tags https://hub.docker.com/r/vaultwarden/server/tags diff --git a/public/v4/apps/bookstack.yml b/public/v4/apps/bookstack.yml index 206b080b0..305d05a10 100644 --- a/public/v4/apps/bookstack.yml +++ b/public/v4/apps/bookstack.yml @@ -24,7 +24,7 @@ services: DB_USER: bookstack DB_PASS: $$cap_DB_PASS DB_DATABASE: bookstackapp - image: lscr.io/linuxserver/bookstack:$$cap_bookstack_version + image: lscr.io/linuxserver/bookstack:$$cap_app_version restart: always volumes: - $$cap_appname-config:/config @@ -38,7 +38,7 @@ caproverOneClickApp: description: This is the timezone for the application, find yours at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones defaultValue: Europe/London id: $$cap_timezone - - id: $$cap_bookstack_version + - id: $$cap_app_version label: Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/bookstack/tags defaultValue: 'v23.10.4-ls118' diff --git a/public/v4/apps/botpress.yml b/public/v4/apps/botpress.yml index eafd043c6..ddbbbc6f5 100644 --- a/public/v4/apps/botpress.yml +++ b/public/v4/apps/botpress.yml @@ -4,7 +4,7 @@ services: caproverExtra: containerHttpPort: 3000 dockerfileLines: - - FROM botpress/server:$$cap_BOTPRESS_VERSION + - FROM botpress/server:$$cap_app_version - CMD /botpress/bp environment: DATABASE_URL: postgres://$$cap_POSTGRES_USER:$$cap_POSTGRES_PASSWORD@srv-captain--$$cap_appname-db/$$cap_POSTGRES_DB @@ -29,7 +29,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' dockerfileLines: - - FROM botpress/server:$$cap_BOTPRESS_VERSION + - FROM botpress/server:$$cap_app_version - USER root - RUN mkdir /botpress/lang && chown -R botpress:botpress /botpress/lang - USER botpress @@ -80,7 +80,7 @@ caproverOneClickApp: Have fun with Botpress! variables: - - id: $$cap_BOTPRESS_VERSION + - id: $$cap_app_version label: Version | Botpress description: Version of Botpress. Check out their Docker page for the valid tags https://hub.docker.com/r/botpress/server/tags defaultValue: v12_30_2 diff --git a/public/v4/apps/boxy-hq-only.yml b/public/v4/apps/boxy-hq-only.yml index 6a611e440..b8019d8a3 100644 --- a/public/v4/apps/boxy-hq-only.yml +++ b/public/v4/apps/boxy-hq-only.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: boxyhq/jackson:$$cap_boxyhq_jackson_version + image: boxyhq/jackson:$$cap_app_version restart: always caproverExtra: containerHttpPort: '5225' @@ -222,7 +222,7 @@ caproverOneClickApp: label: Next Telemetry disabled defaultValue: 1 - - id: $$cap_boxyhq_jackson_version + - id: $$cap_app_version label: BoxyHQ Jackson Version defaultValue: 1.13.0 description: Check out their Docker page for the valid tags https://hub.docker.com/r/boxyhq/jackson/tags/ diff --git a/public/v4/apps/browserless.yml b/public/v4/apps/browserless.yml index 842c4ee53..0e1c83f54 100644 --- a/public/v4/apps/browserless.yml +++ b/public/v4/apps/browserless.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: $$cap_appname: documentation: https://docs.browserless.io/docs/docker-quickstart.html - image: browserless/chrome:$$cap_browserless_version + image: browserless/chrome:$$cap_app_version restart: always volumes: - $$cap_appname-workspace:/downloads @@ -37,7 +37,7 @@ services: containerHttpPort: '3000' caproverOneClickApp: variables: - - id: $$cap_browserless_version + - id: $$cap_app_version label: Browserless Version defaultValue: 1-chrome-stable description: Browserless Image Version diff --git a/public/v4/apps/btcpayserver.yml b/public/v4/apps/btcpayserver.yml index 648af3596..063f5697d 100644 --- a/public/v4/apps/btcpayserver.yml +++ b/public/v4/apps/btcpayserver.yml @@ -3,7 +3,7 @@ services: $$cap_appname: caproverExtra: containerHttpPort: $$cap_BTCPAY_PORT - image: btcpayserver/btcpayserver:$$cap_BTCPAYSERVER_VERSION + image: btcpayserver/btcpayserver:$$cap_app_version hostname: $$cap_appname.$$cap_root_domain environment: BTCPAY_HOST: $$cap_appname.$$cap_root_domain @@ -204,7 +204,7 @@ caproverOneClickApp: description: Address to bind the services. defaultValue: '0.0.0.0' validRegex: /.{1,}/ - - id: $$cap_BTCPAYSERVER_VERSION + - id: $$cap_app_version label: General | BTCPay Server Version description: Check out their valid tags at https://hub.docker.com/r/btcpayserver/btcpayserver/tags defaultValue: '1.6.11' diff --git a/public/v4/apps/budibase.yml b/public/v4/apps/budibase.yml index 9d5296eca..087d4c11a 100644 --- a/public/v4/apps/budibase.yml +++ b/public/v4/apps/budibase.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: budibase/budibase:$$cap_BUDIBASE_VERSION + image: budibase/budibase:$$cap_app_version environment: ENABLE_ANALYTICS: $$cap_BUDIBASE_ENABLE_ANALYTICS JWT_SECRET: $$cap_BUDIBASE_JWT_SECRET @@ -28,7 +28,7 @@ caproverOneClickApp: You can access it at `http://$$cap_appname.$$cap_root_domain`. Administrator user is `$$cap_BUDIBASE_ADMIN_USER_EMAIL` with password `$$cap_BUDIBASE_ADMIN_USER_PASSWORD`. variables: - - id: $$cap_BUDIBASE_VERSION + - id: $$cap_app_version label: Application | Version description: Budibase version. Check out their valid tags at https://hub.docker.com/r/budibase/budibase/tags defaultValue: v2.0.31 diff --git a/public/v4/apps/cachet.yml b/public/v4/apps/cachet.yml index d70808ec5..4d3b1af75 100644 --- a/public/v4/apps/cachet.yml +++ b/public/v4/apps/cachet.yml @@ -10,7 +10,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' $$cap_appname: - image: cachethq/docker:$$cap_cachet_version + image: cachethq/docker:$$cap_app_version environment: DB_DRIVER: pgsql DB_HOST: srv-captain--$$cap_appname-postgres @@ -33,7 +33,7 @@ caproverOneClickApp: description: Password to connect to the database defaultValue: $$cap_gen_random_hex(16) id: $$cap_DB_PASS - - id: $$cap_cachet_version + - id: $$cap_app_version label: Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/cachethq/docker/tags defaultValue: '2.3.15' diff --git a/public/v4/apps/calcom.yml b/public/v4/apps/calcom.yml index 02031fb79..c4911867c 100644 --- a/public/v4/apps/calcom.yml +++ b/public/v4/apps/calcom.yml @@ -3,7 +3,7 @@ services: $$cap_appname: caproverExtra: containerHttpPort: 3000 - image: calcom/cal.com:$$cap_CALCOM_VERSION + image: calcom/cal.com:$$cap_app_version environment: NEXT_PUBLIC_WEBAPP_URL: http://$$cap_appname.$$cap_root_domain NEXTAUTH_SECRET: $$cap_CALCOM_NEXTAUTH_SECRET @@ -45,7 +45,7 @@ caproverOneClickApp: description: Scheduling Infrastructure For Everyone documentation: https://cal.com/docs variables: - - id: $$cap_CALCOM_VERSION + - id: $$cap_app_version label: Application | Version description: Cal.com version. Check out their valid tags at https://hub.docker.com/r/calcom/cal.com/tags defaultValue: 'v3.1.3' diff --git a/public/v4/apps/call-only.yml b/public/v4/apps/call-only.yml index 9c064576d..dfe7c2f90 100644 --- a/public/v4/apps/call-only.yml +++ b/public/v4/apps/call-only.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: calcom/cal.com:$$cap_version + image: calcom/cal.com:$$cap_app_version restart: always environment: NODE_ENV: production @@ -24,7 +24,7 @@ services: containerHttpPort: '3000' caproverOneClickApp: variables: - - id: $$cap_version + - id: $$cap_app_version label: Cal.com Version defaultValue: 'v2.5.4' description: Check out their docker page for the valid tags https://hub.docker.com/r/calcom/cal.com/tags diff --git a/public/v4/apps/chadburn.yml b/public/v4/apps/chadburn.yml index a5a9b5744..271800b42 100644 --- a/public/v4/apps/chadburn.yml +++ b/public/v4/apps/chadburn.yml @@ -2,7 +2,7 @@ captainVersion: 4 version: 3.3 services: '$$cap_appname': - image: ghcr.io/premoweb/chadburn:$$cap_version + image: ghcr.io/premoweb/chadburn:$$cap_app_version volumes: - /var/run/docker.sock:/var/run/docker.sock environment: @@ -11,7 +11,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: Chadburn version defaultValue: '1.0.1' description: See https://github.com/PremoWeb/Chadburn/releases for a list of versions and changelog details. diff --git a/public/v4/apps/changedetection.yml b/public/v4/apps/changedetection.yml index abb856817..f9c2f335b 100644 --- a/public/v4/apps/changedetection.yml +++ b/public/v4/apps/changedetection.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: dgtlmoon/changedetection.io:$$cap_version + image: dgtlmoon/changedetection.io:$$cap_app_version environment: BASE_URL: http://$$cap_appname.$$cap_root_domain volumes: @@ -10,7 +10,7 @@ services: containerHttpPort: '5000' caproverOneClickApp: variables: - - id: $$cap_version + - id: $$cap_app_version label: ChangeDetection.io version defaultValue: 0.40.2 description: 'Check out their docker page for the valid tags https://hub.docker.com/r/dgtlmoon/changedetection.io/tags' diff --git a/public/v4/apps/chaskiq.yml b/public/v4/apps/chaskiq.yml index 0d05a62df..b2c8b82a8 100644 --- a/public/v4/apps/chaskiq.yml +++ b/public/v4/apps/chaskiq.yml @@ -48,7 +48,7 @@ services: caproverExtra: containerHttpPort: '3000' dockerfileLines: - - FROM chaskiq/chaskiq:$$cap_chaskiq_version + - FROM chaskiq/chaskiq:$$cap_app_version - EXPOSE 3000 - CMD bundle exec rails db:setup; bundle exec rails admin_generator; bundle exec rails s -b 0.0.0.0 -p 3000 $$cap_appname-worker: @@ -75,12 +75,12 @@ services: caproverExtra: dockerfileLines: - - FROM chaskiq/chaskiq:$$cap_chaskiq_version + - FROM chaskiq/chaskiq:$$cap_app_version - CMD bundle exec sidekiq -C config/sidekiq.yml notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_chaskiq_version + - id: $$cap_app_version label: Chaskiq Version Tag description: You can use latest tag or check version builds on https://hub.docker.com/r/chaskiq/chaskiq/tags defaultValue: 9009088 diff --git a/public/v4/apps/chatwoot-botpress-bridge.yml b/public/v4/apps/chatwoot-botpress-bridge.yml index 3d8a1da3d..5e900aa76 100644 --- a/public/v4/apps/chatwoot-botpress-bridge.yml +++ b/public/v4/apps/chatwoot-botpress-bridge.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: douglara/chatwoot-botpress-bridge:$$cap_version + image: douglara/chatwoot-botpress-bridge:$$cap_app_version restart: always environment: RAILS_ENV: production @@ -14,7 +14,7 @@ services: containerHttpPort: '3000' caproverOneClickApp: variables: - - id: $$cap_version + - id: $$cap_app_version label: Chatwoot Botpress Bridge Version defaultValue: '1' description: Check out their docker page for the valid tags https://hub.docker.com/r/douglara/chatwoot-botpress-bridge/tags diff --git a/public/v4/apps/chatwoot.yml b/public/v4/apps/chatwoot.yml index 499c95ee3..93f38dd20 100644 --- a/public/v4/apps/chatwoot.yml +++ b/public/v4/apps/chatwoot.yml @@ -38,7 +38,7 @@ services: caproverExtra: containerHttpPort: '3000' dockerfileLines: - - FROM chatwoot/chatwoot:$$cap_chatwoot_version + - FROM chatwoot/chatwoot:$$cap_app_version - RUN chmod +x docker/entrypoints/rails.sh - ENTRYPOINT ["docker/entrypoints/rails.sh"] - EXPOSE 3000 @@ -59,14 +59,14 @@ services: INSTALLATION_ENV: caprover caproverExtra: dockerfileLines: - - FROM chatwoot/chatwoot:$$cap_chatwoot_version + - FROM chatwoot/chatwoot:$$cap_app_version - RUN chmod +x docker/entrypoints/rails.sh - ENTRYPOINT ["docker/entrypoints/rails.sh"] - CMD bundle exec sidekiq -C config/sidekiq.yml notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_chatwoot_version + - id: $$cap_app_version label: Chatwoot Version Tag description: Choose the latest version from https://hub.docker.com/r/chatwoot/chatwoot/tags defaultValue: v3.1.1 diff --git a/public/v4/apps/checkmk.yml b/public/v4/apps/checkmk.yml index 51f1fb5fa..46abe257c 100644 --- a/public/v4/apps/checkmk.yml +++ b/public/v4/apps/checkmk.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: '$$cap_appname': - image: checkmk/check-mk-raw:$$cap_version + image: checkmk/check-mk-raw:$$cap_app_version volumes: - '$$cap_appname-data:/omd/sites' - /etc/localtime:/etc/localtime @@ -11,7 +11,7 @@ services: containerHttpPort: '5000' caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: CheckMK Version defaultValue: '2023.04.07' description: Check out their Docker page for the valid tags https://hub.docker.com/r/checkmk/check-mk-raw/tags diff --git a/public/v4/apps/chevereto.yml b/public/v4/apps/chevereto.yml index c12266a86..b60464d1d 100644 --- a/public/v4/apps/chevereto.yml +++ b/public/v4/apps/chevereto.yml @@ -3,7 +3,7 @@ services: $$cap_appname: depends_on: - $$cap_appname-mariadb - image: nmtan/chevereto:$$cap_chevereto_version + image: nmtan/chevereto:$$cap_app_version restart: 'always' environment: TZ: $$cap_tz @@ -34,7 +34,7 @@ caproverOneClickApp: label: Timezone description: This is the timezone for the application, find yours at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones defaultValue: Europe/Brussels - - id: $$cap_chevereto_version + - id: $$cap_app_version label: Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/nmtan/chevereto/tags defaultValue: '1.2.3' diff --git a/public/v4/apps/claper.yml b/public/v4/apps/claper.yml index a1a2bf500..cabab3b99 100644 --- a/public/v4/apps/claper.yml +++ b/public/v4/apps/claper.yml @@ -12,7 +12,7 @@ services: notExposeAsWebApp: 'true' $$cap_appname: - image: ghcr.io/claperco/claper:$$cap_claper_ver + image: ghcr.io/claperco/claper:$$cap_app_version container_name: claper volumes: - $$cap_appname-uploads:/app/priv/static/uploads @@ -32,7 +32,7 @@ caproverOneClickApp: description: User password for the database instance. defaultValue: $$cap_gen_random_hex(16) validRegex: /^(?=.*\d).{10,}$/ - - id: $$cap_claper_ver + - id: $$cap_app_version label: Claper Version description: Check out their page for the valid tags https://github.com/ClaperCo/Claper/pkgs/container/claper defaultValue: 1.4.0 diff --git a/public/v4/apps/cloudflare-tunnel.yml b/public/v4/apps/cloudflare-tunnel.yml index e6932011e..6defb81db 100644 --- a/public/v4/apps/cloudflare-tunnel.yml +++ b/public/v4/apps/cloudflare-tunnel.yml @@ -4,7 +4,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' dockerfileLines: - - FROM cloudflare/cloudflared:$$cap_cloudflared_version + - FROM cloudflare/cloudflared:$$cap_app_version - ENTRYPOINT ["cloudflared"] - CMD ["tunnel", "--no-autoupdate", "run", "--token", "$$cap_cloudflared_token"] restart: always @@ -14,7 +14,7 @@ caproverOneClickApp: label: Cloudflare Tunnel Token defaultValue: '' description: 'Your Cloudflare tunnel token. This is required to authenticate the tunnel with Cloudflare.' - - id: $$cap_cloudflared_version + - id: $$cap_app_version label: Cloudflare Cloudflared Version defaultValue: '1517-bb29a0e19437' description: 'The version of Cloudflare Cloudflared to use.' diff --git a/public/v4/apps/cockpit.yml b/public/v4/apps/cockpit.yml index 7a2d2f2ee..760641742 100644 --- a/public/v4/apps/cockpit.yml +++ b/public/v4/apps/cockpit.yml @@ -1,12 +1,12 @@ captainVersion: 4 services: $$cap_appname: - image: cockpithq/cockpit:core-$$cap_COCKPIT_VERSION + image: cockpithq/cockpit:core-$$cap_app_version volumes: - $$cap_appname:/var/www/html caproverOneClickApp: variables: - - id: $$cap_COCKPIT_VERSION + - id: $$cap_app_version label: Version description: Check out their Docker page for the valid tags https://hub.docker.com/r/cockpithq/cockpit/tags defaultValue: 2.5.2 diff --git a/public/v4/apps/collabora-online.yml b/public/v4/apps/collabora-online.yml index 42d247da4..f1e4c28c3 100644 --- a/public/v4/apps/collabora-online.yml +++ b/public/v4/apps/collabora-online.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: collabora/code:$$cap_collabora_version + image: collabora/code:$$cap_app_version restart: always environment: domain: $$cap_wopihost_domain @@ -23,7 +23,7 @@ caproverOneClickApp: label: Admin password description: admin password validRegex: /.{1,}/ - - id: $$cap_collabora_version + - id: $$cap_app_version label: Collabora CODE Version defaultValue: 4.2.4.4 description: Check out their docker page for the valid tags https://hub.docker.com/r/collabora/code/tags/ diff --git a/public/v4/apps/commento.yml b/public/v4/apps/commento.yml index 66fee8673..0eccddc02 100644 --- a/public/v4/apps/commento.yml +++ b/public/v4/apps/commento.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: # Commento $$cap_appname: - image: registry.gitlab.com/commento/commento@$$cap_commento_version + image: registry.gitlab.com/commento/commento@$$cap_app_version restart: always environment: COMMENTO_ORIGIN: https://$$cap_appname.$$cap_root_domain @@ -23,7 +23,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_commento_version + - id: $$cap_app_version label: Commento Manifest digest defaultValue: 'sha256:e792ac5c384ca7d45bfc228ef6ec3084a54af98847ee75a8aac7aa720f4f87a2' description: Starts with 'sha256:'. Find on https://gitlab.com/commento/commento/container_registry/337942 diff --git a/public/v4/apps/coral.yml b/public/v4/apps/coral.yml index 426bb5a9d..8f5dbbef5 100644 --- a/public/v4/apps/coral.yml +++ b/public/v4/apps/coral.yml @@ -16,7 +16,7 @@ services: depends_on: - $$cap_appname-mongo - $$cap_appname-redis - image: coralproject/talk:$$cap_talk_version + image: coralproject/talk:$$cap_app_version restart: always caproverExtra: containerHttpPort: '5000' @@ -31,7 +31,7 @@ caproverOneClickApp: defaultValue: $$cap_gen_random_hex(32) description: '' validRegex: /.{1,}/ - - id: $$cap_talk_version + - id: $$cap_app_version label: Coral Talk Version defaultValue: '6' description: Check out their Docker page for the valid tags https://hub.docker.com/r/coralproject/talk/tags diff --git a/public/v4/apps/corteza.yml b/public/v4/apps/corteza.yml index 1d20a3a7e..34a01a7f7 100644 --- a/public/v4/apps/corteza.yml +++ b/public/v4/apps/corteza.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: $$cap_appname: - image: cortezaproject/corteza:$$corteza_version + image: cortezaproject/corteza:$$cap_app_version restart: always depends_on: - $$cap_appname-db @@ -13,7 +13,7 @@ services: DB_DSN: postgres://$$cap_postgre_username:$$cap_postgre_password@srv-captain--$$cap_appname-db:5432/$$cap_postgre_db_name?sslmode=disable HTTP_WEBAPP_ENABLED: true DOMAIN: $$cap_appname.$$cap_root_domain - VERSION: $$corteza_version + VERSION: $$cap_app_version LETSENCRYPT_HOST: $$cap_lets_encrypt $$cap_appname-db: image: postgres:13 @@ -29,7 +29,7 @@ services: caproverOneClickApp: variables: - - id: '$$corteza_version' + - id: $$cap_app_version label: Corteza Version defaultValue: '2021.9.5' description: Check out their Docker page for the valid tags https://hub.docker.com/r/cortezaproject/corteza/tags diff --git a/public/v4/apps/couchbase.yml b/public/v4/apps/couchbase.yml index 40ed4fb90..aa15853da 100644 --- a/public/v4/apps/couchbase.yml +++ b/public/v4/apps/couchbase.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname-db: - image: couchbase:$$cap_cb_version + image: couchbase:$$cap_app_version volumes: - $$cap_appname-data:/opt/couchbase/var restart: always @@ -9,7 +9,7 @@ services: containerHttpPort: '8091' caproverOneClickApp: variables: - - id: $$cap_cb_version + - id: $$cap_app_version label: CouchBase Version defaultValue: 'community-6.6.0' description: Check out their Docker page for the valid tags https://registry.hub.docker.com/_/couchbase?tab=tags diff --git a/public/v4/apps/couchdb-clouseau.yml b/public/v4/apps/couchdb-clouseau.yml index 34af1dd23..4e98d2519 100644 --- a/public/v4/apps/couchdb-clouseau.yml +++ b/public/v4/apps/couchdb-clouseau.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: ibmcom/couchdb3:$$cap_couchdb_version + image: ibmcom/couchdb3:$$cap_app_version volumes: - $$cap_appname-db-data:/opt/couchdb/data - $$cap_appname-db-etc:/opt/couchdb/etc @@ -13,7 +13,7 @@ services: containerHttpPort: '5984' caproverOneClickApp: variables: - - id: $$cap_couchdb_version + - id: $$cap_app_version label: CouchDB Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/couchdb/tags/ defaultValue: '3.2.1' diff --git a/public/v4/apps/couchdb.yml b/public/v4/apps/couchdb.yml index 60b999782..9cadff3a4 100644 --- a/public/v4/apps/couchdb.yml +++ b/public/v4/apps/couchdb.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: couchdb:$$cap_couchdb_version + image: couchdb:$$cap_app_version volumes: - $$cap_appname-db-data:/opt/couchdb/data - $$cap_appname-db-etc:/opt/couchdb/etc @@ -13,7 +13,7 @@ services: containerHttpPort: '5984' caproverOneClickApp: variables: - - id: $$cap_couchdb_version + - id: $$cap_app_version label: CouchDB Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/couchdb/tags/ defaultValue: '2' diff --git a/public/v4/apps/countly.yml b/public/v4/apps/countly.yml index 33925687c..037829bc3 100644 --- a/public/v4/apps/countly.yml +++ b/public/v4/apps/countly.yml @@ -1,14 +1,14 @@ captainVersion: 4 services: $$cap_appname: - image: countly/countly-server:$$cap_countly_version + image: countly/countly-server:$$cap_app_version volumes: - $$cap_appname-data:/var/lib/mongodb restart: always environment: {} caproverOneClickApp: variables: - - id: $$cap_countly_version + - id: $$cap_app_version label: What version/tag do you want? description: Go here to see all versions https://hub.docker.com/r/countly/countly-server/tags defaultValue: 19.08.1 diff --git a/public/v4/apps/crater.yml b/public/v4/apps/crater.yml index fc425f443..262fa51ff 100644 --- a/public/v4/apps/crater.yml +++ b/public/v4/apps/crater.yml @@ -77,7 +77,7 @@ services: - ENV WEBHOME=$PROJECT_DIRECTORY - RUN printf "\n$COMMAND_CLEAN_ENVIRONMENT_FILE\n$COMMAND_ADD_TO_ENVIRONMENT_FILE\n$COMMAND_NOTIFY" >> $STARTUP_COMMANDS_FILE environment: - CRATER_PHP_VERSION: $$cap_PHP_VERSION + CRATER_PHP_VERSION: $$cap_app_version TZ: $$cap_TZ PUID: $$cap_PUID PGID: $$cap_PGID @@ -163,7 +163,7 @@ caproverOneClickApp: description: Open Source Invoicing Solution for Individuals & Businesses documentation: See https://docs.craterapp.com/developer-guide.html variables: - - id: $$cap_PHP_VERSION + - id: $$cap_app_version label: PHP Image Version Tag description: Without "php" prefix. Check out their valid tags at https://hub.docker.com/r/shinsenter/crater/tags defaultValue: '8.1' diff --git a/public/v4/apps/cronicle.yml b/public/v4/apps/cronicle.yml index f242c1dd7..a8d00643f 100644 --- a/public/v4/apps/cronicle.yml +++ b/public/v4/apps/cronicle.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: soulteary/cronicle:$$cap_version + image: soulteary/cronicle:$$cap_app_version restart: always volumes: - /etc/localtime:/etc/localtime @@ -18,7 +18,7 @@ services: containerHttpPort: '3012' caproverOneClickApp: variables: - - id: $$cap_version + - id: $$cap_app_version label: Cronicle Version defaultValue: '0.9.17' description: Check out their docker page for the valid tags https://hub.docker.com/r/soulteary/cronicle/tags diff --git a/public/v4/apps/cyberchef.yml b/public/v4/apps/cyberchef.yml index 235b1599f..a9e6ec1c1 100644 --- a/public/v4/apps/cyberchef.yml +++ b/public/v4/apps/cyberchef.yml @@ -1,10 +1,10 @@ captainVersion: 4 services: $$cap_appname: - image: ghcr.io/gchq/cyberchef:$$cap_cyberchef_version + image: ghcr.io/gchq/cyberchef:$$cap_app_version caproverOneClickApp: variables: - - id: '$$cap_cyberchef_version' + - id: $$cap_app_version label: CyberChef App Version defaultValue: '10' description: Check out their Docker page for the valid tags https://github.com/gchq/CyberChef/pkgs/container/cyberchef diff --git a/public/v4/apps/databag.yml b/public/v4/apps/databag.yml index bfc1c0f04..4108924c4 100644 --- a/public/v4/apps/databag.yml +++ b/public/v4/apps/databag.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: '$$cap_appname': - image: balzack/databag:$$cap_version + image: balzack/databag:$$cap_app_version environment: TZ: '$$cap_tz' PHP_TZ: '$$cap_tz' @@ -11,7 +11,7 @@ services: containerHttpPort: '7000' caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: Databag Version defaultValue: '0.1.17' description: Check out their Docker page for the valid tags https://hub.docker.com/r/balzack/databag/tags diff --git a/public/v4/apps/davos.yml b/public/v4/apps/davos.yml index 9ace5d2bb..8fa795fac 100644 --- a/public/v4/apps/davos.yml +++ b/public/v4/apps/davos.yml @@ -9,7 +9,7 @@ caproverOneClickApp: isOfficial: true variables: - defaultValue: 2.2.1 - id: $$cap_davos_version + id: $$cap_app_version label: Davos Version validRegex: /^([^\s^\/])+$/ - defaultValue: '1000' @@ -28,7 +28,7 @@ services: environment: PGID: $$cap_davos_pgid PUID: $$cap_davos_puid - image: lscr.io/linuxserver/davos:$$cap_davos_version + image: lscr.io/linuxserver/davos:$$cap_app_version restart: unless-stopped volumes: - $$cap_appname-config:/config diff --git a/public/v4/apps/deluge.yml b/public/v4/apps/deluge.yml index 502171bd1..972e393b2 100644 --- a/public/v4/apps/deluge.yml +++ b/public/v4/apps/deluge.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: '$$cap_appname': - image: linuxserver/deluge:$$cap_version + image: linuxserver/deluge:$$cap_app_version environment: TZ: '$$cap_tz' PUID: '$$cap_puid' @@ -15,7 +15,7 @@ services: containerHttpPort: '8112' caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: Deluge Version defaultValue: '2.1.1' description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/deluge/tags diff --git a/public/v4/apps/discourse.yml b/public/v4/apps/discourse.yml index 093c8c93e..f80774bfb 100644 --- a/public/v4/apps/discourse.yml +++ b/public/v4/apps/discourse.yml @@ -25,7 +25,7 @@ services: notExposeAsWebApp: 'true' $$cap_appname: documentation: Taken from https://hub.docker.com/r/bitnami/discourse - image: docker.io/bitnami/discourse:$$cap_discourse_version + image: docker.io/bitnami/discourse:$$cap_app_version depends_on: - $$cap_appname-postgresql - $$cap_appname-redis @@ -74,12 +74,12 @@ services: SMTP_PASSWORD: $$cap_smtp_pass caproverExtra: dockerfileLines: - - FROM docker.io/bitnami/discourse:$$cap_discourse_version + - FROM docker.io/bitnami/discourse:$$cap_app_version - CMD ["/opt/bitnami/scripts/discourse-sidekiq/run.sh"] notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_discourse_version + - id: $$cap_app_version label: Discourse Version defaultValue: 2.8.11 description: Version of Discourse diff --git a/public/v4/apps/docmost.yml b/public/v4/apps/docmost.yml index 3d2a0263a..ddce7d7f4 100644 --- a/public/v4/apps/docmost.yml +++ b/public/v4/apps/docmost.yml @@ -24,7 +24,7 @@ services: SMTP_SECURE: $$cap_smtp_secure MAIL_FROM_ADDRESS: $$cap_mail_from_address MAIL_FROM_NAME: $$cap_mail_from_name - image: docmost/docmost:$$cap_docmost_version + image: docmost/docmost:$$cap_app_version restart: always volumes: - $$cap_appname-data:/app/data/storage @@ -55,7 +55,7 @@ caproverOneClickApp: variables: - defaultValue: 0.3.1 description: Check out their Docker page for the valid tags https://hub.docker.com/r/docmost/docmost/tags - id: $$cap_docmost_version + id: $$cap_app_version label: Dockmost version validRegex: /^([^\s^\/])+$/ - defaultValue: $$cap_gen_random_hex(32) diff --git a/public/v4/apps/docuseal.yml b/public/v4/apps/docuseal.yml index 1b2030a6b..888291266 100644 --- a/public/v4/apps/docuseal.yml +++ b/public/v4/apps/docuseal.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: index.docker.io/docuseal/docuseal:$$cap_docuseal_version + image: index.docker.io/docuseal/docuseal:$$cap_app_version volumes: - $$cap_appname-data:/data restart: always @@ -9,7 +9,7 @@ services: containerHttpPort: '3000' caproverOneClickApp: variables: - - id: $$cap_docuseal_version + - id: $$cap_app_version label: Docuseal Version defaultValue: 1.2.4 description: Check out their Docker page for the valid tags https://hub.docker.com/r/docuseal/docuseal/tags diff --git a/public/v4/apps/dokuwiki.yml b/public/v4/apps/dokuwiki.yml index c35622a15..af5f1a046 100644 --- a/public/v4/apps/dokuwiki.yml +++ b/public/v4/apps/dokuwiki.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: bitnami/dokuwiki:$$cap_dokuwiki_version + image: bitnami/dokuwiki:$$cap_app_version environment: DOKUWIKI_USERNAME: $$DOKUWIKI_USERNAME DOKUWIKI_EMAIL: $$DOKUWIKI_EMAIL @@ -14,7 +14,7 @@ services: - $$cap_appname:/bitnami/dokuwiki caproverOneClickApp: variables: - - id: $$cap_dokuwiki_version + - id: $$cap_app_version label: DokuWiki Version defaultValue: 20200729-debian-10 description: Check out their Docker page for the valid tags https://hub.docker.com/r/bitnami/dokuwiki/tags diff --git a/public/v4/apps/dolibarr.yml b/public/v4/apps/dolibarr.yml index f116d2e1a..87a10ec1b 100644 --- a/public/v4/apps/dolibarr.yml +++ b/public/v4/apps/dolibarr.yml @@ -12,7 +12,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' $$cap_appname: - image: upshift/dolibarr:$$cap_dolibarr-version + image: upshift/dolibarr:$$cap_app_version depends_on: - $$cap_appname-db volumes: @@ -38,7 +38,7 @@ caproverOneClickApp: defaultValue: 9.6-alpine description: Check out their docker page for the valid tags https://hub.docker.com/r/library/postgres/tags/ validRegex: /^([^\s^\/])+$/ - - id: $$cap_dolibarr-version + - id: $$cap_app_version label: Dolibarr Version defaultValue: '11.0' description: Check out their docker page for the valid tags https://hub.docker.com/r/upshift/dolibarr/tags diff --git a/public/v4/apps/dozzle.yml b/public/v4/apps/dozzle.yml index 4de2276dc..e118995c8 100644 --- a/public/v4/apps/dozzle.yml +++ b/public/v4/apps/dozzle.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: amir20/dozzle:$$cap_version + image: amir20/dozzle:$$cap_app_version volumes: - /var/run/docker.sock:/var/run/docker.sock environment: @@ -12,7 +12,7 @@ services: containerHttpPort: '8080' caproverOneClickApp: variables: - - id: $$cap_version + - id: $$cap_app_version label: Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/amir20/dozzle/tags?page=1&ordering=last_updated defaultValue: 'v3.7.1' diff --git a/public/v4/apps/dragonflydb.yml b/public/v4/apps/dragonflydb.yml index f66ab16c2..005bccbcc 100644 --- a/public/v4/apps/dragonflydb.yml +++ b/public/v4/apps/dragonflydb.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: docker.dragonflydb.io/dragonflydb/dragonfly:$$cap_dragonflydb_version + image: docker.dragonflydb.io/dragonflydb/dragonfly:$$cap_app_version volumes: - $$cap_appname-dragonflydb-data:/data restart: always @@ -10,7 +10,7 @@ services: DFLY_maxmemory: $$cap_dragonflydb_maxmem caproverOneClickApp: variables: - - id: $$cap_dragonflydb_version + - id: $$cap_app_version label: Dragonfly Version Tag description: 'Check out their Github page for the valid tags: https://github.com/dragonflydb/dragonfly/releases' defaultValue: 'v1.14.0' diff --git a/public/v4/apps/drone-gitea.yml b/public/v4/apps/drone-gitea.yml index a534c2202..b9340911d 100644 --- a/public/v4/apps/drone-gitea.yml +++ b/public/v4/apps/drone-gitea.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname-agent: - image: drone/drone-runner-docker:$$cap_drone_runner_version + image: drone/drone-runner-docker:$$cap_app_version volumes: - /var/run/docker.sock:/var/run/docker.sock restart: always @@ -36,7 +36,7 @@ caproverOneClickApp: defaultValue: 1.9.0 description: Check out their Docker page for the valid tags https://hub.docker.com/r/drone/drone/tags validRegex: '' - - id: $$cap_drone_runner_version + - id: $$cap_app_version label: Drone Docker runner Version defaultValue: 1.5.1 description: Check out their Docker page for the valid tags https://hub.docker.com/r/drone/drone-runner-docker/tags diff --git a/public/v4/apps/droppy.yml b/public/v4/apps/droppy.yml index 4bbfb44a0..c35895b3d 100644 --- a/public/v4/apps/droppy.yml +++ b/public/v4/apps/droppy.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: ghcr.io/droppyjs/droppy:$$cap_droppy_version + image: ghcr.io/droppyjs/droppy:$$cap_app_version volumes: - $$cap_appname-config:/config - $$cap_appname-files:/files @@ -10,7 +10,7 @@ services: containerHttpPort: '8989' caproverOneClickApp: variables: - - id: $$cap_droppy_version + - id: $$cap_app_version label: droppy version tag description: Check out their docker page for the valid tags @ https://github.com/orgs/droppyjs/packages/container/package/droppy defaultValue: v0.0.6 diff --git a/public/v4/apps/duplicati.yml b/public/v4/apps/duplicati.yml index 2dfb5d156..939c2afff 100644 --- a/public/v4/apps/duplicati.yml +++ b/public/v4/apps/duplicati.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: # Duplicati $$cap_appname: - image: linuxserver/duplicati:$$cap_duplicati_version + image: linuxserver/duplicati:$$cap_app_version environment: TZ: $$cap_tz PUID: $$cap_puid @@ -20,7 +20,7 @@ caproverOneClickApp: label: Timezone description: Specify a timezone to use EG Europe/London, find yours at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones defaultValue: Europe/Brussels - - id: $$cap_duplicati_version + - id: $$cap_app_version label: Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/duplicati/tags defaultValue: 'version-v2.0.7.1-2.0.7.1_beta_2023-05-25' diff --git a/public/v4/apps/eclipse-mosquitto.yml b/public/v4/apps/eclipse-mosquitto.yml index 0722408c2..fb9b6f0ec 100644 --- a/public/v4/apps/eclipse-mosquitto.yml +++ b/public/v4/apps/eclipse-mosquitto.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: eclipse-mosquitto:$$cap_eclipse_version + image: eclipse-mosquitto:$$cap_app_version volumes: - $$cap_appname-eclipse-config:/mosquitto/config/ - $$cap_appname-eclipse-data:/mosquitto/data/ @@ -12,7 +12,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_eclipse_version + - id: $$cap_app_version label: Eclipes-Mosquitto Image Version defaultValue: latest validRegex: /^([^\s^\/])+$/ diff --git a/public/v4/apps/elasticsearch.yml b/public/v4/apps/elasticsearch.yml index 781eda56b..c3ee6ed3c 100644 --- a/public/v4/apps/elasticsearch.yml +++ b/public/v4/apps/elasticsearch.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: docker.elastic.co/elasticsearch/elasticsearch:$$cap_elasticsearch_version + image: docker.elastic.co/elasticsearch/elasticsearch:$$cap_app_version volumes: - $$cap_appname-elasticsearch-data:/usr/share/elasticsearch/data restart: always @@ -16,7 +16,7 @@ services: containerHttpPort: $$cap_container_port caproverOneClickApp: variables: - - id: $$cap_elasticsearch_version + - id: $$cap_app_version label: 'Elasticsearch Version Tag' description: 'Check out the releases overview: https://hub.docker.com/_/elasticsearch' defaultValue: 8.4.1 diff --git a/public/v4/apps/elkarbackup.yml b/public/v4/apps/elkarbackup.yml index 83ae47237..b3551bf1e 100644 --- a/public/v4/apps/elkarbackup.yml +++ b/public/v4/apps/elkarbackup.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: # Elkar $$cap_appname: - image: elkarbackup/elkarbackup:$$cap_elkar_version + image: elkarbackup/elkarbackup:$$cap_app_version restart: always environment: TZ: $$cap_tz @@ -35,7 +35,7 @@ caproverOneClickApp: label: Timezone description: This is the timezone for the application, find yours at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones defaultValue: Europe/Brussels - - id: $$cap_elkar_version + - id: $$cap_app_version label: Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/elkarbackup/elkarbackup/tags defaultValue: '2' diff --git a/public/v4/apps/emailengine.yml b/public/v4/apps/emailengine.yml index c7a504ca7..6267a1208 100644 --- a/public/v4/apps/emailengine.yml +++ b/public/v4/apps/emailengine.yml @@ -4,7 +4,7 @@ services: $$cap_appname: depends_on: - $$cap_appname-redis - image: postalsys/emailengine:$$cap_emailengine_version + image: postalsys/emailengine:$$cap_app_version restart: always environment: WAIT_HOSTS: srv-captain--$$cap_appname-redis:6379 @@ -22,7 +22,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_emailengine_version + - id: $$cap_app_version label: EmailEngine Version defaultValue: 'v2' description: Check out their docker page for the valid tags https://hub.docker.com/r/postalsys/emailengine/tags diff --git a/public/v4/apps/etesync.yml b/public/v4/apps/etesync.yml index d4141206a..f955d677e 100644 --- a/public/v4/apps/etesync.yml +++ b/public/v4/apps/etesync.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: grburst/etesync:$$cap_version + image: grburst/etesync:$$cal volumes: - $$cap_appname-data:/data restart: always @@ -13,7 +13,7 @@ services: containerHttpPort: '3735' caproverOneClickApp: variables: - - id: $$cap_version + - id: $$cap_app_version label: version tag description: Check out their docker page for the valid tags @ https://hub.docker.com/r/grburst/etesync defaultValue: alpine diff --git a/public/v4/apps/etherpad.yml b/public/v4/apps/etherpad.yml index 655356dc0..8cb738119 100644 --- a/public/v4/apps/etherpad.yml +++ b/public/v4/apps/etherpad.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: etherpad/etherpad:$$cap_etherpad_version + image: etherpad/etherpad:$$cap_app_version depends_on: - $$cap_appname-db environment: @@ -30,7 +30,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_etherpad_version + - id: $$cap_app_version label: Etherpad Docker Image defaultValue: 1.8.0 description: Check out their Docker page for the valid tags https://hub.docker.com/r/etherpad/etherpad/tags - default is 1.8.0 as of 2020-04-09 diff --git a/public/v4/apps/excalidraw.yml b/public/v4/apps/excalidraw.yml index 38d15828b..e621031bc 100644 --- a/public/v4/apps/excalidraw.yml +++ b/public/v4/apps/excalidraw.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: kiliandeca/excalidraw@$$cap_excalidraw_version + image: kiliandeca/excalidraw@$$cap_app_version restart: always environment: BACKEND_V2_GET_URL: https://$$cap_appname-storage.$$cap_root_domain/api/v2/scenes/ @@ -37,7 +37,7 @@ services: caproverOneClickApp: variables: - - id: $$cap_excalidraw_version + - id: $$cap_app_version label: Excalidraw version defaultValue: 'sha256:2fe5a14cc0aab940dcf6144a6a5e73b9d044bdf0148762f9c7bc0ceea424c872' description: Check out this Docker page for any valid tags https://hub.docker.com/r/kiliandeca/excalidraw/tags diff --git a/public/v4/apps/fider.yml b/public/v4/apps/fider.yml index 6b6a39ff0..89946a9f2 100644 --- a/public/v4/apps/fider.yml +++ b/public/v4/apps/fider.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: $$cap_appname: documentation: Taken from https://hub.docker.com/r/getfider/fider/ - image: getfider/fider:$$cap_fider_version + image: getfider/fider:$$cap_app_version restart: always environment: BASE_URL: '$$cap_appname.$$cap_root_domain' @@ -20,7 +20,7 @@ caproverOneClickApp: - id: $$cap_db_url label: Fider database URL description: Postgres database connection URL for Fider, for example "postgres://username:password@srv-captain--mypostgres:5432/fider?sslmode=disable" - - id: $$cap_fider_version + - id: $$cap_app_version label: Fider Version defaultValue: 0.21.1 description: https://hub.docker.com/r/getfider/fider/tags diff --git a/public/v4/apps/filebrowser.yml b/public/v4/apps/filebrowser.yml index a6ac996b9..9e5f233c0 100644 --- a/public/v4/apps/filebrowser.yml +++ b/public/v4/apps/filebrowser.yml @@ -11,11 +11,11 @@ services: - FROM alpine:latest as helper - '# Similar to the original file, except, /database.db is inside a directory now so that we can assign a volume to it.' - RUN echo "{'port':80,'baseURL':'','address':'','log':'stdout','database':'/database/database.db','root':'/srv'}" | sed "s/\'/\"/g" >/.edited.json - - FROM filebrowser/filebrowser:$$cap_filebrowser_version + - FROM filebrowser/filebrowser:$$cap_app_version - COPY --from=helper /.edited.json /.filebrowser.json caproverOneClickApp: variables: - - id: $$cap_filebrowser_version + - id: $$cap_app_version label: File Browser Version Tag description: 'Check out their Docker page for the valid tags: https://hub.docker.com/r/filebrowser/filebrowser/tags' defaultValue: v2.22.4 diff --git a/public/v4/apps/filerun.yml b/public/v4/apps/filerun.yml index 248ce341e..9c6df0a6d 100644 --- a/public/v4/apps/filerun.yml +++ b/public/v4/apps/filerun.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: filerun/filerun:$$cap_wp_version + image: filerun/filerun:$$cap_app_version volumes: - $$cap_appname-html:/var/www/html - $$cap_appname-userfiles:/user-files @@ -37,7 +37,7 @@ caproverOneClickApp: label: Database password description: '' validRegex: /.{1,}/ - - id: $$cap_wp_version + - id: $$cap_app_version label: Filerun Version. defaultValue: 'latest' description: Use 'latest' tag for normal installation. Check out their Docker page for the valid tags https://hub.docker.com/r/filerun/filerun/tags diff --git a/public/v4/apps/filestash.yml b/public/v4/apps/filestash.yml index 8addd00e7..2f88f54f2 100644 --- a/public/v4/apps/filestash.yml +++ b/public/v4/apps/filestash.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: machines/filestash:$$cap_filestash_version + image: machines/filestash:$$cap_app_version volumes: - $$cap_appname-app-data-state:/app/data/state restart: always @@ -9,7 +9,7 @@ services: containerHttpPort: '8334' caproverOneClickApp: variables: - - id: $$cap_filestash_version + - id: $$cap_app_version label: Filestash Version defaultValue: b7b45f2 description: Check out their Docker page for the valid tags https://hub.docker.com/r/machines/filestash/tags diff --git a/public/v4/apps/filezilla.yml b/public/v4/apps/filezilla.yml index 203e1b411..fa555b4b2 100644 --- a/public/v4/apps/filezilla.yml +++ b/public/v4/apps/filezilla.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: linuxserver/filezilla:$$cap_fz_version + image: linuxserver/filezilla:$$cap_app_version environment: TZ: $$cap_tz PUID: '1000' @@ -13,7 +13,7 @@ services: containerHttpPort: '3000' caproverOneClickApp: variables: - - id: $$cap_fz_version + - id: $$cap_app_version label: Filezilla Version defaultValue: 3.51.0-r1-ls6 description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/filezilla/tags diff --git a/public/v4/apps/firefly-iii.yml b/public/v4/apps/firefly-iii.yml index 220255691..d873c5cb2 100644 --- a/public/v4/apps/firefly-iii.yml +++ b/public/v4/apps/firefly-iii.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: fireflyiii/core:$$cap_firefly_version + image: fireflyiii/core:$$cap_app_version volumes: - $$cap_appname-export:/var/www/firefly-iii/storage/export - $$cap_appname-upload:/var/www/firefly-iii/storage/upload @@ -44,7 +44,7 @@ caproverOneClickApp: label: Mariadb Password description: The password of the Mariadb Database" validRegex: /.{1,}/ - - id: $$cap_firefly_version + - id: $$cap_app_version label: Firefly Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/fireflyiii/core/tags defaultValue: version-5.5.13 diff --git a/public/v4/apps/fireflyiii-data-importer.yml b/public/v4/apps/fireflyiii-data-importer.yml index a263b0e54..a5750a6da 100644 --- a/public/v4/apps/fireflyiii-data-importer.yml +++ b/public/v4/apps/fireflyiii-data-importer.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: fireflyiii/data-importer:$$cap_fidi_version + image: fireflyiii/data-importer:$$cap_app_version environment: FIREFLY_III_ACCESS_TOKEN: $$cap_ff_token FIREFLY_III_URL: $$cap_ff_url @@ -14,7 +14,7 @@ services: containerHttpPort: '8080' caproverOneClickApp: variables: - - id: $$cap_fidi_version + - id: $$cap_app_version label: FIDI Version defaultValue: version-v1.0.1 description: Check out their Docker page for the valid tags https://hub.docker.com/r/fireflyiii/data-importer/tags diff --git a/public/v4/apps/firefox.yml b/public/v4/apps/firefox.yml index b6b4791ec..063985506 100644 --- a/public/v4/apps/firefox.yml +++ b/public/v4/apps/firefox.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: $$cap_appname: documentation: https://docs.linuxserver.io/images/docker-firefox - image: lscr.io/linuxserver/firefox:$$cap_firefox_version + image: lscr.io/linuxserver/firefox:$$cap_app_version restart: always volumes: - $$cap_appname-config:/config @@ -14,7 +14,7 @@ services: containerHttpPort: '3000' caproverOneClickApp: variables: - - id: $$cap_firefox_version + - id: $$cap_app_version label: Firefox Version defaultValue: '78.13.0' description: firefox Image Version, se more at https://hub.docker.com/r/linuxserver/firefox/tags diff --git a/public/v4/apps/flagsmith.yml b/public/v4/apps/flagsmith.yml index 84e133d2b..119f0b188 100644 --- a/public/v4/apps/flagsmith.yml +++ b/public/v4/apps/flagsmith.yml @@ -14,7 +14,7 @@ services: notExposeAsWebApp: true $$cap_appname: - image: flagsmith/flagsmith:$$cap_flagsmith_tag + image: flagsmith/flagsmith:$$cap_app_version depends_on: - $$cap_appname-db restart: unless-stopped @@ -36,7 +36,7 @@ caproverOneClickApp: label: Postgres Password defaultValue: $$cap_gen_random_hex(16) validRegex: /^(?=.*\d).{10,}$/ - - id: $$cap_flagsmith_tag + - id: $$cap_app_version label: Flagsmith Version defaultValue: '2.14.3' description: Check out our docker page for the valid tags https://hub.docker.com/r/flagsmith/flagsmith/tags diff --git a/public/v4/apps/flaresolverr.yml b/public/v4/apps/flaresolverr.yml index 89a17deb5..6606f6f69 100644 --- a/public/v4/apps/flaresolverr.yml +++ b/public/v4/apps/flaresolverr.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: ghcr.io/flaresolverr/flaresolverr:$$cap_flaresolverr_version + image: ghcr.io/flaresolverr/flaresolverr:$$cap_app_version restart: unless-stopped environment: LOG_LEVEL: $$cap_log_level @@ -18,7 +18,7 @@ services: containerHttpPort: '8191' caproverOneClickApp: variables: - - id: $$cap_flaresolverr_version + - id: $$cap_app_version label: FlareSolverr Version defaultValue: v3.3.21 description: Specify the version of FlareSolverr to use. Check out their Docker page for other valid tags https://github.com/FlareSolverr/FlareSolverr/pkgs/container/flaresolverr diff --git a/public/v4/apps/focalboard.yml b/public/v4/apps/focalboard.yml index f041acc7a..53f2417c5 100644 --- a/public/v4/apps/focalboard.yml +++ b/public/v4/apps/focalboard.yml @@ -19,12 +19,12 @@ services: caproverExtra: containerHttpPort: '8000' dockerfileLines: - - FROM mattermost/focalboard:$$cap_focalboard_version + - FROM mattermost/focalboard:$$cap_app_version - CMD printenv CONFIG_JSON > /opt/focalboard/config.json && /opt/focalboard/bin/focalboard-server caproverOneClickApp: variables: - - id: $$cap_focalboard_version + - id: $$cap_app_version label: Focalboard Version defaultValue: 0.6.5 description: 'Check out their docker page for the valid tags https://hub.docker.com/r/mattermost/focalboard/tags' diff --git a/public/v4/apps/forge_minecraft.yml b/public/v4/apps/forge_minecraft.yml index 602dc9e63..32b24d6ae 100644 --- a/public/v4/apps/forge_minecraft.yml +++ b/public/v4/apps/forge_minecraft.yml @@ -6,7 +6,7 @@ services: EULA: 'true' TYPE: '$$server_type' VERSION: '$$cap_minecraft_version' - FORGE_VERSION: '$$cap_forge_version' + FORGE_VERSION: '$$cap_app_version' MAX_PLAYERS: '$$cap_max_players' MODE: '$$cap_game_mode' MAX_MEMORY: '$$cap_max_ramG' @@ -50,7 +50,7 @@ caproverOneClickApp: - id: $$cap_minecraft_version label: Minecraft version defaultValue: 1.20.1 - - id: $$cap_forge_version + - id: $$cap_app_version label: forge server version description: 'Choose the version that works with your mc version , see: https://files.minecraftforge.net/' defaultValue: 47.0.46 diff --git a/public/v4/apps/formance-ledger.yml b/public/v4/apps/formance-ledger.yml index ef21dafe6..77aaca4a1 100644 --- a/public/v4/apps/formance-ledger.yml +++ b/public/v4/apps/formance-ledger.yml @@ -3,7 +3,7 @@ services: $$cap_appname: caproverExtra: containerHttpPort: 3068 - image: ghcr.io/formancehq/ledger:$$cap_FORMANCE_LEDGER_VERSION + image: ghcr.io/formancehq/ledger:$$cap_app_version environment: NUMARY_STORAGE_DRIVER: postgres NUMARY_STORAGE_POSTGRES_CONN_STRING: postgresql://$$cap_POSTGRES_USER:$$cap_POSTGRES_PASSWORD@srv-captain--$$cap_appname-db/$$cap_POSTGRES_DB @@ -29,7 +29,7 @@ services: caproverExtra: containerHttpPort: 3078 dockerfileLines: - - FROM ghcr.io/formancehq/ledger:$$cap_FORMANCE_LEDGER_VERSION + - FROM ghcr.io/formancehq/ledger:$$cap_app_version - CMD ["ui"] environment: NUMARY_UI_HTTP_BIND_ADDRESS: '0.0.0.0:3078' @@ -48,7 +48,7 @@ caproverOneClickApp: description: Programmable Financial Ledger To Build Money-Moving Applications documentation: https://docs.formance.com variables: - - id: $$cap_FORMANCE_LEDGER_VERSION + - id: $$cap_app_version label: Application | Version description: Version of Formance. Check out their valid tags at https://github.com/formancehq/ledger/pkgs/container/ledger defaultValue: v1.8.0 diff --git a/public/v4/apps/formbricks.yml b/public/v4/apps/formbricks.yml index b9270dba4..49b0f9cf8 100644 --- a/public/v4/apps/formbricks.yml +++ b/public/v4/apps/formbricks.yml @@ -14,7 +14,7 @@ services: notExposeAsWebApp: true $$cap_appname: - image: formbricks/formbricks:$$cap_formbricks_tag + image: formbricks/formbricks:$$cap_app_version depends_on: - $$cap_appname-db restart: unless-stopped @@ -49,7 +49,7 @@ caproverOneClickApp: label: Postgres Password defaultValue: $$cap_gen_random_hex(16) validRegex: /^(?=.*\d).{10,}$/ - - id: $$cap_formbricks_tag + - id: $$cap_app_version label: Formbricks Version defaultValue: 2.1.1 description: Check out our docker page for the valid tags https://hub.docker.com/r/formbricks/formbricks/tags diff --git a/public/v4/apps/formio.yml b/public/v4/apps/formio.yml index 594d8a25e..9ed22ec90 100644 --- a/public/v4/apps/formio.yml +++ b/public/v4/apps/formio.yml @@ -12,7 +12,7 @@ services: documentation: Taken from https://hub.docker.com/r/calipseo/formio depends_on: - $$cap_appname-mongodb - image: calipseo/formio:$$cap_formio_version + image: calipseo/formio:$$cap_app_version volumes: - $$cap_appname-data:/app restart: always @@ -39,7 +39,7 @@ caproverOneClickApp: label: admin password description: Password for the admin user. validRegex: /.{1,}/ - - id: $$cap_formio_version + - id: $$cap_app_version label: Formio Version defaultValue: 1.90.7 description: https://hub.docker.com/r/calipseo/formio/tags diff --git a/public/v4/apps/foundryvtt.yml b/public/v4/apps/foundryvtt.yml index c831892c1..0e5ef7996 100644 --- a/public/v4/apps/foundryvtt.yml +++ b/public/v4/apps/foundryvtt.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: felddy/foundryvtt:$$cap_foundry_version + image: felddy/foundryvtt:$$cap_app_version environment: FOUNDRY_USERNAME: $$cap_foundry_username FOUNDRY_PASSWORD: $$cap_foundry_password @@ -16,7 +16,7 @@ services: - $$cap_appname:/data caproverOneClickApp: variables: - - id: $$cap_foundry_version + - id: $$cap_app_version label: Foundry VTT Version defaultValue: '0.8.9' description: Check out their Docker page for the valid tags https://hub.docker.com/r/felddy/foundryvtt/tags diff --git a/public/v4/apps/freshrss.yml b/public/v4/apps/freshrss.yml index 5c0938aa0..083f00032 100644 --- a/public/v4/apps/freshrss.yml +++ b/public/v4/apps/freshrss.yml @@ -12,7 +12,7 @@ services: caproverExtra: notExposeAsWebApp: true '$$cap_appname': - image: freshrss/freshrss:$$cap_version + image: freshrss/freshrss:$$cap_app_version environment: TZ: '$$cap_tz' CRON_MIN: '$$cap_cron' @@ -50,7 +50,7 @@ services: containerHttpPort: '80' caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: FreshRSS Version defaultValue: '1.20.0' description: Check out their Docker page for the valid tags https://hub.docker.com/r/freshrss/freshrss/tags diff --git a/public/v4/apps/fusionauth.yml b/public/v4/apps/fusionauth.yml index 9443c8b7e..f3f0eabd8 100644 --- a/public/v4/apps/fusionauth.yml +++ b/public/v4/apps/fusionauth.yml @@ -28,7 +28,7 @@ services: caproverExtra: containerHttpPort: $$cap_container_search_port $$cap_appname-fusionauth: - image: fusionauth/fusionauth-app:$$cap_fusionauth_version + image: fusionauth/fusionauth-app:$$cap_app_version depends_on: - $$cap_appname-db - $$cap_appname-elasticsearch @@ -56,7 +56,7 @@ caproverOneClickApp: label: Database password description: '' validRegex: /.{1,}/ - - id: $$cap_fusionauth_version + - id: $$cap_app_version label: FusionAuth Version defaultValue: 1.7.2 description: 'See tags at: https://hub.docker.com/r/fusionauth/fusionauth-app/tags' diff --git a/public/v4/apps/ghost-only.yml b/public/v4/apps/ghost-only.yml index b6c01cd03..357edb351 100644 --- a/public/v4/apps/ghost-only.yml +++ b/public/v4/apps/ghost-only.yml @@ -18,7 +18,7 @@ services: GHOST_SMTP_PORT: $$cap_ghost_smtp_port GHOST_SMTP_USER: $$cap_ghost_smtp_user GHOST_SMTP_PROTOCOL: $$cap_ghost_smtp_protocol - image: bitnami/ghost:$$cap_ghost_version + image: bitnami/ghost:$$cap_app_version restart: always volumes: - $$cap_appname-data:/bitnami/ghost @@ -28,7 +28,7 @@ caproverOneClickApp: variables: - defaultValue: 5.2.2 description: Check out their Docker page for the valid tags https://hub.docker.com/r/bitnami/ghost/tags - id: $$cap_ghost_version + id: $$cap_app_version label: Ghost Version validRegex: /^([^\s^\/])+$/ - description: DB Host diff --git a/public/v4/apps/ghost.yml b/public/v4/apps/ghost.yml index b5e5eef43..9020fb919 100644 --- a/public/v4/apps/ghost.yml +++ b/public/v4/apps/ghost.yml @@ -20,7 +20,7 @@ services: GHOST_SMTP_PORT: $$cap_ghost_smtp_port GHOST_SMTP_USER: $$cap_ghost_smtp_user GHOST_SMTP_PROTOCOL: $$cap_ghost_smtp_protocol - image: bitnami/ghost:$$cap_ghost_version + image: bitnami/ghost:$$cap_app_version restart: always volumes: - $$cap_appname-data:/bitnami/ghost @@ -45,7 +45,7 @@ caproverOneClickApp: variables: - defaultValue: 5.2.2 description: Check out their Docker page for the valid tags https://hub.docker.com/r/bitnami/ghost/tags - id: $$cap_ghost_version + id: $$cap_app_version label: Ghost Version validRegex: /^([^\s^\/])+$/ - defaultValue: admin diff --git a/public/v4/apps/ghostfolio.yml b/public/v4/apps/ghostfolio.yml index 98eace82a..78f8ac617 100644 --- a/public/v4/apps/ghostfolio.yml +++ b/public/v4/apps/ghostfolio.yml @@ -3,7 +3,7 @@ services: $$cap_appname: caproverExtra: containerHttpPort: '3333' - image: ghostfolio/ghostfolio:$$cap_GHOSTFOLIO_VERSION + image: ghostfolio/ghostfolio:$$cap_Gapp_version hostname: $$cap_appname.$$cap_root_domain environment: NODE_ENV: $$cap_NODE_ENV @@ -45,7 +45,7 @@ caproverOneClickApp: description: Open Source Wealth Management Software documentation: See https://ghostfol.io variables: - - id: $$cap_GHOSTFOLIO_VERSION + - id: $$cap_app_version label: Ghostfolio Version description: Check out their valid tags at https://hub.docker.com/r/ghostfolio/ghostfolio/tags defaultValue: '1.205.1' diff --git a/public/v4/apps/gitea.yml b/public/v4/apps/gitea.yml index 9f9a324e0..2a6ba4d14 100644 --- a/public/v4/apps/gitea.yml +++ b/public/v4/apps/gitea.yml @@ -15,7 +15,7 @@ services: $$cap_appname: depends_on: - $$cap_appname-db - image: gitea/gitea:$$cap_gitea_version + image: gitea/gitea:$$cap_app_version volumes: - $$cap_appname-data:/data restart: always @@ -34,7 +34,7 @@ caproverOneClickApp: defaultValue: $$cap_gen_random_hex(10) description: '' validRegex: /.{1,}/ - - id: $$cap_gitea_version + - id: $$cap_app_version label: Gitea Version defaultValue: '1.21.1' description: Check out their Docker page for the valid tags https://hub.docker.com/r/gitea/gitea/tags diff --git a/public/v4/apps/gitlab-ce.yml b/public/v4/apps/gitlab-ce.yml index 936e13d28..065d3de89 100644 --- a/public/v4/apps/gitlab-ce.yml +++ b/public/v4/apps/gitlab-ce.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: gitlab/gitlab-ce:$$cap_gitlab_version + image: gitlab/gitlab-ce:$$cap_app_version hostname: $$cap_appname.$$cap_root_domain volumes: - '$$cap_appname-config: /etc/gitlab' @@ -12,7 +12,7 @@ services: GITLAB_OMNIBUS_CONFIG: $$cap_gitlab_omnibus_config caproverOneClickApp: variables: - - id: $$cap_gitlab_version + - id: $$cap_app_version label: Gitlab-CE Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/gitlab/gitlab-ce/tags defaultValue: 11.9.8-ce.0 diff --git a/public/v4/apps/gitlab-runner.yml b/public/v4/apps/gitlab-runner.yml index 5a2ad9a81..62b7e07b2 100644 --- a/public/v4/apps/gitlab-runner.yml +++ b/public/v4/apps/gitlab-runner.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: gitlab/gitlab-runner:$$cap_gitlab-runner_version + image: gitlab/gitlab-runner:$$cap_app_version volumes: - $$cap_appname-data:/etc/gitlab-runner - /var/run/docker.sock:/var/run/docker.sock @@ -10,7 +10,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_gitlab-runner_version + - id: $$cap_app_version label: GitLab-Runner Version defaultValue: v11.11.0 description: Check out their Docker page for the valid tags https://hub.docker.com/r/gitlab/gitlab-runner/tags diff --git a/public/v4/apps/glitchtip.yml b/public/v4/apps/glitchtip.yml index 1ceda45c5..94683b9bd 100644 --- a/public/v4/apps/glitchtip.yml +++ b/public/v4/apps/glitchtip.yml @@ -33,7 +33,7 @@ services: caproverExtra: containerHttpPort: '8000' dockerfileLines: - - FROM glitchtip/glitchtip:$$cap_GLITCHTIP_VERSION + - FROM glitchtip/glitchtip:$$cap_app_version - CMD ./manage.py migrate && ./bin/start.sh $$cap_appname-worker: depends_on: @@ -50,12 +50,12 @@ services: CELERY_WORKER_CONCURRENCY: $$cap_CELERY_WORKER_CONCURRENCY caproverExtra: dockerfileLines: - - FROM glitchtip/glitchtip:$$cap_GLITCHTIP_VERSION + - FROM glitchtip/glitchtip:$$cap_app_version - CMD ./bin/run-celery-with-beat.sh notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_GLITCHTIP_VERSION + - id: $$cap_app_version label: GlitchTip Version defaultValue: 'v3.1.2' description: Check out their Docker page for the valid tags https://hub.docker.com/r/glitchtip/glitchtip/tags diff --git a/public/v4/apps/gogostv2.yml b/public/v4/apps/gogostv2.yml index 2fa079b5f..90aeea485 100644 --- a/public/v4/apps/gogostv2.yml +++ b/public/v4/apps/gogostv2.yml @@ -13,7 +13,7 @@ services: websocketSupport: true dockerfileLines: - # Specify the base image for the app - - FROM ubuntu:$$cap_gost_ubuntuversion + - FROM ubuntu:$$cap_app_version - # Set environment variables - ARG UBUNTU_TIMEZONE - ENV TZ=${UBUNTU_TIMEZONE} @@ -33,7 +33,7 @@ services: - ENTRYPOINT ["/bin/bash", "/start.sh"] caproverOneClickApp: variables: - - id: $$cap_gost_ubuntuversion + - id: $$cap_app_version label: Ubuntu Version description: Check out https://hub.docker.com/_/ubuntu/tags for valid tags. defaultValue: 22.04 diff --git a/public/v4/apps/gogostv3.yml b/public/v4/apps/gogostv3.yml index e096d16d1..52864e874 100644 --- a/public/v4/apps/gogostv3.yml +++ b/public/v4/apps/gogostv3.yml @@ -12,7 +12,7 @@ services: websocketSupport: true dockerfileLines: - # Specify the base image for the app - - FROM alpine:$$cap_gost_alpineversion + - FROM alpine:$$cap_app_version - # Install necessary packages - RUN apk update && apk add --no-cache wget tar bash yq-go iptables - # Make directories needed @@ -35,7 +35,7 @@ services: - ENTRYPOINT ["/bin/bash", "/start.sh"] caproverOneClickApp: variables: - - id: $$cap_gost_alpineversion + - id: $$cap_app_version label: Alpine Linux Version description: Check out https://hub.docker.com/_/alpine/tags for valid tags. defaultValue: 3.20.1 diff --git a/public/v4/apps/gotenberg.yml b/public/v4/apps/gotenberg.yml index 787ed997a..e413b115d 100644 --- a/public/v4/apps/gotenberg.yml +++ b/public/v4/apps/gotenberg.yml @@ -83,7 +83,7 @@ services: --log-level=$LOG_LEVEL --gotenberg-graceful-shutdown-duration=$GRACEFUL_SHUTDOWN_DURATION environment: - VERSION: $$cap_GOTENBERG_VERSION + VERSION: $$cap_app_version API_PORT: $$cap_GOTENBERG_API_PORT API_TIMEOUT: $$cap_GOTENBERG_API_TIMEOUT API_ROOT_PATH: $$cap_GOTENBERG_API_ROOT_PATH @@ -135,7 +135,7 @@ caproverOneClickApp: You can access it at `http://$$cap_appname.$$cap_root_domain` If you prefer not to expose it, you can change it in the **HTTP Settings** of `$$cap_appname`. variables: - - id: $$cap_GOTENBERG_VERSION + - id: $$cap_app_version label: General | Version description: Check out their valid tags at https://hub.docker.com/r/gotenberg/gotenberg/tags defaultValue: 7 diff --git a/public/v4/apps/gotify.yml b/public/v4/apps/gotify.yml index 3ec7ef483..77b906b95 100644 --- a/public/v4/apps/gotify.yml +++ b/public/v4/apps/gotify.yml @@ -1,13 +1,13 @@ captainVersion: 4 services: '$$cap_appname': - image: gotify/server:$$cap_version + image: gotify/server:$$cap_app_version volumes: - '$$cap_appname-data:/app/data' - '$$cap_appname-config:/etc/gotify/' caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: Gotify Version defaultValue: '2.1.7' description: Check out their Docker page for the valid tags https://hub.docker.com/r/gotify/server/tags diff --git a/public/v4/apps/grafana.yml b/public/v4/apps/grafana.yml index 61acf8689..6d4709d53 100644 --- a/public/v4/apps/grafana.yml +++ b/public/v4/apps/grafana.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: grafana/grafana:$$cap_version + image: grafana/grafana:$$cap_app_version restart: always volumes: - $$cap_appname-config:/etc/grafana @@ -13,7 +13,7 @@ caproverOneClickApp: - label: Grafana Docker Hash defaultValue: 7.4.3 description: Find versions on DockerHub https://hub.docker.com/r/grafana/grafana/tags - id: $$cap_version + id: $$cap_app_version instructions: end: Grafana is now starting. You can log in with the default login/password of admin/admin. start: 'Read more about Grafana: https://grafana.com/' diff --git a/public/v4/apps/grocy.yml b/public/v4/apps/grocy.yml index 5bcbe8f16..a767ae7d2 100644 --- a/public/v4/apps/grocy.yml +++ b/public/v4/apps/grocy.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: linuxserver/grocy:$$cap_grocy_version + image: linuxserver/grocy:$$cap_app_version environment: TZ: $$cap_tz PUID: $$cap_puid @@ -10,7 +10,7 @@ services: - $$cap_appname-config:/config caproverOneClickApp: variables: - - id: $$cap_grocy_version + - id: $$cap_app_version label: Grocy Version defaultValue: v2.7.1-ls58 description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/grocy/tags diff --git a/public/v4/apps/guacamole.yml b/public/v4/apps/guacamole.yml index 835450655..59791870e 100644 --- a/public/v4/apps/guacamole.yml +++ b/public/v4/apps/guacamole.yml @@ -13,7 +13,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' $$cap_appname-guacd: - image: guacamole/guacd:$$cap_guacd_version + image: guacamole/guacd:$$cap_app_version restart: always caproverExtra: notExposeAsWebApp: 'true' @@ -42,7 +42,7 @@ caproverOneClickApp: defaultValue: '1.3.0' description: Check out their Docker page for the valid tags https://hub.docker.com/r/guacamole/guacamole/tags validRegex: /^([^\s^\/])+$/ - - id: $$cap_guacd_version + - id: $$cap_app_version label: Guacd Version defaultValue: '1.3.0' description: Check out their Docker page for the valid tags https://hub.docker.com/r/guacamole/guacd/tags diff --git a/public/v4/apps/hasura-only.yml b/public/v4/apps/hasura-only.yml index 15f80f70b..24264085a 100644 --- a/public/v4/apps/hasura-only.yml +++ b/public/v4/apps/hasura-only.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: hasura/graphql-engine:$$cap_hasura_version + image: hasura/graphql-engine:$$cap_app_version restart: always environment: HASURA_GRAPHQL_DATABASE_URL: $$cap_database_url @@ -14,7 +14,7 @@ caproverOneClickApp: variables: - defaultValue: v1.2.2 description: Check out their GitHub page for their latest version https://github.com/hasura/graphql-engine - id: $$cap_hasura_version + id: $$cap_app_version label: Hasura Version validRegex: /^([^\s^\/])+$/ - description: The admin secret gives you access to the console. diff --git a/public/v4/apps/hasura.yml b/public/v4/apps/hasura.yml index b78878701..ef2ef9fa3 100644 --- a/public/v4/apps/hasura.yml +++ b/public/v4/apps/hasura.yml @@ -13,7 +13,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' $$cap_appname: - image: hasura/graphql-engine:$$cap_hasura_version + image: hasura/graphql-engine:$$cap_app_version depends_on: - $$cap_appname-db restart: always @@ -28,7 +28,7 @@ caproverOneClickApp: variables: - defaultValue: v1.2.2 description: Check out their GitHub page for their latest version https://github.com/hasura/graphql-engine - id: $$cap_hasura_version + id: $$cap_app_version label: Hasura Version validRegex: /^([^\s^\/])+$/ - defaultValue: '12' diff --git a/public/v4/apps/healthchecks.yml b/public/v4/apps/healthchecks.yml index 9b480098f..bd6d8b64c 100644 --- a/public/v4/apps/healthchecks.yml +++ b/public/v4/apps/healthchecks.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: # HealthChecks $$cap_appname: - image: healthchecks/healthchecks:$$cap_hc_version + image: healthchecks/healthchecks:$$cap_app_version restart: always environment: DB: postgres @@ -32,7 +32,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_hc_version + - id: $$cap_app_version label: hc Manifest digest defaultValue: 'v1.25.0' description: Find on https://hub.docker.com/r/healthchecks/healthchecks/tags diff --git a/public/v4/apps/hedgedoc.yml b/public/v4/apps/hedgedoc.yml index 15606e415..37e28e589 100644 --- a/public/v4/apps/hedgedoc.yml +++ b/public/v4/apps/hedgedoc.yml @@ -3,7 +3,7 @@ services: '$$cap_appname': depends_on: - $$cap_appname-db - image: quay.io/hedgedoc/hedgedoc:$$cap_version + image: quay.io/hedgedoc/hedgedoc:$$cap_app_version environment: CMD_DB_URL: postgres://$$cap_dbuser:$$cap_dbpass@srv-captain--$$cap_appname-db:5432/$$cap_dbname CMD_DOMAIN: $$cap_appname.$$cap_root_domain @@ -28,7 +28,7 @@ services: caproverOneClickApp: variables: # app variables - - id: '$$cap_version' + - id: $$cap_app_version label: HedgeDoc Version defaultValue: '1.7.2' description: Make sure to use the latest release from https://hedgedoc.org/latest-release diff --git a/public/v4/apps/heimdall.yml b/public/v4/apps/heimdall.yml index 513403b39..b69944ee3 100644 --- a/public/v4/apps/heimdall.yml +++ b/public/v4/apps/heimdall.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: linuxserver/heimdall:$$cap_heimdall_version + image: linuxserver/heimdall:$$cap_app_version environment: TZ: $$cap_tz hostname: $$cap_appname.$$cap_root_domain @@ -13,7 +13,7 @@ caproverOneClickApp: label: Timezone description: This is the timezone for the application, find yours at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones defaultValue: Europe/Brussels - - id: $$cap_heimdall_version + - id: $$cap_app_version label: Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/heimdall/tags defaultValue: 'version-2.2.2' diff --git a/public/v4/apps/homarr.yml b/public/v4/apps/homarr.yml index e03fa2bb7..12e530f9e 100644 --- a/public/v4/apps/homarr.yml +++ b/public/v4/apps/homarr.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: ghcr.io/ajnart/homarr:$$cap_homarr_version + image: ghcr.io/ajnart/homarr:$$cap_app_version volumes: - $$cap_appname-configs:/app/data/configs - $$cap_appname-icons:/app/public/icons @@ -25,7 +25,7 @@ caproverOneClickApp: Homarr has been successfully deployed! It might take few moments before it's fully started. You can access it at http://$$cap_appname.$$cap_root_domain variables: - - id: $$cap_homarr_version + - id: $$cap_app_version label: Version Tag description: Check out their GitHub packages page for the valid tags https://github.com/ajnart/homarr/pkgs/container/homarr defaultValue: '0.10.1' diff --git a/public/v4/apps/homepage.yml b/public/v4/apps/homepage.yml index 363c4a4f3..9fa81cbbb 100644 --- a/public/v4/apps/homepage.yml +++ b/public/v4/apps/homepage.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: ghcr.io/gethomepage/homepage:$$cap_homepage_version + image: ghcr.io/gethomepage/homepage:$$cap_app_version environment: - PUID=$$cap_puid - PGID=$$cap_guid @@ -27,7 +27,7 @@ caproverOneClickApp: defaultValue: '1000' description: Group ID that the process uses, run (id $group) in your instance to see the id. validRegex: /.{1,}/ - - id: $$cap_homepage_version + - id: $$cap_app_version label: Homepage Version defaultValue: v0.8.7 description: Check out their GitHub packages page for the valid tags https://github.com/gethomepage/homepage/releases diff --git a/public/v4/apps/humhub.yml b/public/v4/apps/humhub.yml index dfa5adad0..18765362a 100644 --- a/public/v4/apps/humhub.yml +++ b/public/v4/apps/humhub.yml @@ -23,7 +23,7 @@ services: HUMHUB_DB_PASSWORD: $$cap_mysql_passwd HUMHUB_HOST: $$cap_appname.$$cap_root_domain HUMHUB_PROTO: https - image: mriedmann/humhub:$$cap_humhub_version + image: mriedmann/humhub:$$cap_app_version restart: always volumes: - '$$cap_appname-config:/var/www/localhost/htdocs/protected/config' @@ -47,7 +47,7 @@ caproverOneClickApp: description: Password to connect to the database defaultValue: $$cap_gen_random_hex(16) id: $$cap_mysql_passwd - - id: $$cap_humhub_version + - id: $$cap_app_version label: Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/mriedmann/humhub/tags defaultValue: '1.6.2' diff --git a/public/v4/apps/imagor-local.yml b/public/v4/apps/imagor-local.yml index f25e34163..a6065b7b6 100644 --- a/public/v4/apps/imagor-local.yml +++ b/public/v4/apps/imagor-local.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: shumc/imagor:$$cap_imagor_version + image: shumc/imagor:$$cap_app_version volumes: - $$cap_appname-data:/mnt/data environment: @@ -14,7 +14,7 @@ services: restart: always caproverOneClickApp: variables: - - id: $$cap_imagor_version + - id: $$cap_app_version label: App Version description: Check out their Docker page for the valid tags https://hub.docker.com/r/shumc/imagor/tags defaultValue: '0.8.11' diff --git a/public/v4/apps/imagor-s3.yml b/public/v4/apps/imagor-s3.yml index 997ea63fb..2a626401e 100644 --- a/public/v4/apps/imagor-s3.yml +++ b/public/v4/apps/imagor-s3.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: shumc/imagor:$$cap_imagor_version + image: shumc/imagor:$$cap_app_version environment: PORT: 80 IMAGOR_UNSAFE: $$cap_env_imagor_unsafe @@ -21,7 +21,7 @@ services: restart: always caproverOneClickApp: variables: - - id: $$cap_imagor_version + - id: $$cap_app_version label: App Version description: Check out their Docker page for the valid tags https://hub.docker.com/r/shumc/imagor/tags defaultValue: '0.8.11' diff --git a/public/v4/apps/imgproxy.yml b/public/v4/apps/imgproxy.yml index 60cfe4be2..1795fc59b 100644 --- a/public/v4/apps/imgproxy.yml +++ b/public/v4/apps/imgproxy.yml @@ -13,7 +13,7 @@ caproverOneClickApp: You can your configuration if necessary. For more info visit https://docs.imgproxy.net/. variables: - defaultValue: 3.6.0 - id: $$cap_imgproxy_version + id: $$cap_app_version label: imgproxy Version validRegex: /^(?:2|3)(?:\.[0-9]+){0,2}$/ - defaultValue: $$cap_gen_random_hex(128) @@ -32,5 +32,5 @@ services: IMGPROXY_BIND: 0.0.0.0:5000 IMGPROXY_KEY: $$cap_imgproxy_key IMGPROXY_SALT: $$cap_imgproxy_salt - image: darthsim/imgproxy:v$$cap_imgproxy_version + image: darthsim/imgproxy:v$$cap_app_version restart: unless-stopped diff --git a/public/v4/apps/immich.yml b/public/v4/apps/immich.yml index 786780726..2254cb918 100644 --- a/public/v4/apps/immich.yml +++ b/public/v4/apps/immich.yml @@ -4,7 +4,7 @@ services: $$cap_appname: caproverExtra: dockerfileLines: - - FROM ghcr.io/immich-app/immich-server:$$cap_version + - FROM ghcr.io/immich-app/immich-server:$$cap_app_version containerHttpPort: 3001 environment: DB_PASSWORD: $$cap_app_db_pass @@ -24,7 +24,7 @@ services: $$cap_appname-machine-learning: caproverExtra: notExposeAsWebApp: 'true' - image: ghcr.io/immich-app/immich-machine-learning:$$cap_version + image: ghcr.io/immich-app/immich-machine-learning:$$cap_app_version environment: DB_PASSWORD: $$cap_app_db_pass DB_USERNAME: $$cap_app_db_user @@ -64,7 +64,7 @@ caproverOneClickApp: On your first visit it will ask for email and password to set up the admin user. Remember to change the default Nginx configuration and increasing the 'client_max_body_size' value if you expect to backup files bigger than 500MB. They will fail to upload if you don't. variables: - label: Immich version - id: $$cap_version + id: $$cap_app_version description: Check out their valid tags at https://github.com/immich-app/immich/releases defaultValue: v1.108.0 - label: Immich redis version diff --git a/public/v4/apps/influxdb.yml b/public/v4/apps/influxdb.yml index bbed29aec..d2d11bbd1 100644 --- a/public/v4/apps/influxdb.yml +++ b/public/v4/apps/influxdb.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname-db: - image: influxdb:$$cap_influx_version + image: influxdb:$$cap_app_version volumes: - $$cap_appname-db-data:/var/lib/influxdb restart: always @@ -23,7 +23,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_influx_version + - id: $$cap_app_version label: InfluxDb Version defaultValue: '1.8' description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/influxdb/tags/ diff --git a/public/v4/apps/influxdb2.yml b/public/v4/apps/influxdb2.yml index fda668c5f..3dabe955c 100644 --- a/public/v4/apps/influxdb2.yml +++ b/public/v4/apps/influxdb2.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: influxdb:$$cap_influx_version + image: influxdb:$$cap_app_version volumes: - $$cap_appname-data:/var/lib/influxdb2 - $$cap_appname-configs:/etc/influxdb2 @@ -17,7 +17,7 @@ services: containerHttpPort: '8086' caproverOneClickApp: variables: - - id: $$cap_influx_version + - id: $$cap_app_version label: InfluxDb Version defaultValue: '2.0' description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/influxdb/tags/ diff --git a/public/v4/apps/invidious.yml b/public/v4/apps/invidious.yml index 0d12a99f6..6527ae7eb 100644 --- a/public/v4/apps/invidious.yml +++ b/public/v4/apps/invidious.yml @@ -14,7 +14,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' $$cap_appname: - image: quay.io/invidious/invidious$$cap_version + image: quay.io/invidious/invidious$$cap_app_version restart: always environment: # Adapted from ./config/config.yml @@ -36,7 +36,7 @@ services: caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: Invidious Version defaultValue: '@sha256:38d9630df74d77e9b704c0dbac10c626ef0f8ccb75fa0457e546018e7227b215' description: Check out their Quay.io page for the valid tags https://quay.io/repository/invidious/invidious?tab=tags. If you want to use the latest tag (or a versioned release, if available), start with a colon (e.g. :latest). diff --git a/public/v4/apps/invoiceninja.yml b/public/v4/apps/invoiceninja.yml index 759d4c10c..bb3cdf200 100644 --- a/public/v4/apps/invoiceninja.yml +++ b/public/v4/apps/invoiceninja.yml @@ -20,7 +20,7 @@ caproverOneClickApp: - Changed the db backup system to use automysqlbackup variables: - - id: $$cap_invoiceninja_VERSION + - id: $$cap_app_version label: Invoice Ninja Version defaultValue: '5.8.52' description: It's a good idea to check for breaking changes between versions. Check current version [on GitHub](https://github.com/invoiceninja/dockerfiles/releases) @@ -111,7 +111,7 @@ services: caproverExtra: notExposeAsWebApp: true dockerfileLines: - - FROM invoiceninja/invoiceninja:$$cap_invoiceninja_VERSION + - FROM invoiceninja/invoiceninja:$$cap_app_version - USER root - RUN mkdir -p /var/www/app/public /var/www/app/storage - RUN chown 1500:1500 /var/www/app/* @@ -142,7 +142,7 @@ services: # Workaround for hard-coded container name in nginx config dockerfileLines: - FROM nginx:1.21 - - ADD https://raw.githubusercontent.com/invoiceninja/dockerfiles/$$cap_invoiceninja_VERSION/config/nginx/in-vhost.conf /etc/nginx/templates/in-vhost.conf.template + - ADD https://raw.githubusercontent.com/invoiceninja/dockerfiles/$$cap_app_version/config/nginx/in-vhost.conf /etc/nginx/templates/in-vhost.conf.template - RUN sed -i 's/app:9000/${APP_CONTAINER}/g' /etc/nginx/templates/in-vhost.conf.template $$cap_appname-db-backup: diff --git a/public/v4/apps/iredmail.yml b/public/v4/apps/iredmail.yml index 1f69f62d2..7fecfe917 100644 --- a/public/v4/apps/iredmail.yml +++ b/public/v4/apps/iredmail.yml @@ -159,7 +159,7 @@ services: - EXPOSE 80 443 25 465 587 110 995 143 993 containerHttpPort: '80' environment: - VERSION: $$cap_iredmail_version + VERSION: $$cap_app_version MLMMJADMIN_API_TOKEN: $$cap_gen_random_hex(32) ROUNDCUBE_DES_KEY: $$cap_gen_random_hex(24) FIRST_MAIL_DOMAIN: $$cap_root_domain @@ -168,7 +168,7 @@ services: FIRST_MAIL_DOMAIN_ADMIN_PASSWORD: $$cap_iredmail_default_password caproverOneClickApp: variables: - - id: $$cap_iredmail_version + - id: $$cap_app_version label: iRedMail version tag description: >- Check out their Docker page for the valid tags diff --git a/public/v4/apps/jellyfin.yml b/public/v4/apps/jellyfin.yml index d9075c34b..b7b01b816 100644 --- a/public/v4/apps/jellyfin.yml +++ b/public/v4/apps/jellyfin.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: ghcr.io/linuxserver/jellyfin:$$cap_jf_version + image: ghcr.io/linuxserver/jellyfin:$$cap_app_version environment: PUID: $$cap_puid PGID: $$cap_pgid @@ -13,7 +13,7 @@ services: containerHttpPort: '8096' caproverOneClickApp: variables: - - id: $$cap_jf_version + - id: $$cap_app_version label: Jellyfin Version defaultValue: '10.9.11' description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/jellyfin/tags diff --git a/public/v4/apps/jenkins.yml b/public/v4/apps/jenkins.yml index 9c73fc30b..4bcac5500 100644 --- a/public/v4/apps/jenkins.yml +++ b/public/v4/apps/jenkins.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: jenkins/jenkins:$$cap_jenkins_version + image: jenkins/jenkins:$$cap_app_version restart: always volumes: - $$cap_appname-jenkins-home:/var/jenkins_home @@ -9,7 +9,7 @@ services: containerHttpPort: '8080' caproverOneClickApp: variables: - - id: $$cap_jenkins_version + - id: $$cap_app_version label: Jenkins Version defaultValue: lts-jdk11 description: Check out their Docker page for the valid tags https://hub.docker.com/r/jenkins/jenkins/tags diff --git a/public/v4/apps/jitsi.yml b/public/v4/apps/jitsi.yml index e6e0d77a0..e2136a454 100644 --- a/public/v4/apps/jitsi.yml +++ b/public/v4/apps/jitsi.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname-web: - image: jitsi/web:$$cap_tag_version + image: jitsi/web:$$cap_app_version restart: unless-stopped ports: - $$cap_https_port:443 @@ -50,7 +50,7 @@ services: JIBRI_STRIP_DOMAIN_JID: muc JIBRI_LOGS_DIR: /config/logs $$cap_appname-prosody: - image: jitsi/prosody:$$cap_tag_version + image: jitsi/prosody:$$cap_app_version restart: unless-stopped expose: - '5222' @@ -101,7 +101,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' $$cap_appname-jicofo: - image: jitsi/jicofo:$$cap_tag_version + image: jitsi/jicofo:$$cap_app_version restart: unless-stopped volumes: - $$cap_appname-jicofo:/config @@ -150,7 +150,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' $$cap_appname-jvb: - image: jitsi/jvb:$$cap_tag_version + image: jitsi/jvb:$$cap_app_version restart: unless-stopped ports: - $$cap_jvb_udp:$$cap_jvb_udp @@ -206,7 +206,7 @@ caproverOneClickApp: - label: Docker tag version description: 'You can check the version in Docker Hub: https://hub.docker.com/r/jitsi/web/tags' defaultValue: '4416' - id: $$cap_tag_version + id: $$cap_app_version - label: HTTP Port description: This is the HTTP port to access Jitsi defaultValue: '8000' diff --git a/public/v4/apps/joomla.yml b/public/v4/apps/joomla.yml index 323b5d522..175fdddb1 100644 --- a/public/v4/apps/joomla.yml +++ b/public/v4/apps/joomla.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname-joomla: - image: joomla:$$cap_joomla_version + image: joomla:$$cap_app_version volumes: - $$cap_appname-joomla-data:/var/www/html restart: always @@ -27,7 +27,7 @@ caproverOneClickApp: label: Database Password description: '' validRegex: /.{1,}/ - - id: $$cap_joomla_version + - id: $$cap_app_version label: Joomla Version defaultValue: php7.3-apache description: Check out their Docker page for the valid tags https://hub.docker.com/_/joomla?tab=tags diff --git a/public/v4/apps/joplin.yml b/public/v4/apps/joplin.yml index bc4003dea..f61ca707c 100644 --- a/public/v4/apps/joplin.yml +++ b/public/v4/apps/joplin.yml @@ -15,7 +15,7 @@ services: notExposeAsWebApp: true $$cap_appname: - image: joplin/server:$$cap_joplin_tag + image: joplin/server:$$cap_app_version depends_on: - $$cap_appname-db restart: unless-stopped @@ -43,7 +43,7 @@ caproverOneClickApp: - id: $$cap_postgres_password label: Postgres Password defaultValue: cA3rS2oK - - id: $$cap_joplin_tag + - id: $$cap_app_version label: Joplin Version defaultValue: '1.7.2' description: Check out their docker page for the valid tags https://hub.docker.com/r/joplin/server/tags diff --git a/public/v4/apps/jsreport.yml b/public/v4/apps/jsreport.yml index 06a090fa7..768f5dd98 100644 --- a/public/v4/apps/jsreport.yml +++ b/public/v4/apps/jsreport.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: jsreport/jsreport:$$cap_jsreport_version + image: jsreport/jsreport:$$cap_app_version volumes: - $$cap_appname-data:/jsreport restart: always @@ -13,7 +13,7 @@ services: containerHttpPort: '5488' caproverOneClickApp: variables: - - id: $$cap_jsreport_version + - id: $$cap_app_version label: version defaultValue: 2.4.0-full description: Check out their Docker page for the valid tags https://hub.docker.com/r/jsreport/jsreport/tags diff --git a/public/v4/apps/kanboard-sqlite.yml b/public/v4/apps/kanboard-sqlite.yml index 2f4b67ed4..a480d80f5 100644 --- a/public/v4/apps/kanboard-sqlite.yml +++ b/public/v4/apps/kanboard-sqlite.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: '$$cap_appname': - image: kanboard/kanboard:$$cap_version + image: kanboard/kanboard:$$cap_app_version environment: PLUGIN_INSTALLER: $$cap_plugin_installer volumes: @@ -10,7 +10,7 @@ services: - '$$cap_appname-ssl:/etc/nginx/ssl' caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: Kanboard Version defaultValue: 'v1.2.15' description: Check out their Docker page for the valid tags https://hub.docker.com/r/kanboard/kanboard/tags diff --git a/public/v4/apps/keila.yml b/public/v4/apps/keila.yml index 3aca92c62..498c33937 100644 --- a/public/v4/apps/keila.yml +++ b/public/v4/apps/keila.yml @@ -3,7 +3,7 @@ services: $$cap_appname: caproverExtra: containerHttpPort: $$cap_KEILA_PORT - image: pentacent/keila:$$cap_KEILA_VERSION + image: pentacent/keila:$$cap_app_version environment: DB_URL: postgres://$$cap_POSTGRES_USER:$$cap_POSTGRES_PASSWORD@srv-captain--$$cap_appname-db/$$cap_POSTGRES_DATABASE DB_ENABLE_SSL: $$cap_KEILA_DB_ENABLE_SSL @@ -58,7 +58,7 @@ caproverOneClickApp: description: Free and open source email newsletter tool. documentation: https://www.keila.io/docs variables: - - id: $$cap_KEILA_VERSION + - id: $$cap_app_version label: Keila | Version Tag description: Check out their valid tags at https://hub.docker.com/r/pentacent/keila/tags defaultValue: '0.12.2' diff --git a/public/v4/apps/keycloak.yml b/public/v4/apps/keycloak.yml index ef8fbba3a..1f85b7719 100644 --- a/public/v4/apps/keycloak.yml +++ b/public/v4/apps/keycloak.yml @@ -22,14 +22,14 @@ services: caproverExtra: containerHttpPort: '8080' dockerfileLines: - - FROM quay.io/keycloak/keycloak:$$cap_keycloak_version as builder + - FROM quay.io/keycloak/keycloak:$$cap_app_version as builder - ENV KC_HEALTH_ENABLED=true - ENV KC_METRICS_ENABLED=false - ENV KC_FEATURES=token-exchange,recovery-codes - ENV KC_DB=postgres - RUN /opt/keycloak/bin/kc.sh build - - FROM quay.io/keycloak/keycloak:$$cap_keycloak_version + - FROM quay.io/keycloak/keycloak:$$cap_app_version - COPY --from=builder /opt/keycloak/ /opt/keycloak/ - WORKDIR /opt/keycloak - ENV KC_DB_URL=jdbc:postgresql://srv-captain--$$cap_appname-db/keycloak @@ -45,7 +45,7 @@ caproverOneClickApp: defaultValue: '16' description: Check out Keycloak DB page for any valid major tested https://www.keycloak.org/server/db validRegex: /^([^\s^\/])+$/ - - id: $$cap_keycloak_version + - id: $$cap_app_version label: Keycloak Version defaultValue: '26.0.2' description: v26.0.2 current as of 2024-10-24. Check out Keycloak Docker page for the valid tags https://quay.io/repository/keycloak/keycloak?tab=tags diff --git a/public/v4/apps/keydb.yml b/public/v4/apps/keydb.yml index 03b027194..c3c155562 100644 --- a/public/v4/apps/keydb.yml +++ b/public/v4/apps/keydb.yml @@ -8,12 +8,12 @@ services: KEYDB_PASSWORD: $$cap_keydb_password caproverExtra: dockerfileLines: - - FROM eqalpha/keydb:$$cap_keydb_architecture_v$$cap_keydb_version + - FROM eqalpha/keydb:$$cap_keydb_architecture_v$$cap_app_version - CMD exec keydb-server /etc/keydb/keydb.conf --server-threads 4 --requirepass "$KEYDB_PASSWORD" notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_keydb_version + - id: $$cap_app_version label: KeyDB Version description: 'Check out their Docker page for the valid tags: https://hub.docker.com/r/eqalpha/keydb/tags' defaultValue: '6.3.2' diff --git a/public/v4/apps/kibana.yml b/public/v4/apps/kibana.yml index 5c560fcdb..4d4dbd1ee 100644 --- a/public/v4/apps/kibana.yml +++ b/public/v4/apps/kibana.yml @@ -7,7 +7,7 @@ services: MONITORING_ENABLED: $$cap_MONITORING_ENABLED ELASTICSEARCH_HOSTS: $$cap_ELASTICSEARCH_HOSTS SERVER_PUBLICBASEURL: $$cap_SERVER_PUBLICBASEURL - image: docker.elastic.co/kibana/kibana:$$cap_version + image: docker.elastic.co/kibana/kibana:$$cap_app_version restart: always caproverExtra: containerHttpPort: '5601' @@ -16,7 +16,7 @@ caproverOneClickApp: - label: Kibana version defaultValue: 8.4.1 description: It's highly recommended that you don't use the latest tag but instead the major version you need. See https://hub.docker.com/_/kibana for a list of versions. - id: $$cap_version + id: $$cap_app_version - label: Default App id defaultValue: home description: The default app that is loaded when you visit Kibana. Defaults to home diff --git a/public/v4/apps/kimai2.yml b/public/v4/apps/kimai2.yml index d96570f76..c6535b22f 100644 --- a/public/v4/apps/kimai2.yml +++ b/public/v4/apps/kimai2.yml @@ -4,7 +4,7 @@ services: $$cap_appname-fpm: depends_on: - $$cap_appname-db - image: kimai/kimai2:$$cap_kimai_version + image: kimai/kimai2:$$cap_app_version restart: 'always' environment: ADMINMAIL: $$cap_kimai-adminmail @@ -41,7 +41,7 @@ services: restart: unless-stopped caproverOneClickApp: variables: - - id: $$cap_kimai_version + - id: $$cap_app_version label: Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/kimai/kimai2/tags defaultValue: 'fpm-1.15.2-prod' diff --git a/public/v4/apps/kutt.yml b/public/v4/apps/kutt.yml index 567f81daa..7a642edbd 100644 --- a/public/v4/apps/kutt.yml +++ b/public/v4/apps/kutt.yml @@ -3,7 +3,7 @@ services: $$cap_appname: caproverExtra: containerHttpPort: $$cap_KUTT_PORT - image: kutt/kutt:$$cap_KUTT_VERSION + image: kutt/kutt:$$cap_app_version environment: PORT: $$cap_KUTT_PORT SITE_NAME: $$cap_KUTT_SITE_NAME @@ -69,7 +69,7 @@ caproverOneClickApp: Kutt has been successfully deployed! It might take few moments before it's fully started. You can access it at `http://$$cap_appname.$$cap_root_domain`. variables: - - id: $$cap_KUTT_VERSION + - id: $$cap_app_version label: Version | Application description: Kutt's version. Check out their valid tags at https://hub.docker.com/r/kutt/kutt/tags defaultValue: v2.7.3 diff --git a/public/v4/apps/lago.yml b/public/v4/apps/lago.yml index 6f00f77e8..a181b743b 100644 --- a/public/v4/apps/lago.yml +++ b/public/v4/apps/lago.yml @@ -1,7 +1,8 @@ + captainVersion: 4 services: $$cap_appname: - image: getlago/front:$$cap_LAGO_VERSION + image: getlago/front:$$cap_app_version hostname: $$cap_appname.$$cap_root_domain environment: API_URL: http://$$cap_appname-api.$$cap_root_domain @@ -15,7 +16,7 @@ services: caproverExtra: containerHttpPort: $$cap_LAGO_API_PORT dockerfileLines: - - FROM getlago/api:$$cap_LAGO_VERSION + - FROM getlago/api:$$cap_app_version - CMD ["./scripts/start.sh"] hostname: $$cap_appname-api.$$cap_root_domain environment: @@ -52,7 +53,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' dockerfileLines: - - FROM getlago/api:$$cap_LAGO_VERSION + - FROM getlago/api:$$cap_app_version - CMD ["./scripts/start.worker.sh"] environment: LAGO_API_URL: http://$$cap_appname-api.$$cap_root_domain @@ -85,7 +86,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' dockerfileLines: - - FROM getlago/api:$$cap_LAGO_VERSION + - FROM getlago/api:$$cap_app_version - CMD ["./scripts/start.clock.sh"] environment: LAGO_API_URL: http://$$cap_appname-api.$$cap_root_domain @@ -141,7 +142,7 @@ caproverOneClickApp: description: Open source billing API for product-led SaaS documentation: https://doc.getlago.com/docs/guide/intro/welcome variables: - - id: $$cap_LAGO_VERSION + - id: $$cap_app_version label: General | Lago Version description: Check out their valid tags at https://hub.docker.com/r/getlago/api/tags defaultValue: v0.11.0-alpha diff --git a/public/v4/apps/languagetool.yml b/public/v4/apps/languagetool.yml index 9b098f763..17b3abb2e 100644 --- a/public/v4/apps/languagetool.yml +++ b/public/v4/apps/languagetool.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: erikvl87/languagetool:$$cap_version + image: erikvl87/languagetool:$$cap_app_version restart: always environment: langtool_languageModel: /ngrams # OPTIONAL: Using ngrams data @@ -14,7 +14,7 @@ services: containerHttpPort: 8010 caproverOneClickApp: variables: - - id: $$cap_version + - id: $$cap_app_version label: LanguageTool Version defaultValue: '6.1' description: Check out their docker page for the valid tags https://hub.docker.com/r/erikvl87/languagetool/tags diff --git a/public/v4/apps/leantime.yml b/public/v4/apps/leantime.yml index db1481322..1ca254fcd 100644 --- a/public/v4/apps/leantime.yml +++ b/public/v4/apps/leantime.yml @@ -13,7 +13,7 @@ services: - FROM mysql:8.0.32 - CMD ["--character-set-server=utf8", "--collation-server=utf8_unicode_ci"] $$cap_appname: - image: leantime/leantime:$$cap_leantime_ver + image: leantime/leantime:$$cap_app_version container_name: leantime environment: LEAN_APP_URL: https://$$cap_appname.$$cap_root_domain @@ -31,7 +31,7 @@ caproverOneClickApp: description: User password for the database instance. defaultValue: $$cap_gen_random_hex(16) validRegex: /^(?=.*\d).{10,}$/ - - id: $$cap_leantime_ver + - id: $$cap_app_version label: Leantime Version description: 'Check out their Docker page for the valid tags https://hub.docker.com/r/leantime/leantime' defaultValue: 2.3.6 diff --git a/public/v4/apps/libreddit.yml b/public/v4/apps/libreddit.yml index a0aea0d84..d62f431d7 100644 --- a/public/v4/apps/libreddit.yml +++ b/public/v4/apps/libreddit.yml @@ -1,13 +1,13 @@ captainVersion: 4 services: $$cap_appname: - image: libreddit/libreddit@$$cap_libreddit_version + image: libreddit/libreddit@$$cap_app_version restart: always caproverExtra: containerHttpPort: '8080' caproverOneClickApp: variables: - - id: $$cap_libreddit_version + - id: $$cap_app_version label: Libreddit Docker Image SHA Hash defaultValue: sha256:e79a5d6f6836b5a9351340433b1c26e8571ded943a5318f41ae939d314434c84 description: Check out their Docker page for the valid tags https://hub.docker.com/r/libreddit/libreddit/tags diff --git a/public/v4/apps/limesurvey.yml b/public/v4/apps/limesurvey.yml index 2a2f9ef14..5d0a9f6dc 100644 --- a/public/v4/apps/limesurvey.yml +++ b/public/v4/apps/limesurvey.yml @@ -17,13 +17,13 @@ services: documentation: Taken from https://registry.hub.docker.com/r/crramirez/limesurvey depends_on: - $$cap_appname-db - image: crramirez/limesurvey:$$cap_limesurvey_version + image: crramirez/limesurvey:$$cap_app_version volumes: - $$cap_appname-data:/app/upload restart: always caproverOneClickApp: variables: - - id: $$cap_limesurvey_version + - id: $$cap_app_version label: Limesurvey Version defaultValue: '3' description: https://registry.hub.docker.com/r/crramirez/limesurvey/tags diff --git a/public/v4/apps/linkding.yml b/public/v4/apps/linkding.yml index e290375fb..39ed18cd4 100644 --- a/public/v4/apps/linkding.yml +++ b/public/v4/apps/linkding.yml @@ -3,7 +3,7 @@ services: $$cap_appname: caproverExtra: containerHttpPort: 9090 - image: sissbruecker/linkding:$$cap_N8N_VERSION + image: sissbruecker/linkding:$$cap_app_version environment: LD_SUPERUSER_NAME: $$cap_LD_SUPERUSER_NAME LD_SUPERUSER_PASSWORD: $$cap_LD_SUPERUSER_PASSWORD @@ -22,7 +22,7 @@ caproverOneClickApp: linkding has been successfully deployed! It might take few moments before it's fully started. You can access it at `http://$$cap_appname.$$cap_root_domain` and set up your account. variables: - - id: $$cap_N8N_VERSION + - id: $$cap_app_version label: Application | linkding description: Check out their Docker page for the valid tags https://hub.docker.com/r/sissbruecker/linkding/tags defaultValue: '1.23.0' diff --git a/public/v4/apps/listmonk.yml b/public/v4/apps/listmonk.yml index 59a91981b..eb00ec3c2 100644 --- a/public/v4/apps/listmonk.yml +++ b/public/v4/apps/listmonk.yml @@ -26,7 +26,7 @@ services: caproverExtra: containerHttpPort: 9000 dockerfileLines: - - FROM listmonk/listmonk:$$cap_listmonk_version + - FROM listmonk/listmonk:$$cap_app_version - CMD yes | ./listmonk --install --idempotent && ./listmonk $$cap_listmonk_flags volumes: - $$cap_appname-data:/listmonk @@ -40,7 +40,7 @@ caproverOneClickApp: defaultValue: '14.1' description: Check out their Docker page for the valid tags https://hub.docker.com/_/postgres?tab=tags validRegex: /^([^\s^\/])+$/ - - id: $$cap_listmonk_version + - id: $$cap_app_version label: Listmonk Version defaultValue: 'v2.2.0' description: Check out their Docker page for the valid tags https://hub.docker.com/r/listmonk/listmonk/tags diff --git a/public/v4/apps/litestream.yml b/public/v4/apps/litestream.yml index b39fbda7e..bd9c326c4 100644 --- a/public/v4/apps/litestream.yml +++ b/public/v4/apps/litestream.yml @@ -3,7 +3,7 @@ services: $$cap_appname: caproverExtra: dockerfileLines: - - FROM litestream/litestream:$$cap_version + - FROM litestream/litestream:$$cap_app_version - RUN mkdir /config - |- RUN test -f /config/litestream.yml || echo -e "dbs:\n - path: $$cap_db_path\n replicas:\n - type: s3\n bucket: $$cap_bucket\n path: $$cap_dest_path\n endpoint: $$cap_endpoint_url\n access-key-id: $$cap_access_key_id\n secret-access-key: $$cap_secret_access_key" > /config/litestream.yml @@ -18,7 +18,7 @@ services: LITESTREAM_SECRET_ACCESS_KEY: $$cap_secret_access_key caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: Litestream Version defaultValue: '0.3' description: Check out their Docker page for the valid tags https://hub.docker.com/r/litestream/litestream/tags diff --git a/public/v4/apps/logzio-collector.yml b/public/v4/apps/logzio-collector.yml index 9dfe5a0fd..4846a2980 100644 --- a/public/v4/apps/logzio-collector.yml +++ b/public/v4/apps/logzio-collector.yml @@ -2,7 +2,7 @@ captainVersion: 4 version: 3.3 services: '$$cap_appname': - image: logzio/docker-collector-logs:$$cap_version + image: logzio/docker-collector-logs:$$cap_app_version volumes: - /var/run/docker.sock:/var/run/docker.sock - /var/lib/docker/containers:/var/lib/docker/containers @@ -13,7 +13,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: Logzio collector version defaultValue: '0.4.0' description: See https://hub.docker.com/r/logzio/docker-collector-logs/tags for a list of versions. diff --git a/public/v4/apps/lychee.yml b/public/v4/apps/lychee.yml index a7e052483..23afb964f 100644 --- a/public/v4/apps/lychee.yml +++ b/public/v4/apps/lychee.yml @@ -4,7 +4,7 @@ services: $$cap_appname: depends_on: - $$cap_appname-mariadb - image: lycheeorg/lychee:$$cap_lychee_version + image: lycheeorg/lychee:$$cap_app_version restart: unless-stopped environment: TZ: $$cap_tz @@ -40,7 +40,7 @@ caproverOneClickApp: label: Timezone description: This is the timezone for the application, find yours at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones defaultValue: Europe/Brussels - - id: $$cap_lychee_version + - id: $$cap_app_version label: Lychee Version defaultValue: 'v4.0.7' description: Check out their docker page for the valid tags https://hub.docker.com/r/lycheeorg/lychee/tags diff --git a/public/v4/apps/maildev.yml b/public/v4/apps/maildev.yml index f99261422..b93ab9eda 100644 --- a/public/v4/apps/maildev.yml +++ b/public/v4/apps/maildev.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: maildev/maildev:$$cap_maildev_version + image: maildev/maildev:$$cap_app_version ports: - $$cap_maildev_smtp_port:1025 volumes: @@ -17,7 +17,7 @@ services: containerHttpPort: '1080' caproverOneClickApp: variables: - - id: $$cap_maildev_version + - id: $$cap_app_version label: MailDev Version defaultValue: 2.1.0 description: Check out their Docker page for the valid tags https://hub.docker.com/r/maildev/maildev/tags diff --git a/public/v4/apps/mailtrain.yml b/public/v4/apps/mailtrain.yml index e5dcf1b26..7653e2226 100644 --- a/public/v4/apps/mailtrain.yml +++ b/public/v4/apps/mailtrain.yml @@ -27,7 +27,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' $$cap_appname: - image: mailtrain/mailtrain:$$cap_mailtrain_version + image: mailtrain/mailtrain:$$cap_app_version depends_on: - $$cap_appname-db - $$cap_appname-redis @@ -80,7 +80,7 @@ caproverOneClickApp: defaultValue: 4.4.0-rc11 description: Check out their Docker page for the valid tags https://hub.docker.com/_/mongo?tab=tags validRegex: /^([^\s^\/])+$/ - - id: $$cap_mailtrain_version + - id: $$cap_app_version label: Mailtrain Version defaultValue: latest description: Check out their Docker page for the valid tags https://hub.docker.com/r/mailtrain/mailtrain/tags diff --git a/public/v4/apps/mariadb.yml b/public/v4/apps/mariadb.yml index 62899f967..387cbfd4e 100644 --- a/public/v4/apps/mariadb.yml +++ b/public/v4/apps/mariadb.yml @@ -8,12 +8,12 @@ services: MYSQL_ROOT_PASSWORD: $$cap_db_pass caproverExtra: dockerfileLines: - - FROM mariadb:$$cap_mysql_version + - FROM mariadb:$$cap_app_version - CMD ["--character-set-server=$$cap_charset", "--collation-server=$$cap_collation", "--skip-character-set-client-handshake"] notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_mysql_version + - id: $$cap_app_version label: MariaDB Version defaultValue: '10.4' description: Check out their Docker page for the valid tags https://hub.docker.com/_/mariadb?tab=tags diff --git a/public/v4/apps/mastodon.yml b/public/v4/apps/mastodon.yml index 4b6d01ea6..ebd2cc51d 100644 --- a/public/v4/apps/mastodon.yml +++ b/public/v4/apps/mastodon.yml @@ -32,7 +32,7 @@ services: caproverExtra: containerHttpPort: '3000' dockerfileLines: - - FROM tootsuite/mastodon:$$cap_mastodon_version + - FROM tootsuite/mastodon:$$cap_app_version - CMD rm -f /mastodon/tmp/pids/server.pid; bundle exec rails db:setup; bundle exec rails s -b 0.0.0.0 -p 3000 # Streaming $$cap_appname-streaming: @@ -66,7 +66,7 @@ services: caproverExtra: containerHttpPort: '4000' dockerfileLines: - - FROM tootsuite/mastodon:$$cap_mastodon_version + - FROM tootsuite/mastodon:$$cap_app_version - CMD node ./streaming # Sidekiq $$cap_appname-sidekiq: @@ -99,7 +99,7 @@ services: - $$cap_appname-system:/mastodon/public/system caproverExtra: dockerfileLines: - - FROM tootsuite/mastodon:$$cap_mastodon_version + - FROM tootsuite/mastodon:$$cap_app_version - CMD bundle exec sidekiq notExposeAsWebApp: 'true' # PostgreSQL @@ -126,7 +126,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_mastodon_version + - id: $$cap_app_version label: Mastodon Version Tag description: You can use latest tag or check version builds on https://hub.docker.com/r/tootsuite/mastodon/tags defaultValue: v4.1 diff --git a/public/v4/apps/matomo.yml b/public/v4/apps/matomo.yml index 220060ccf..950b2188c 100644 --- a/public/v4/apps/matomo.yml +++ b/public/v4/apps/matomo.yml @@ -17,7 +17,7 @@ services: $$cap_appname: depends_on: - $$cap_appname-db - image: matomo:$$cap_matomo_version + image: matomo:$$cap_app_version restart: always volumes: - $$cap_appname-data:/var/www/html @@ -31,7 +31,7 @@ services: MATOMO_DATABASE_DBNAME: matomo caproverOneClickApp: variables: - - id: $$cap_matomo_version + - id: $$cap_app_version label: Matomo Version defaultValue: 4.2.1 description: Check out their docker page for the valid tags https://hub.docker.com/_/matomo?tab=tags diff --git a/public/v4/apps/matrix-conduit.yml b/public/v4/apps/matrix-conduit.yml index 746836d8a..ba224d400 100644 --- a/public/v4/apps/matrix-conduit.yml +++ b/public/v4/apps/matrix-conduit.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: matrixconduit/matrix-conduit:$$cap_conduit_version + image: matrixconduit/matrix-conduit:$$cap_app_version restart: unless-stopped environment: CONDUIT_SERVER_NAME: '$$cap_conduit_server_name' @@ -19,7 +19,7 @@ services: caproverOneClickApp: variables: - - id: '$$cap_conduit_version' + - id: '$$cap_app_version' label: Conduit Version defaultValue: 'v0.6.0' description: Check out their Docker page for the valid tags https://hub.docker.com/r/matrixconduit/matrix-conduit/tags diff --git a/public/v4/apps/matrix-synapse.yml b/public/v4/apps/matrix-synapse.yml index b1d3abc1e..2e6e8ff92 100644 --- a/public/v4/apps/matrix-synapse.yml +++ b/public/v4/apps/matrix-synapse.yml @@ -22,7 +22,7 @@ services: caproverExtra: containerHttpPort: '8008' dockerfileLines: - - FROM matrixdotorg/synapse:$$cap_synapse_version + - FROM matrixdotorg/synapse:$$cap_app_version - RUN mkdir /data/ - ENV SYNAPSE_SERVER_NAME=$$cap_appname.$$cap_root_domain - ENV SYNAPSE_REPORT_STATS=$$cap_synapse_stats @@ -36,7 +36,7 @@ services: caproverOneClickApp: variables: - - id: '$$cap_synapse_version' + - id: '$$cap_app_version' label: Synapse Version defaultValue: 'v1.63.1' description: Check out their Docker page for the valid tags https://hub.docker.com/r/matrixdotorg/synapse/tags diff --git a/public/v4/apps/mattermost-ee.yml b/public/v4/apps/mattermost-ee.yml index 5df42ca82..f933b5b43 100644 --- a/public/v4/apps/mattermost-ee.yml +++ b/public/v4/apps/mattermost-ee.yml @@ -12,7 +12,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' $$cap_appname: - image: mattermost/mattermost-enterprise-edition:$$cap_mattermost_version + image: mattermost/mattermost-enterprise-edition:$$cap_app_version depends_on: - $$cap_appname-db volumes: @@ -33,7 +33,7 @@ services: containerHttpPort: '8065' caproverOneClickApp: variables: - - id: $$cap_mattermost_version + - id: $$cap_app_version label: mattermost Docker Image tag. Use 'latest' for updated images. defaultValue: release-6.7 description: Check out their Docker page for the valid tags https://hub.docker.com/r/mattermost/mattermost-prod-app/tags diff --git a/public/v4/apps/mautic-only.yml b/public/v4/apps/mautic-only.yml index 742ee5b55..008967cc8 100644 --- a/public/v4/apps/mautic-only.yml +++ b/public/v4/apps/mautic-only.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: mautic/mautic:$$cap_mautic_version + image: mautic/mautic:$$cap_app_version volumes: - $$cap_appname-data:/var/www/html restart: always @@ -24,7 +24,7 @@ caproverOneClickApp: label: Database password description: 'Inform the database password' validRegex: /.{1,}/ - - id: $$cap_mautic_version + - id: $$cap_app_version label: Mautic Version defaultValue: 'v3' description: Check out their Docker page for the valid tags https://hub.docker.com/r/mautic/mautic/tags diff --git a/public/v4/apps/mautic.yml b/public/v4/apps/mautic.yml index 92d0c9715..e5120ee27 100644 --- a/public/v4/apps/mautic.yml +++ b/public/v4/apps/mautic.yml @@ -16,7 +16,7 @@ services: $$cap_appname: depends_on: - $$cap_appname-db - image: mautic/mautic:$$cap_mautic_version + image: mautic/mautic:$$cap_app_version volumes: - $$cap_appname-config:/var/www/html/config - $$cap_appname-logs:/var/www/html/var/logs @@ -45,7 +45,7 @@ caproverOneClickApp: defaultValue: $$cap_gen_random_hex(18) description: '' validRegex: /.{1,}/ - - id: $$cap_mautic_version + - id: $$cap_app_version label: Mautic Version defaultValue: 5.1.0-apache description: Check out their Docker page for the valid tags https://hub.docker.com/r/mautic/mautic/tags. diff --git a/public/v4/apps/memos.yml b/public/v4/apps/memos.yml index 1dc732a9b..2749c5ff1 100644 --- a/public/v4/apps/memos.yml +++ b/public/v4/apps/memos.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: '$$cap_appname': - image: neosmemo/memos:$$cap_version + image: neosmemo/memos:$$cap_app_version volumes: - '$$cap_appname-data:/var/opt/memos' caproverExtra: @@ -10,7 +10,7 @@ services: caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: App Version defaultValue: '0.8.3' description: Check out their Docker page for the valid tags https://hub.docker.com/r/neosmemo/memos/tags diff --git a/public/v4/apps/mercure.yml b/public/v4/apps/mercure.yml index cdb2e4495..33a5cbc90 100644 --- a/public/v4/apps/mercure.yml +++ b/public/v4/apps/mercure.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: # Mercure $$cap_appname: - image: dunglas/mercure:$$cap_mercure_version + image: dunglas/mercure:$$cap_app_version restart: unless-stopped environment: # Uncomment the following line to disable HTTPS @@ -18,7 +18,7 @@ services: containerHttpPort: '80' caproverOneClickApp: variables: - - id: $$cap_mercure_version + - id: $$cap_app_version label: Mercure Version defaultValue: 'v0.13' description: Check out their Docker page for the valid tags https://hub.docker.com/r/dunglas/mercure/tags diff --git a/public/v4/apps/metabase.yml b/public/v4/apps/metabase.yml index 93a4173b6..af889e222 100644 --- a/public/v4/apps/metabase.yml +++ b/public/v4/apps/metabase.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: # Metabase $$cap_appname: - image: metabase/metabase:$$cap_mb_version + image: metabase/metabase:$$cap_app_version restart: always environment: MB_DB_TYPE: postgres @@ -33,7 +33,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_mb_version + - id: $$cap_app_version label: Metabase Version defaultValue: 'v0.38.0-rc1' description: Check out their docker page for the valid tags https://hub.docker.com/r/metabase/metabase/tags diff --git a/public/v4/apps/minecraft-bedrock.yml b/public/v4/apps/minecraft-bedrock.yml index 20c9f6d21..a3190a4d1 100644 --- a/public/v4/apps/minecraft-bedrock.yml +++ b/public/v4/apps/minecraft-bedrock.yml @@ -16,7 +16,7 @@ services: ALLOW_LIST_USERS: $$cap_bs_allowlist_users PLAYER_IDLE_TIMEOUT: $$cap_bs_idle ALLOW_CHEATS: $$cap_bs_cheats - image: itzg/minecraft-bedrock-server:$$cap_version + image: itzg/minecraft-bedrock-server:$$cap_app_version restart: always volumes: - $$cap_appname-data:/data @@ -31,7 +31,7 @@ caproverOneClickApp: - label: Docker Image Version description: Choose a Tag from https://hub.docker.com/r/itzg/minecraft-bedrock-server/tags defaultValue: '2022.1.0' - id: $$cap_version + id: $$cap_app_version - label: Bedrock Server Version description: Can be set to a specific server version or the following special values can be used, check https://github.com/itzg/docker-minecraft-bedrock-server#container-specific defaultValue: LATEST diff --git a/public/v4/apps/miniflux.yml b/public/v4/apps/miniflux.yml index a99abade2..38691bba9 100644 --- a/public/v4/apps/miniflux.yml +++ b/public/v4/apps/miniflux.yml @@ -12,7 +12,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' $$cap_appname: - image: miniflux/miniflux:$$cap_miniflux_version + image: miniflux/miniflux:$$cap_app_version depends_on: - $$cap_appname-db restart: always @@ -26,7 +26,7 @@ services: containerHttpPort: '8080' caproverOneClickApp: variables: - - id: $$cap_miniflux_version + - id: $$cap_app_version label: Miniflux version defaultValue: 2.0.22 description: Check out valid tags at https://hub.docker.com/r/miniflux/miniflux/tags diff --git a/public/v4/apps/minio.yml b/public/v4/apps/minio.yml index cc086c6ee..e194b53c1 100644 --- a/public/v4/apps/minio.yml +++ b/public/v4/apps/minio.yml @@ -14,7 +14,7 @@ services: caproverExtra: containerHttpPort: '9001' dockerfileLines: - - FROM minio/minio:$$cap_minio_version + - FROM minio/minio:$$cap_app_version - CMD ["server", "/data", "--console-address", ":9001"] $$cap_appname-api: image: caprover/nginx-reverse-proxy:1-ef5ffcb @@ -26,7 +26,7 @@ services: CLIENT_MAX_BODY_SIZE: '0' caproverOneClickApp: variables: - - id: $$cap_minio_version + - id: $$cap_app_version label: MinIO Version defaultValue: RELEASE.2023-01-18T04-36-38Z description: Check out their Docker page for the valid tags https://hub.docker.com/r/minio/minio/tags/ diff --git a/public/v4/apps/mixpost.yml b/public/v4/apps/mixpost.yml index 7750803b2..e09ca6662 100644 --- a/public/v4/apps/mixpost.yml +++ b/public/v4/apps/mixpost.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: inovector/mixpost:$$cap_MIXPOST_VERSION + image: inovector/mixpost:$$cap_app_version environment: APP_NAME: $$cap_MIXPOST_APP_NAME APP_KEY: $$cap_MIXPOST_APP_KEY @@ -54,7 +54,7 @@ caproverOneClickApp: Find the administrator login details in the logs. If you enabled HTTPS, you should adjust the `APP_URL` environment variable accordingly. variables: - - id: $$cap_MIXPOST_VERSION + - id: $$cap_app_version label: Application | Version description: Mixpost version. Check out their valid tags at https://hub.docker.com/r/inovector/mixpost defaultValue: 'v1.1.3' diff --git a/public/v4/apps/mongo-express.yml b/public/v4/apps/mongo-express.yml index 6efa7978b..70ec79cff 100644 --- a/public/v4/apps/mongo-express.yml +++ b/public/v4/apps/mongo-express.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: mongo-express:$$cap_mongoexpress_version + image: mongo-express:$$cap_app_version restart: always environment: ME_CONFIG_MONGODB_SERVER: $$cap_me_server_address @@ -16,7 +16,7 @@ services: containerHttpPort: '8081' caproverOneClickApp: variables: - - id: $$cap_mongoexpress_version + - id: $$cap_app_version label: Mongo Express Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/mongo-express/tags/ defaultValue: '0.54' diff --git a/public/v4/apps/mongodb.yml b/public/v4/apps/mongodb.yml index 21edbaa66..0a47654c6 100644 --- a/public/v4/apps/mongodb.yml +++ b/public/v4/apps/mongodb.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: mongo:$$cap_mongo_version + image: mongo:$$cap_app_version volumes: - $$cap_appname-db-data:/data/db - $$cap_appname-db-config:/data/configdb @@ -13,7 +13,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_mongo_version + - id: $$cap_app_version label: MongoDB Version defaultValue: '4' description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/mongo/tags/ diff --git a/public/v4/apps/monica.yml b/public/v4/apps/monica.yml index ce0a74510..d64d66d83 100644 --- a/public/v4/apps/monica.yml +++ b/public/v4/apps/monica.yml @@ -4,7 +4,7 @@ services: $$cap_appname: depends_on: - $$cap_appname-mariadb - image: monica:$$cap_monica_version + image: monica:$$cap_app_version restart: 'always' environment: APP_KEY: $$cap_gen_random_hex(32) @@ -30,7 +30,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_monica_version + - id: $$cap_app_version label: Monica Docker version defaultValue: '3.7' description: Check out this page for the valid tags Find on https://hub.docker.com/_/monica?tab=tags. Use the Apache tag otherwise it won't work. diff --git a/public/v4/apps/moodle.yml b/public/v4/apps/moodle.yml index f262fd210..6d9b6a16b 100644 --- a/public/v4/apps/moodle.yml +++ b/public/v4/apps/moodle.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: bitnami/moodle:$$cap_md_version + image: bitnami/moodle:$$cap_app_version volumes: - $$cap_appname-moodle:/bitnami/moodle - $$cap_appname-moodledata:/bitnami/moodledata @@ -53,7 +53,7 @@ caproverOneClickApp: - id: $$cap_db_pass label: Database password validRegex: /.{1,}/ - - id: $$cap_md_version + - id: $$cap_app_version label: Moodle Version defaultValue: latest description: Check out their Docker page for the valid tags https://hub.docker.com/r/bitnami/moodle/tags/ diff --git a/public/v4/apps/mssql.yml b/public/v4/apps/mssql.yml index a83b4d34b..04fc0e643 100644 --- a/public/v4/apps/mssql.yml +++ b/public/v4/apps/mssql.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname-db: - image: mcr.microsoft.com/mssql/server:$$cap_server_version + image: mcr.microsoft.com/mssql/server:$$cap_app_version volumes: - $$cap_appname-db-data:/var/opt/mssql restart: always @@ -16,7 +16,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_server_version + - id: $$cap_app_version label: Version defaultValue: 2017-CU12-ubuntu description: Check out this page for the valid tags https://mcr.microsoft.com/v2/mssql/server/tags/list diff --git a/public/v4/apps/mumble.yml b/public/v4/apps/mumble.yml index 2a003fe04..bf4c342d7 100644 --- a/public/v4/apps/mumble.yml +++ b/public/v4/apps/mumble.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: mumblevoip/mumble-server:$$cap_version + image: mumblevoip/mumble-server:$$cap_app_version container_name: mumble-server hostname: mumble-server restart: on-failure @@ -17,7 +17,7 @@ caproverOneClickApp: description: Check out their Docker page for the valid tags https://hub.docker.com/r/mumblevoip/mumble-server/tags defaultValue: v1.4.230 validRegex: '/.{1,}/' - id: $$cap_version + id: $$cap_app_version - label: Voice Port (UDP) description: Port for voice defaultValue: '64738' diff --git a/public/v4/apps/mysql-backup.yml b/public/v4/apps/mysql-backup.yml index 2418e8b55..fe6bf7a66 100644 --- a/public/v4/apps/mysql-backup.yml +++ b/public/v4/apps/mysql-backup.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname-db: - image: databack/mysql-backup:$$cap_mysql_backup_version + image: databack/mysql-backup:$$cap_app_version restart: always environment: DB_SERVER: $$cap_db_server @@ -12,7 +12,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_mysql_backup_version + - id: $$cap_app_version label: Mysql Backup Version defaultValue: 'v0.11.0' description: Check out their Docker page for the valid tags https://hub.docker.com/r/databack/mysql-backup/tags diff --git a/public/v4/apps/mysql.yml b/public/v4/apps/mysql.yml index c4a2b4639..14e657765 100644 --- a/public/v4/apps/mysql.yml +++ b/public/v4/apps/mysql.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname-db: - image: mysql:$$cap_mysql_version + image: mysql:$$cap_app_version volumes: - $$cap_appname-db-data:/var/lib/mysql restart: always @@ -11,7 +11,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_mysql_version + - id: $$cap_app_version label: MySQL Version defaultValue: '5.7' description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/mysql/tags/ diff --git a/public/v4/apps/n8n-io-sqlite.yml b/public/v4/apps/n8n-io-sqlite.yml index d0cd49340..ae4470f1c 100644 --- a/public/v4/apps/n8n-io-sqlite.yml +++ b/public/v4/apps/n8n-io-sqlite.yml @@ -4,7 +4,7 @@ services: caproverExtra: containerHttpPort: 5678 websocketSupport: 'true' - image: n8nio/n8n:$$cap_N8N_VERSION + image: n8nio/n8n:$$cap_app_version environment: GENERIC_TIMEZONE: $$cap_N8N_TIMEZONE TZ: $$cap_N8N_TIMEZONE @@ -37,7 +37,7 @@ caproverOneClickApp: You can access it at `http://$$cap_appname.$$cap_root_domain` and set up your account. **Important:** Please enable **HTTPS** and **WebSocket Support**. variables: - - id: $$cap_N8N_VERSION + - id: $$cap_app_version label: Application | n8n.io description: Check out their Docker page for the valid tags https://hub.docker.com/r/n8nio/n8n/tags defaultValue: '1.18.0' diff --git a/public/v4/apps/n8n-io.yml b/public/v4/apps/n8n-io.yml index c3175b881..6256f13b4 100644 --- a/public/v4/apps/n8n-io.yml +++ b/public/v4/apps/n8n-io.yml @@ -14,7 +14,7 @@ services: caproverExtra: containerHttpPort: 5678 websocketSupport: 'true' - image: n8nio/n8n:$$cap_N8N_VERSION + image: n8nio/n8n:$$cap_app_version environment: DB_TYPE: postgresdb DB_POSTGRESDB_HOST: srv-captain--$$cap_appname-db @@ -54,7 +54,7 @@ caproverOneClickApp: You can access it at `http://$$cap_appname.$$cap_root_domain` and set up your account. **Important:** Please enable **HTTPS** and **WebSocket Support**. variables: - - id: $$cap_N8N_VERSION + - id: $$cap_app_version label: Application | n8n.io description: Check out their Docker page for the valid tags https://hub.docker.com/r/n8nio/n8n/tags defaultValue: '0.198.2' diff --git a/public/v4/apps/neo4j.yml b/public/v4/apps/neo4j.yml index 5dcb54362..71abfe111 100644 --- a/public/v4/apps/neo4j.yml +++ b/public/v4/apps/neo4j.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname-db: - image: neo4j:$$cap_neo4j_version + image: neo4j:$$cap_app_version volumes: - $$cap_appname-db-data:/data restart: unless-stopped @@ -11,7 +11,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_neo4j_version + - id: $$cap_app_version label: Neo4j Version defaultValue: '4.1.9' description: Check out their Docker page for the valid tags https://hub.docker.com/_/neo4j?tab=tags diff --git a/public/v4/apps/netbox.yml b/public/v4/apps/netbox.yml index f107bc162..f59d0e617 100644 --- a/public/v4/apps/netbox.yml +++ b/public/v4/apps/netbox.yml @@ -30,7 +30,7 @@ services: depends_on: - $$cap_appname-db - $$cap_appname-redis - image: lscr.io/linuxserver/netbox:$$cap_netbox_version + image: lscr.io/linuxserver/netbox:$$cap_app_version volumes: - $$cap_appname-data:/config - $$cap_appname-scripts:/app/netbox/scripts @@ -81,7 +81,7 @@ caproverOneClickApp: label: Redis Password validRegex: /^(\w|[^\s"])+$/ defaultValue: $$cap_gen_random_hex(12) - - id: $$cap_netbox_version + - id: $$cap_app_version label: Netbox Version Tag description: 'Check out the Docker page for valid tags: https://hub.docker.com/r/linuxserver/netbox/tags.' defaultValue: 3.1.6 diff --git a/public/v4/apps/nextcloud.yml b/public/v4/apps/nextcloud.yml index fb133cc02..09872a7e7 100644 --- a/public/v4/apps/nextcloud.yml +++ b/public/v4/apps/nextcloud.yml @@ -26,7 +26,7 @@ services: - $$cap_appname-db - $$cap_appname-redis documentation: Taken from https://hub.docker.com/_/nextcloud - image: nextcloud:$$cap_nextcloud_version + image: nextcloud:$$cap_app_version volumes: - $$cap_appname-data:/var/www/html - $$cap_appname-conf:/usr/local/etc/php/conf.d @@ -52,12 +52,12 @@ services: - $$cap_appname-data:/var/www/html caproverExtra: dockerfileLines: - - FROM nextcloud:$$cap_nextcloud_version + - FROM nextcloud:$$cap_app_version - 'ENTRYPOINT [ "/cron.sh" ] ' notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_nextcloud_version + - id: $$cap_app_version label: Nextcloud Version defaultValue: 28.0.6 description: >- diff --git a/public/v4/apps/nexus3.yml b/public/v4/apps/nexus3.yml index 122944309..1da2b9a4d 100644 --- a/public/v4/apps/nexus3.yml +++ b/public/v4/apps/nexus3.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: sonatype/nexus3:$$cap__version + image: sonatype/nexus3:$$cap_app_version volumes: - $$cap_appname-data:/nexus-data restart: always @@ -10,7 +10,7 @@ services: containerHttpPort: '8081' caproverOneClickApp: variables: - - id: $$cap__version + - id: $$cap_app_version label: Version defaultValue: 3.15.2 description: 'Additional tags can be found here: https://hub.docker.com/r/sonatype/nexus3/tags' diff --git a/public/v4/apps/nginx-reverse-proxy.yml b/public/v4/apps/nginx-reverse-proxy.yml index a01f997a7..f1a4c1308 100644 --- a/public/v4/apps/nginx-reverse-proxy.yml +++ b/public/v4/apps/nginx-reverse-proxy.yml @@ -1,14 +1,14 @@ captainVersion: 4 services: $$cap_appname: - image: caprover/nginx-reverse-proxy:$$cap__version + image: caprover/nginx-reverse-proxy:$$cap_app_version restart: always environment: UPSTREAM_HTTP_ADDRESS: $$cap_upstream_http_address CLIENT_MAX_BODY_SIZE: $$cap_max_body_size caproverOneClickApp: variables: - - id: $$cap__version + - id: $$cap_app_version label: Version defaultValue: 1-ef5ffcb description: 'Additional tags can be found here: https://hub.docker.com/r/caprover/nginx-reverse-proxy/tags' diff --git a/public/v4/apps/nightscout.yml b/public/v4/apps/nightscout.yml index 052f0b898..2ca59bb20 100644 --- a/public/v4/apps/nightscout.yml +++ b/public/v4/apps/nightscout.yml @@ -29,7 +29,7 @@ services: - RUN mkdir -p /opt/app - WORKDIR /opt/app - RUN git clone git://github.com/nightscout/cgm-remote-monitor.git /opt/app - - RUN cd /opt/app && git checkout $$cap_nighscout_version && rm -rf .git + - RUN cd /opt/app && git checkout $$cap_app_version && rm -rf .git - RUN cd /opt/app && npm install && npm run postinstall && npm run env - EXPOSE 1337 - CMD ["node", "server.js"] @@ -44,7 +44,7 @@ caproverOneClickApp: label: MongoDB password description: Only use alphanumeric chars. validRegex: /^([a-zA-Z0-9])+$/ - - id: $$cap_nighscout_version + - id: $$cap_app_version label: Nighscout Version defaultValue: 0.11.1 description: Check out their page for the valid tags https://github.com/nightscout/cgm-remote-monitor/releases diff --git a/public/v4/apps/nocodb.yml b/public/v4/apps/nocodb.yml index 00f2d815f..6fbc0d469 100644 --- a/public/v4/apps/nocodb.yml +++ b/public/v4/apps/nocodb.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: '$$cap_appname': - image: nocodb/nocodb:$$cap_version + image: nocodb/nocodb:$$cap_app_version restart: always environment: NC_DB: '$$cap_nc_db' @@ -17,7 +17,7 @@ services: containerHttpPort: '8080' caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: NocoDB Version defaultValue: '0.83.8' description: Check out their Docker page for the valid tags https://hub.docker.com/r/nocodb/nocodb/tags diff --git a/public/v4/apps/node-exporter.yml b/public/v4/apps/node-exporter.yml index d495ba28e..fdd01169b 100644 --- a/public/v4/apps/node-exporter.yml +++ b/public/v4/apps/node-exporter.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: prom/node-exporter:$$cap_version + image: prom/node-exporter:$$cap_app_version restart: always volumes: - /var/run/docker.sock:/var/run/docker.sock @@ -12,7 +12,7 @@ services: notExposeAsWebApp: true caproverOneClickApp: variables: - - id: $$cap_version + - id: $$cap_app_version label: Node Exporter Version defaultValue: 'v1.5.0' description: Check out their docker page for the valid tags https://hub.docker.com/r/prom/node-exporter/tags diff --git a/public/v4/apps/node-red.yml b/public/v4/apps/node-red.yml index f9a0811fa..53a8c31c4 100644 --- a/public/v4/apps/node-red.yml +++ b/public/v4/apps/node-red.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: nodered/node-red:$$cap_node-red_version + image: nodered/node-red:$$cap_app_version volumes: - $$cap_appname-data:/data restart: always @@ -11,7 +11,7 @@ services: containerHttpPort: '1880' caproverOneClickApp: variables: - - id: $$cap_node-red_version + - id: $$cap_app_version label: node-red version tag description: Check out their docker page for the valid tags @ https://hub.docker.com/r/nodered/node-red/tags defaultValue: 3.1.8-18-minimal diff --git a/public/v4/apps/novu.yml b/public/v4/apps/novu.yml index 7416f9a5a..9950d31c0 100644 --- a/public/v4/apps/novu.yml +++ b/public/v4/apps/novu.yml @@ -18,7 +18,7 @@ services: $$cap_appname-api: caproverExtra: containerHttpPort: $$cap_NOVU_API_PORT - image: $$cap_NOVU_IMAGE_URL/api:$$cap_NOVU_IMAGE_VERSION + image: $$cap_NOVU_IMAGE_URL/api:$$cap_app_version environment: NODE_ENV: $$cap_ENVIRONMENT API_ROOT_URL: http://$$cap_appname-api.$$cap_root_domain @@ -44,7 +44,7 @@ services: $$cap_appname-ws: caproverExtra: containerHttpPort: $$cap_NOVU_PORT_WEBSOCKET - image: $$cap_NOVU_IMAGE_URL/ws:$$cap_NOVU_IMAGE_VERSION + image: $$cap_NOVU_IMAGE_URL/ws:$$cap_app_version environment: PORT: $$cap_NOVU_PORT_WEBSOCKET NODE_ENV: $$cap_ENVIRONMENT @@ -59,7 +59,7 @@ services: $$cap_appname: caproverExtra: containerHttpPort: $$cap_NOVU_PORT_APPLICATION - image: $$cap_NOVU_IMAGE_URL/web:$$cap_NOVU_IMAGE_VERSION + image: $$cap_NOVU_IMAGE_URL/web:$$cap_app_version environment: REACT_APP_API_URL: http://$$cap_appname-api.$$cap_root_domain REACT_APP_ENVIRONMENT: $$cap_ENVIRONMENT @@ -71,7 +71,7 @@ services: $$cap_appname-widget: caproverExtra: containerHttpPort: $$cap_NOVU_PORT_WIDGET - image: $$cap_NOVU_IMAGE_URL/widget:$$cap_NOVU_IMAGE_VERSION + image: $$cap_NOVU_IMAGE_URL/widget:$$cap_app_version environment: REACT_APP_API_URL: http://$$cap_appname-api.$$cap_root_domain REACT_APP_WS_URL: http://$$cap_appname-ws.$$cap_root_domain @@ -83,7 +83,7 @@ services: $$cap_appname-embed: caproverExtra: containerHttpPort: $$cap_NOVU_PORT_EMBED - image: $$cap_NOVU_IMAGE_URL/embed:$$cap_NOVU_IMAGE_VERSION + image: $$cap_NOVU_IMAGE_URL/embed:$$cap_app_version environment: WIDGET_URL: http://$$cap_appname-widget.$$cap_root_domain depends_on: @@ -102,7 +102,7 @@ caproverOneClickApp: Novu has been successfully deployed! It might take few moments before it's fully started. You can access it at `http://$$cap_appname.$$cap_root_domain`. variables: - - id: $$cap_NOVU_IMAGE_VERSION + - id: $$cap_app_version label: Application | Version description: Version tag of Novu's Docker images. Check out their valid tags at https://github.com/novuhq/novu/pkgs/container/novu%2Fapi defaultValue: '0.8.0' diff --git a/public/v4/apps/ntfy.yml b/public/v4/apps/ntfy.yml index 4dbe6e3b0..c30aa1155 100644 --- a/public/v4/apps/ntfy.yml +++ b/public/v4/apps/ntfy.yml @@ -40,7 +40,7 @@ caproverOneClickApp: # Define variables variables: # Variable for version - - id: $$cap_appversion + - id: $$cap_app_version label: App Version description: |- Specify the version tag to install. @@ -55,7 +55,7 @@ services: # CapRover's special options caproverExtra: dockerfileLines: - - FROM binwiederhier/ntfy:$$cap_appversion + - FROM binwiederhier/ntfy:$$cap_app_version - CMD ["serve"] # Define volumes diff --git a/public/v4/apps/odoo.yml b/public/v4/apps/odoo.yml index 1e3cf4e96..23f220e81 100644 --- a/public/v4/apps/odoo.yml +++ b/public/v4/apps/odoo.yml @@ -17,7 +17,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' $$cap_appname: - image: odoo:$$cap_odoo_version + image: odoo:$$cap_app_version depends_on: - $$cap_appname-db volumes: @@ -42,7 +42,7 @@ caproverOneClickApp: label: Postgres Password description: '' validRegex: /.{1,}/ - - id: $$cap_odoo_version + - id: $$cap_app_version label: Odoo Version defaultValue: '13.0' description: Check out their docker page for the valid tags https://hub.docker.com/_/odoo?tab=tags diff --git a/public/v4/apps/offen-docker-backup.yml b/public/v4/apps/offen-docker-backup.yml index f38e4de5e..76da9ba5a 100644 --- a/public/v4/apps/offen-docker-backup.yml +++ b/public/v4/apps/offen-docker-backup.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: offen/docker-volume-backup:$$cap_version + image: offen/docker-volume-backup:$$cap_app_version environment: AWS_ACCESS_KEY_ID: $$cap_aws_access_key_id AWS_SECRET_ACCESS_KEY: $$cap_aws_secret_access_key @@ -17,7 +17,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_version + - id: $$cap_app_version label: Docker volume backup version defaultValue: 'v2' description: Check out their Docker page for the valid tags https://hub.docker.com/r/offen/docker-volume-backup/tags diff --git a/public/v4/apps/offen-local-docker-backup.yml b/public/v4/apps/offen-local-docker-backup.yml index a3e8581ce..ec4db4090 100644 --- a/public/v4/apps/offen-local-docker-backup.yml +++ b/public/v4/apps/offen-local-docker-backup.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: offen/docker-volume-backup:$$cap_version + image: offen/docker-volume-backup:$$cap_app_version environment: BACKUP_FILENAME: $$cap_backup_filename BACKUP_ARCHIVE: /archive @@ -15,7 +15,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_version + - id: $$cap_app_version label: Docker volume backup version defaultValue: 'v2' description: Check out their Docker page for the valid tags https://hub.docker.com/r/offen/docker-volume-backup/tags diff --git a/public/v4/apps/ombi.yml b/public/v4/apps/ombi.yml index 766b3ecb2..21b9600dc 100644 --- a/public/v4/apps/ombi.yml +++ b/public/v4/apps/ombi.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: linuxserver/ombi:$$cap_ombi_version + image: linuxserver/ombi:$$cap_app_version environment: TZ: $$cap_tz PUID: '1000' @@ -13,7 +13,7 @@ services: containerHttpPort: '3579' caproverOneClickApp: variables: - - id: $$cap_ombi_version + - id: $$cap_app_version label: Ombi Version defaultValue: development-v4.0.1446-ls143 description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/ombi/tags diff --git a/public/v4/apps/onlyoffice-documentserver.yml b/public/v4/apps/onlyoffice-documentserver.yml index 877cf2e4b..284b146ec 100644 --- a/public/v4/apps/onlyoffice-documentserver.yml +++ b/public/v4/apps/onlyoffice-documentserver.yml @@ -18,7 +18,7 @@ services: - $$cap_appname-fonts:/usr/share/fonts/truetype/custom caproverOneClickApp: variables: - - id: '$$cap_app_version' + - id: $$cap_app_version label: Document Server Version description: Check out their Docker page for the valid tags https://hub.docker.com/r/onlyoffice/documentserver/tags defaultValue: '7.3.3.50' diff --git a/public/v4/apps/openspeedtest.yml b/public/v4/apps/openspeedtest.yml index ef6051727..6b4ab1459 100644 --- a/public/v4/apps/openspeedtest.yml +++ b/public/v4/apps/openspeedtest.yml @@ -2,14 +2,14 @@ captainVersion: 4 services: '$$cap_appname': - image: index.docker.io/openspeedtest/latest:$$cap_openspeedtest_version + image: index.docker.io/openspeedtest/latest:$$cap_app_version caproverExtra: containerHttpPort: '3000' restart: always caproverOneClickApp: variables: - - id: '$$cap_openspeedtest_version' + - id: '$$cap_app_version' label: OpenSpeedTest Version defaultValue: 'speedtest' description: Check out their Docker page for the valid tags https://hub.docker.com/r/openspeedtest/latest/tags diff --git a/public/v4/apps/openvpn-as.yml b/public/v4/apps/openvpn-as.yml index 9cfa81d7b..375377b90 100644 --- a/public/v4/apps/openvpn-as.yml +++ b/public/v4/apps/openvpn-as.yml @@ -3,7 +3,7 @@ services: $$cap_appname: caproverExtra: containerHttpPort: $$cap_OPENVPN_PORT_ADMIN - image: linuxserver/openvpn-as:$$cap_OPENVPN_VERSION + image: linuxserver/openvpn-as:$$cap_app_version hostname: $$cap_appname.$$cap_root_domain environment: PUID: $$cap_OPENVPN_PUID @@ -53,7 +53,7 @@ caproverOneClickApp: Enjoy your private VPN! variables: - - id: $$cap_OPENVPN_VERSION + - id: $$cap_app_version label: General | Version Tag description: Check out their valid tags at https://hub.docker.com/r/linuxserver/openvpn-as/tags defaultValue: 2.9.0-5c5bd120-Ubuntu18-ls124 diff --git a/public/v4/apps/openvscode-server.yml b/public/v4/apps/openvscode-server.yml index cce4bb9d9..0f90f1ae2 100644 --- a/public/v4/apps/openvscode-server.yml +++ b/public/v4/apps/openvscode-server.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: lscr.io/linuxserver/openvscode-server:$$cap_openvscode_server_version + image: lscr.io/linuxserver/openvscode-server:$$cap_app_version volumes: - $$cap_appname-config:/config environment: @@ -30,7 +30,7 @@ caproverOneClickApp: You can access it at http://$$cap_appname.$$cap_root_domain If you are using a connection secret or connection token, append ?tkn=$$cap_openvscode_server_connection_token to the URL. variables: - - id: $$cap_openvscode_server_version + - id: $$cap_app_version label: Version Tag description: Check out their documentation for the valid tags https://github.com/linuxserver/docker-openvscode-server/#version-tags defaultValue: '1.74.3' diff --git a/public/v4/apps/orangehrm.yml b/public/v4/apps/orangehrm.yml index 5946c50af..565c7dec5 100644 --- a/public/v4/apps/orangehrm.yml +++ b/public/v4/apps/orangehrm.yml @@ -17,7 +17,7 @@ services: documentation: Taken from https://hub.docker.com/r/orangehrm/orangehrm depends_on: - $$cap_appname-db - image: orangehrm/orangehrm:$$cap_orangehrm_version + image: orangehrm/orangehrm:$$cap_app_version volumes: - $$cap_appname-data:/orangehrm restart: always @@ -45,7 +45,7 @@ caproverOneClickApp: label: admin password description: Password for the admin user. validRegex: /.{1,}/ - - id: $$cap_orangehrm_version + - id: $$cap_app_version label: OrangeHRM Version defaultValue: '5.4' description: https://hub.docker.com/r/bitnami/orangehrm/tags diff --git a/public/v4/apps/organizr.yml b/public/v4/apps/organizr.yml index 0a1aa5878..9ff0db365 100644 --- a/public/v4/apps/organizr.yml +++ b/public/v4/apps/organizr.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: organizr/organizr:$$cap_version + image: organizr/organizr:$$cap_app_version environment: TZ: '$$cap_tz' PHP_TZ: '$$cap_tz' @@ -13,7 +13,7 @@ services: - '$$cap_appname-config:/config' caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: Organizr Version defaultValue: 'amd64' description: Check out their Docker page for the valid tags https://hub.docker.com/r/organizr/organizr/tags diff --git a/public/v4/apps/outline.yml b/public/v4/apps/outline.yml index f720e5c4b..233639546 100644 --- a/public/v4/apps/outline.yml +++ b/public/v4/apps/outline.yml @@ -56,12 +56,12 @@ services: caproverExtra: containerHttpPort: '3000' dockerfileLines: - - FROM outlinewiki/outline:$$cap_outline_version + - FROM outlinewiki/outline:$$cap_app_version - EXPOSE 3000 - CMD yarn db:migrate --env production-ssl-disabled; yarn start caproverOneClickApp: variables: - - id: $$cap_outline_version + - id: $$cap_app_version label: Outline Version defaultValue: 0.68.1 description: Check out their page for the valid tags https://hub.docker.com/r/outlinewiki/outline/tags diff --git a/public/v4/apps/overseerr.yml b/public/v4/apps/overseerr.yml index c281d3f3e..d655631a6 100644 --- a/public/v4/apps/overseerr.yml +++ b/public/v4/apps/overseerr.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: lscr.io/linuxserver/overseerr:$$cap_overseerr_version + image: lscr.io/linuxserver/overseerr:$$cap_app_version environment: TZ: $$cap_tz PUID: $$cap_puid @@ -12,7 +12,7 @@ services: containerHttpPort: 5055 caproverOneClickApp: variables: - - id: $$cap_overseerr_version + - id: $$cap_app_version label: Overseerr Version defaultValue: 1.33.2 description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/overseerr/tags diff --git a/public/v4/apps/owncast.yml b/public/v4/apps/owncast.yml index 34c38f6b7..c70cd5374 100644 --- a/public/v4/apps/owncast.yml +++ b/public/v4/apps/owncast.yml @@ -3,7 +3,7 @@ services: $$cap_appname: caproverExtra: containerHttpPort: $$cap_OWNCAST_HTTP_PORT - image: gabekangas/owncast:$$cap_OWNCAST_VERSION + image: gabekangas/owncast:$$cap_app_version hostname: $$cap_appname.$$cap_root_domain ports: - $$cap_OWNCAST_RMTP_PORT:$$cap_OWNCAST_RMTP_PORT @@ -27,7 +27,7 @@ caproverOneClickApp: description: Self-hosted live video and web chat server documentation: https://owncast.online/docs variables: - - id: $$cap_OWNCAST_VERSION + - id: $$cap_app_version label: General | Version Tag description: Check out their valid tags at https://hub.docker.com/r/gabekangas/owncast/tags defaultValue: '0.0.12' diff --git a/public/v4/apps/papermerge.yml b/public/v4/apps/papermerge.yml index 19d06a03a..d1e9dcf61 100644 --- a/public/v4/apps/papermerge.yml +++ b/public/v4/apps/papermerge.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: linuxserver/papermerge:$$cap_papermerge_version + image: linuxserver/papermerge:$$cap_app_version environment: TZ: $$cap_tz PUID: '1000' @@ -15,7 +15,7 @@ services: containerHttpPort: '8000' caproverOneClickApp: variables: - - id: $$cap_papermerge_version + - id: $$cap_app_version label: Paper Merge Version defaultValue: v2.0.1-ls10 description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/papermerge/tags. diff --git a/public/v4/apps/parse.yml b/public/v4/apps/parse.yml index c3ece24d1..e322b00d1 100644 --- a/public/v4/apps/parse.yml +++ b/public/v4/apps/parse.yml @@ -14,7 +14,7 @@ services: $$cap_appname-parse: depends_on: - $$cap_appname-mongodb - image: parseplatform/parse-server:$$cap_parse_version + image: parseplatform/parse-server:$$cap_app_version restart: always volumes: - $$cap_appname-parse-cloud:/parse-server/cloud @@ -61,7 +61,7 @@ caproverOneClickApp: - id: $$cap_parse_dashboard_password label: Parse Dashboard Password validRegex: /^\S{8,}$/ - - id: $$cap_parse_version + - id: $$cap_app_version label: Parse Version defaultValue: 3.1.3 description: Check out their Docker page for the valid tags https://hub.docker.com/r/parseplatform/parse-server/tags diff --git a/public/v4/apps/passbolt.yml b/public/v4/apps/passbolt.yml index 78a3f3d7c..00464fe69 100644 --- a/public/v4/apps/passbolt.yml +++ b/public/v4/apps/passbolt.yml @@ -11,7 +11,7 @@ services: volumes: - $$cap_appname-db:/var/lib/mysql $$cap_appname-pb: - image: passbolt/passbolt:$$cap_pb_version + image: passbolt/passbolt:$$cap_app_version restart: unless-stopped depends_on: - $$cap_appname-db @@ -42,7 +42,7 @@ caproverOneClickApp: - id: $$cap_db_pass label: Database Password defaultValue: password - - id: $$cap_pb_version + - id: $$cap_app_version label: Passbolt Version defaultValue: 3.9.0-2 description: Check out their Docker page for the valid tags https://hub.docker.com/r/passbolt/passbolt/tags/ diff --git a/public/v4/apps/peertube.yml b/public/v4/apps/peertube.yml index d4b6fca9f..9e492c214 100644 --- a/public/v4/apps/peertube.yml +++ b/public/v4/apps/peertube.yml @@ -22,7 +22,7 @@ services: depends_on: - $$cap_appname-db - $$cap_appname-redis - image: chocobozzz/peertube:$$cap_peertube_version + image: chocobozzz/peertube:$$cap_app_version volumes: - $$cap_appname-peertube-data:/data - $$cap_appname-peertube-config:/config @@ -69,7 +69,7 @@ caproverOneClickApp: defaultValue: 6.2.11-alpine description: Check out their docker page for the valid tags https://hub.docker.com/r/library/redis/tags/ validRegex: /^([^\s^\/])+$/ - - id: $$cap_peertube_version + - id: $$cap_app_version label: Peertube Version defaultValue: v5.1.0-bullseye description: Check out their docker page for the valid tags https://hub.docker.com/r/chocobozzz/peertube/tags/ diff --git a/public/v4/apps/penpot.yml b/public/v4/apps/penpot.yml index 22bbdee5b..243071037 100644 --- a/public/v4/apps/penpot.yml +++ b/public/v4/apps/penpot.yml @@ -24,7 +24,7 @@ services: # Exporter $$cap_appname-exporter: - image: penpotapp/exporter:$$cap_penpot_version + image: penpotapp/exporter:$$cap_app_version restart: always environment: PENPOT_PUBLIC_URI: $$cap_public_uri @@ -34,7 +34,7 @@ services: # Backend $$cap_appname-backend: - image: penpotapp/backend:$$cap_penpot_version + image: penpotapp/backend:$$cap_app_version volumes: - $$cap_appname-assets-data:/opt/data environment: @@ -65,7 +65,7 @@ services: # Frontend $$cap_appname: - image: penpotapp/frontend:$$cap_penpot_version + image: penpotapp/frontend:$$cap_app_version volumes: - $$cap_appname-assets-data:/opt/data environment: @@ -88,7 +88,7 @@ caproverOneClickApp: defaultValue: '7' description: Checkout their docker description page for the valid tags https://hub.docker.com/_/redis?tab=description validRegex: /^([^\s^\/])+$/ - - id: $$cap_penpot_version + - id: $$cap_app_version label: Penpot version for frontend, backend and exporter defaultValue: '1.18.4' description: Checkout their docker page for the valid tags https://hub.docker.com/r/penpotapp/frontend/tags diff --git a/public/v4/apps/percona.yml b/public/v4/apps/percona.yml index 48b280837..80c39287e 100644 --- a/public/v4/apps/percona.yml +++ b/public/v4/apps/percona.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: percona:$$cap_percona_version + image: percona:$$cap_app_version volumes: - $$cap_appname-data:/var/lib/mysql restart: always @@ -9,12 +9,12 @@ services: MYSQL_ROOT_PASSWORD: $$cap_db_pass caproverExtra: dockerfileLines: - - FROM percona:$$cap_percona_version + - FROM percona:$$cap_app_version - CMD ["--character-set-server=$$cap_charset", "--collation-server=$$cap_collation", "--skip-character-set-client-handshake"] notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_percona_version + - id: $$cap_app_version label: Percona Version defaultValue: 'ps-8.0' description: Check out their Docker page for the valid tags https://hub.docker.com/_/percona diff --git a/public/v4/apps/pgadmin4.yml b/public/v4/apps/pgadmin4.yml index d40403f1f..a87ba02fa 100644 --- a/public/v4/apps/pgadmin4.yml +++ b/public/v4/apps/pgadmin4.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: dpage/pgadmin4:$$cap_pgadmin4_version + image: dpage/pgadmin4:$$cap_app_version restart: always environment: PGADMIN_DEFAULT_EMAIL: $$cap_email @@ -10,7 +10,7 @@ services: - $$cap_appname-data:/var/lib/pgadmin caproverOneClickApp: variables: - - id: $$cap_pgadmin4_version + - id: $$cap_app_version label: Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/dpage/pgadmin4/tags/ defaultValue: '4.27' diff --git a/public/v4/apps/pgweb.yml b/public/v4/apps/pgweb.yml index b61f27452..18e3a8129 100644 --- a/public/v4/apps/pgweb.yml +++ b/public/v4/apps/pgweb.yml @@ -1,13 +1,13 @@ captainVersion: 4 services: $$cap_appname: - image: sosedoff/pgweb:$$cap_pgweb_version + image: sosedoff/pgweb:$$cap_app_version restart: always caproverExtra: containerHttpPort: '8081' caproverOneClickApp: variables: - - id: $$cap_pgweb_version + - id: $$cap_app_version label: pgweb Version defaultValue: 0.11.2 description: Check out their Docker page for the valid tags https://hub.docker.com/r/sosedoff/pgweb/tags diff --git a/public/v4/apps/photoprism.yml b/public/v4/apps/photoprism.yml index 86515d261..3517b4b83 100644 --- a/public/v4/apps/photoprism.yml +++ b/public/v4/apps/photoprism.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: 'photoprism/photoprism:$$app_version' + image: 'photoprism/photoprism:$$cap_app_version' depends_on: - $$cap_appname-db environment: @@ -49,7 +49,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$app_version + - id: $$cap_app_version label: Photoprism Version defaultValue: 220901-bullseye description: >- diff --git a/public/v4/apps/photoview.yml b/public/v4/apps/photoview.yml index 71d92e253..a983b5dab 100644 --- a/public/v4/apps/photoview.yml +++ b/public/v4/apps/photoview.yml @@ -14,7 +14,7 @@ services: notExposeAsWebApp: 'true' $$cap_appname: - image: viktorstrate/photoview:$$cap_photoview_version + image: viktorstrate/photoview:$$cap_app_version depends_on: - $$cap_appname-mariadb environment: @@ -49,7 +49,7 @@ caproverOneClickApp: Finish the setup at http://$$cap_appname.$$cap_root_domain. variables: - - id: $$cap_photoview_version + - id: $$cap_app_version label: Photoview Version defaultValue: '2.3.9' description: Check out their docker page for the valid tags https://hub.docker.com/r/viktorstrate/photoview/tags diff --git a/public/v4/apps/phpldapadmin.yml b/public/v4/apps/phpldapadmin.yml index 80935973f..ad699fa0d 100644 --- a/public/v4/apps/phpldapadmin.yml +++ b/public/v4/apps/phpldapadmin.yml @@ -13,7 +13,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' $$cap_appname-admin: - image: osixia/phpldapadmin:$$cap_phpldapadmin_version + image: osixia/phpldapadmin:$$cap_app_version restart: always depends_on: - $$cap_appname @@ -38,7 +38,7 @@ caproverOneClickApp: label: The admin Password description: The admin password of the Openldap validRegex: /.{1,}/ - - id: $$cap_phpldapadmin_version + - id: $$cap_app_version label: PHPLadapAdmin Version defaultValue: 0.9.0 description: Check out their docker page for the valid tags https://hub.docker.com/r/osixia/phpldapadmin/tags diff --git a/public/v4/apps/phpmyadmin.yml b/public/v4/apps/phpmyadmin.yml index 469799cbe..d861ca6ca 100644 --- a/public/v4/apps/phpmyadmin.yml +++ b/public/v4/apps/phpmyadmin.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: phpmyadmin/phpmyadmin:$$cap_pma_version + image: phpmyadmin/phpmyadmin:$$cap_app_version restart: always environment: PMA_ARBITRARY: '1' @@ -13,7 +13,7 @@ caproverOneClickApp: description: It will override the default value for apache and php-fpm inside the container. Default size is 2M defaultValue: 2M validRegex: /^([^\s^\/])+$/ - - id: $$cap_pma_version + - id: $$cap_app_version label: PHP My Admin Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/phpmyadmin/phpmyadmin/tags/ defaultValue: 5.0.2 diff --git a/public/v4/apps/pigallery2.yml b/public/v4/apps/pigallery2.yml index 4f36ab866..9a2f4f757 100644 --- a/public/v4/apps/pigallery2.yml +++ b/public/v4/apps/pigallery2.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: bpatrik/pigallery2:$$cap_version + image: bpatrik/pigallery2:$$cap_app_version environment: NODE_ENV: production # set to 'debug' for full debug logging volumes: @@ -12,7 +12,7 @@ services: restart: always caproverOneClickApp: variables: - - id: $$cap_version + - id: $$cap_app_version label: PiGallery2 Version defaultValue: '2.0.0' description: Check out their docker page for the valid tags https://hub.docker.com/r/bpatrik/pigallery2/tags diff --git a/public/v4/apps/planka.yml b/public/v4/apps/planka.yml index 69926f482..f1f95acf3 100644 --- a/public/v4/apps/planka.yml +++ b/public/v4/apps/planka.yml @@ -4,7 +4,7 @@ services: caproverExtra: containerHttpPort: $$cap_PLANKA_PORT dockerfileLines: - - FROM ghcr.io/plankanban/planka:$$cap_PLANKA_VERSION + - FROM ghcr.io/plankanban/planka:$$cap_app_version - CMD ["bash", "-c", "for i in `seq 1 30`; do ./start.sh && s=$$? && break || s=$$?; echo \"Tried $$i times. Waiting 5 seconds...\"; sleep 5; done; (exit $$s)"] environment: BASE_URL: http://$$cap_appname.$$cap_root_domain @@ -47,7 +47,7 @@ caproverOneClickApp: description: Realtime Kanban Board for Workgroups documentation: https://github.com/plankanban/planka#deploy variables: - - id: $$cap_PLANKA_VERSION + - id: $$cap_app_version label: General | Planka Version description: Check out their valid tags at https://github.com/orgs/plankanban/packages/container/package/planka defaultValue: '1.8.4' diff --git a/public/v4/apps/plausible.yml b/public/v4/apps/plausible.yml index e6c94b634..945321290 100644 --- a/public/v4/apps/plausible.yml +++ b/public/v4/apps/plausible.yml @@ -25,7 +25,7 @@ services: caproverExtra: containerHttpPort: '8000' dockerfileLines: - - FROM ghcr.io/plausible/community-edition:$$cap_PLAUSIBLE_VERSION + - FROM ghcr.io/plausible/community-edition:$$cap_app_version - CMD ["sh", "-c", "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"] environment: BASE_URL: http://$$cap_appname.$$cap_root_domain @@ -69,7 +69,7 @@ caproverOneClickApp: label: RELAY_PASSWORD validRegex: /^([^\s^\/])+$/ - description: The version of Plausible docker image (from https://github.com/plausible/analytics/pkgs/container/community-edition e.g. v2.1.4) - id: $$cap_PLAUSIBLE_VERSION + id: $$cap_app_version label: PLAUSIBLE_VERSION defaultValue: v2.1.4 validRegex: /^([^\s^\/])+$/ diff --git a/public/v4/apps/plex-arm.yml b/public/v4/apps/plex-arm.yml index b6a20e478..04e506d3b 100644 --- a/public/v4/apps/plex-arm.yml +++ b/public/v4/apps/plex-arm.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: linuxserver/plex:$$cap_plex_version + image: linuxserver/plex:$$cap_app_version environment: TZ: $$cap_tz PLEX_CLAIM: $$cap_plex_token @@ -26,7 +26,7 @@ services: containerHttpPort: '32400' caproverOneClickApp: variables: - - id: $$cap_plex_version + - id: $$cap_app_version label: Plex Version defaultValue: 1.25.8 description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/plex/tags diff --git a/public/v4/apps/plex.yml b/public/v4/apps/plex.yml index 7e50622d7..4e5c391b3 100644 --- a/public/v4/apps/plex.yml +++ b/public/v4/apps/plex.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: plexinc/pms-docker:$$cap_plex_version + image: plexinc/pms-docker:$$cap_app_version environment: TZ: $$cap_tz PLEX_CLAIM: $$cap_plex_token @@ -25,7 +25,7 @@ services: containerHttpPort: '32400' caproverOneClickApp: variables: - - id: $$cap_plex_version + - id: $$cap_app_version label: Plex Version defaultValue: 1.19.2.2737-b69929dab description: Check out their Docker page for the valid tags https://hub.docker.com/r/plexinc/pms-docker/tags diff --git a/public/v4/apps/pocketbase.yml b/public/v4/apps/pocketbase.yml index 30d6e1d8e..ff7f5faeb 100644 --- a/public/v4/apps/pocketbase.yml +++ b/public/v4/apps/pocketbase.yml @@ -6,7 +6,7 @@ services: dockerfileLines: - FROM alpine:3.16.2 - RUN apk add --no-cache unzip openssh - - ADD https://github.com/pocketbase/pocketbase/releases/download/v$$cap_version/pocketbase_$$cap_version_$$cap_architecture.zip /tmp/pb.zip + - ADD https://github.com/pocketbase/pocketbase/releases/download/v$$cap_app_version/pocketbase_$$cap_app_version_$$cap_architecture.zip /tmp/pb.zip - RUN unzip /tmp/pb.zip -d /pb/ - EXPOSE 8080 - CMD ["/pb/pocketbase", "serve", "--http=0.0.0.0:8080"] @@ -16,7 +16,7 @@ services: caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: PocketBase Version defaultValue: '0.16.3' description: Check out their github page for the valid tags https://github.com/pocketbase/pocketbase/releases diff --git a/public/v4/apps/portainer.yml b/public/v4/apps/portainer.yml index 32738fdde..12fefa664 100644 --- a/public/v4/apps/portainer.yml +++ b/public/v4/apps/portainer.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: portainer/portainer-$$cap_portainer_edition:$$cap_portainer_version + image: portainer/portainer-$$cap_portainer_edition:$$cap_app_version volumes: - /var/run/docker.sock:/var/run/docker.sock - $$cap_appname-data:/data @@ -10,7 +10,7 @@ services: containerHttpPort: '9000' caproverOneClickApp: variables: - - id: $$cap_portainer_version + - id: $$cap_app_version label: Portainer Version defaultValue: 2.16.2 description: Check out their Docker page for the valid tags https://hub.docker.com/r/portainer/portainer-ce/tags diff --git a/public/v4/apps/poste-io.yml b/public/v4/apps/poste-io.yml index 7bd045b0d..0151f3506 100644 --- a/public/v4/apps/poste-io.yml +++ b/public/v4/apps/poste-io.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: analogic/poste.io:$$cap_POSTE_VERSION + image: analogic/poste.io:$$cap_app_version hostname: $$cap_POSTE_HOSTNAME environment: TZ: $$cap_POSTE_TZ @@ -71,7 +71,7 @@ caproverOneClickApp: Enjoy your self-hosted mail server! variables: - - id: $$cap_POSTE_VERSION + - id: $$cap_app_version label: General | Version description: Check out their Docker page for the valid tags https://hub.docker.com/r/analogic/poste.io/tags defaultValue: '2' diff --git a/public/v4/apps/postgres.yml b/public/v4/apps/postgres.yml index 3b18f2d36..b5014d878 100644 --- a/public/v4/apps/postgres.yml +++ b/public/v4/apps/postgres.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: postgres:$$cap_postgres_version + image: postgres:$$cap_app_version volumes: - $$cap_appname-data:/var/lib/postgresql/data restart: always @@ -14,7 +14,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_postgres_version + - id: $$cap_app_version label: Version defaultValue: '14.5' description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/postgres/tags diff --git a/public/v4/apps/posthog.yml b/public/v4/apps/posthog.yml index 540cf3834..67f60cd4c 100644 --- a/public/v4/apps/posthog.yml +++ b/public/v4/apps/posthog.yml @@ -73,7 +73,7 @@ services: - $$cap_appname-kafka-data:/bitnami/kafka $$cap_appname-worker: - image: posthog/posthog:$$cap_posthog_version + image: posthog/posthog:$$cap_app_version command: ./bin/docker-worker-celery --with-scheduler caproverExtra: notExposeAsWebApp: 'true' @@ -108,7 +108,7 @@ services: command: sh -c 'mkdir -p /data/posthog && minio server --address ":19000" --console-address ":19001" /data' $$cap_appname-plugin: - image: posthog/posthog:$$cap_posthog_version + image: posthog/posthog:$$cap_app_version depends_on: - $$cap_appname-db - $$cap_appname-redis @@ -135,7 +135,7 @@ services: command: ./bin/plugin-server $$cap_appname-web: - image: posthog/posthog:$$cap_posthog_version + image: posthog/posthog:$$cap_app_version caproverExtra: containerHttpPort: '8000' restart: on-failure @@ -224,7 +224,7 @@ services: - $$cap_appname-db $$cap_appname-temporal-django-worker: - image: posthog/posthog:$$cap_posthog_version + image: posthog/posthog:$$cap_app_version command: ./bin/temporal-django-worker restart: on-failure caproverExtra: @@ -268,7 +268,7 @@ caproverOneClickApp: label: Postgres Port validRegex: /^\d+$/ - - id: $$cap_posthog_version + - id: $$cap_app_version label: PostHog's version defaultValue: e2f4b4a8b46667f75ad9bdacf4a487a5dd2d5dbf diff --git a/public/v4/apps/prisma.yml b/public/v4/apps/prisma.yml index 5577f8f52..f7e896364 100644 --- a/public/v4/apps/prisma.yml +++ b/public/v4/apps/prisma.yml @@ -10,7 +10,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' $$cap_appname: - image: prismagraphql/prisma:$$cap_prisma_version + image: prismagraphql/prisma:$$cap_app_version restart: always ports: - 4466:4466 @@ -34,7 +34,7 @@ services: containerHttpPort: '4466' caproverOneClickApp: variables: - - id: $$cap_prisma_version + - id: $$cap_app_version label: Prisma 1 Version defaultValue: '1.29' description: Check out their GitHub page for their latest version https://github.com/prisma/prisma1 diff --git a/public/v4/apps/privatebin.yml b/public/v4/apps/privatebin.yml index 4608648b7..a0125aa00 100644 --- a/public/v4/apps/privatebin.yml +++ b/public/v4/apps/privatebin.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: '$$cap_appname': - image: privatebin/nginx-fpm-alpine:$$cap_version + image: privatebin/nginx-fpm-alpine:$$cap_app_version environment: TZ: '$$cap_tz' PHP_TZ: '$$cap_tz' @@ -12,7 +12,7 @@ services: containerHttpPort: '8080' caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: PrivateBin Version defaultValue: '1.5.1' description: Check out their Docker page for the valid tags https://hub.docker.com/r/privatebin/nginx-fpm-alpine/tags diff --git a/public/v4/apps/projectsend.yml b/public/v4/apps/projectsend.yml index 1f562a5b4..033a8719e 100644 --- a/public/v4/apps/projectsend.yml +++ b/public/v4/apps/projectsend.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: linuxserver/projectsend:$$cap_projectsend_version + image: linuxserver/projectsend:$$cap_app_version environment: TZ: $$cap_tz PUID: '1000' @@ -15,7 +15,7 @@ services: containerHttpPort: '80' caproverOneClickApp: variables: - - id: $$cap_projectsend_version + - id: $$cap_app_version label: ProjectSend Version defaultValue: version-r1295 description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/projectsend/tags. If you want MSSQL support please use the tag r1053-ls27 diff --git a/public/v4/apps/prometheus.yml b/public/v4/apps/prometheus.yml index 068c13011..e0d6aa51f 100644 --- a/public/v4/apps/prometheus.yml +++ b/public/v4/apps/prometheus.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: prom/prometheus@$$cap_version + image: prom/prometheus@$$cap_app_version restart: always volumes: - $$cap_appname-config:/etc/prometheus @@ -13,7 +13,7 @@ caproverOneClickApp: - label: Prometheus Docker Hash defaultValue: sha256:43b19072ef98fd0ea5a29ac794fbadf365cca6d5247830034c7b86ae9650126c description: Starts with 'sha256:'. Find on Docker Hub. Default is latest as of 2020-06-30. - id: $$cap_version + id: $$cap_app_version instructions: end: Prometheus is now starting. start: 'Read more about Prometheus: https://prometheus.io/' diff --git a/public/v4/apps/prowlarr.yml b/public/v4/apps/prowlarr.yml index f888e0e29..21cc09e35 100644 --- a/public/v4/apps/prowlarr.yml +++ b/public/v4/apps/prowlarr.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: # Prowlarr $$cap_appname: - image: ghcr.io/linuxserver/prowlarr:$$cap_pr_version + image: ghcr.io/linuxserver/prowlarr:$$cap_app_version restart: unless-stopped environment: TZ: $$cap_tz @@ -14,7 +14,7 @@ services: containerHttpPort: '9696' caproverOneClickApp: variables: - - id: $$cap_pr_version + - id: $$cap_app_version label: Prowlarr Version defaultValue: 'amd64-nightly-version-0.1.0.718' description: Check out their Docker page for the valid tags https://github.com/linuxserver/docker-prowlarr/pkgs/container/prowlarr/versions diff --git a/public/v4/apps/pydio.yml b/public/v4/apps/pydio.yml index 30e817566..d8ef9bc59 100644 --- a/public/v4/apps/pydio.yml +++ b/public/v4/apps/pydio.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: # Pydio $$cap_appname: - image: pydio/cells:$$cap_pydio_version + image: pydio/cells:$$cap_app_version environment: CELLS_LOG_LEVEL: 'production' CELLS_BIND: ':8811' @@ -27,7 +27,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_pydio_version + - id: $$cap_app_version label: Pydio Version defaultValue: '2.2.8' description: Checkout their docker page for the valid tags https://hub.docker.com/r/pydio/cells/tags diff --git a/public/v4/apps/pyload.yml b/public/v4/apps/pyload.yml index 003bfbfa2..17a32fdc0 100644 --- a/public/v4/apps/pyload.yml +++ b/public/v4/apps/pyload.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: lscr.io/linuxserver/pyload-ng:$$cap_pyload_version + image: lscr.io/linuxserver/pyload-ng:$$cap_app_version environment: TZ: $$cap_tz PUID: $$cap_puid @@ -16,7 +16,7 @@ services: containerHttpPort: '8000' caproverOneClickApp: variables: - - id: $$cap_pyload_version + - id: $$cap_app_version label: Pyload Version defaultValue: 0.5.0 description: Check out their Docker page for the valid tags https://github.com/linuxserver/docker-pyload-ng/pkgs/container/pyload-ng diff --git a/public/v4/apps/qbittorrent.yml b/public/v4/apps/qbittorrent.yml index 6184fe27d..10bb29111 100644 --- a/public/v4/apps/qbittorrent.yml +++ b/public/v4/apps/qbittorrent.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: linuxserver/qbittorrent:$$cap_qbittorrent_version + image: linuxserver/qbittorrent:$$cap_app_version environment: TZ: $$cap_tz UMASK: 022 @@ -17,7 +17,7 @@ services: containerHttpPort: $$cap_webui_port caproverOneClickApp: variables: - - id: $$cap_qbittorrent_version + - id: $$cap_app_version label: qBittorrent Version defaultValue: version-14.3.5.99202105022253-7365-063844ed4ubuntu20.04.1 description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/qbittorrent/tags diff --git a/public/v4/apps/rabbitmq.yml b/public/v4/apps/rabbitmq.yml index bc3ab8008..400f4d43d 100644 --- a/public/v4/apps/rabbitmq.yml +++ b/public/v4/apps/rabbitmq.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: rabbitmq:$$cap_rabbitmq_version + image: rabbitmq:$$cap_app_version volumes: - $$cap_appname-rabbitmq-data:/var/lib/rabbitmq restart: always @@ -13,7 +13,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_rabbitmq_version + - id: $$cap_app_version label: RabbitMQ Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/rabbitmq/tags/ defaultValue: '3.7' diff --git a/public/v4/apps/radarr.yml b/public/v4/apps/radarr.yml index 89cf847ef..909c5a259 100644 --- a/public/v4/apps/radarr.yml +++ b/public/v4/apps/radarr.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: # Radarr $$cap_appname: - image: linuxserver/radarr:$$cap_radarr_version + image: linuxserver/radarr:$$cap_app_version environment: TZ: $$cap_tz PUID: $$cap_puid @@ -15,7 +15,7 @@ services: containerHttpPort: 7878 caproverOneClickApp: variables: - - id: $$cap_radarr_version + - id: $$cap_app_version label: Radarr Version defaultValue: version-3.0.1.4259 description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/radarr/tags diff --git a/public/v4/apps/radicale.yml b/public/v4/apps/radicale.yml index 97d9c1394..b77bd47b0 100644 --- a/public/v4/apps/radicale.yml +++ b/public/v4/apps/radicale.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: tomsquest/docker-radicale:$$cap_image_tag + image: tomsquest/docker-radicale:$$cap_app_version volumes: - $$cap_appname-data:/data restart: always @@ -10,7 +10,7 @@ services: containerHttpPort: '5232' caproverOneClickApp: variables: - - id: $$cap_image_tag + - id: $$cap_app_version label: What version/tag do you want? description: Go here to see all versions https://hub.docker.com/r/tomsquest/docker-radicale/tags defaultValue: 2.1.12.1 diff --git a/public/v4/apps/rainloop.yml b/public/v4/apps/rainloop.yml index 7416bbf15..580a5c282 100644 --- a/public/v4/apps/rainloop.yml +++ b/public/v4/apps/rainloop.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: hardware/rainloop:$$cap_rainloop_version + image: hardware/rainloop:$$cap_app_version restart: always volumes: - $$cap_appname-data:/rainloop/data @@ -9,7 +9,7 @@ services: containerHttpPort: '8888' caproverOneClickApp: variables: - - id: $$cap_rainloop_version + - id: $$cap_app_version label: Rainloop Version description: Check out their Docker page for the valid tags https://hub.docker.com/r/hardware/rainloop/tags defaultValue: 1.12.0 diff --git a/public/v4/apps/rallly.yml b/public/v4/apps/rallly.yml index 1b31fee0c..853e4b64a 100644 --- a/public/v4/apps/rallly.yml +++ b/public/v4/apps/rallly.yml @@ -4,7 +4,7 @@ services: restart: always depends_on: - $$cap_appname-postgres - image: 'lukevella/rallly:$$cap_rallly_version' + image: 'lukevella/rallly:$$cap_app_version' environment: NEXT_PUBLIC_BASE_URL: 'http://$$cap_appname.$$cap_root_domain' DATABASE_URL: >- @@ -31,7 +31,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_rallly_version + - id: $$cap_app_version label: Rallly Version defaultValue: ac55701890cd866ee946deb25e2b2839fb14900e description: >- diff --git a/public/v4/apps/raneto.yml b/public/v4/apps/raneto.yml index 12e4ebcbf..76851f698 100644 --- a/public/v4/apps/raneto.yml +++ b/public/v4/apps/raneto.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: linuxserver/raneto:$$cap_raneto_version + image: linuxserver/raneto:$$cap_app_version environment: TZ: $$cap_tz PUID: '1000' @@ -13,7 +13,7 @@ services: containerHttpPort: '3000' caproverOneClickApp: variables: - - id: $$cap_raneto_version + - id: $$cap_app_version label: Raneto Version defaultValue: 0.17.0-ls49 description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/raneto/tags diff --git a/public/v4/apps/readarr.yml b/public/v4/apps/readarr.yml index f5f34f271..66fff5f47 100644 --- a/public/v4/apps/readarr.yml +++ b/public/v4/apps/readarr.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: lscr.io/linuxserver/readarr:$$cap_readarr_version + image: lscr.io/linuxserver/readarr:$$cap_app_version environment: TZ: $$cap_tz PUID: $$cap_puid @@ -14,7 +14,7 @@ services: containerHttpPort: 8787 caproverOneClickApp: variables: - - id: $$cap_readarr_version + - id: $$cap_app_version label: Overseerr Version defaultValue: 0.3.12-nightly description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/readarr/tags diff --git a/public/v4/apps/redash.yml b/public/v4/apps/redash.yml index 4d658d0de..35e7c8340 100644 --- a/public/v4/apps/redash.yml +++ b/public/v4/apps/redash.yml @@ -4,7 +4,7 @@ services: caproverExtra: containerHttpPort: 5000 dockerfileLines: - - FROM redash/redash:$$cap_REDASH_VERSION + - FROM redash/redash:$$cap_app_version - CMD ["server"] environment: REDASH_WEB_WORKERS: $$cap_REDASH_WEB_WORKERS @@ -27,7 +27,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' dockerfileLines: - - FROM redash/redash:$$cap_REDASH_VERSION + - FROM redash/redash:$$cap_app_version - CMD ["scheduler"] environment: QUEUES: celery @@ -41,7 +41,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' dockerfileLines: - - FROM redash/redash:$$cap_REDASH_VERSION + - FROM redash/redash:$$cap_app_version - CMD ["worker"] environment: QUEUES: scheduled_queries,schemas @@ -55,7 +55,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' dockerfileLines: - - FROM redash/redash:$$cap_REDASH_VERSION + - FROM redash/redash:$$cap_app_version - CMD ["worker"] environment: QUEUES: queries @@ -98,7 +98,7 @@ caproverOneClickApp: You can access your Redash instance at `http://$$cap_appname.$$cap_root_domain`. variables: - - id: $$cap_REDASH_VERSION + - id: $$cap_app_version label: Application | Version description: Redash version. Check out their valid tags at https://hub.docker.com/r/redash/redash/tags defaultValue: '10.1.0.b50633' diff --git a/public/v4/apps/redis.yml b/public/v4/apps/redis.yml index fd69b4a42..0433c45cc 100644 --- a/public/v4/apps/redis.yml +++ b/public/v4/apps/redis.yml @@ -8,12 +8,12 @@ services: REDIS_PASSWORD: $$cap_redis_password caproverExtra: dockerfileLines: - - FROM redis:$$cap_redis_version + - FROM redis:$$cap_app_version - CMD exec redis-server --requirepass "$REDIS_PASSWORD" notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_redis_version + - id: $$cap_app_version label: Redis Version Tag description: 'Check out their Docker page for the valid tags: https://hub.docker.com/_/redis?tab=tags' defaultValue: '7.2.4' @@ -21,6 +21,7 @@ caproverOneClickApp: - id: $$cap_redis_password label: Redis Password validRegex: /^(\w|[^\s"])+$/ + defaultValue: $$cap_gen_random_hex(16) instructions: start: >- Redis is an open source key-value store that functions as a data structure server. diff --git a/public/v4/apps/redmine-mysql.yml b/public/v4/apps/redmine-mysql.yml index bf7132f15..ad513b270 100644 --- a/public/v4/apps/redmine-mysql.yml +++ b/public/v4/apps/redmine-mysql.yml @@ -15,7 +15,7 @@ services: $$cap_appname: depends_on: - $$cap_appname-db - image: redmine:$$cap_redmine_version + image: redmine:$$cap_app_version environment: REDMINE_DB_MYSQL: srv-captain--$$cap_appname-db REDMINE_DB_PORT: 3306 @@ -31,7 +31,7 @@ services: caproverOneClickApp: variables: - - id: $$cap_redmine_version + - id: $$cap_app_version label: Redmine Version defaultValue: '5.0.4' description: 'Check out their Docker page for the valid tags https://hub.docker.com/_/redmine?tab=tags' diff --git a/public/v4/apps/redmine.yml b/public/v4/apps/redmine.yml index c85f4ce42..2c7bf933f 100644 --- a/public/v4/apps/redmine.yml +++ b/public/v4/apps/redmine.yml @@ -16,7 +16,7 @@ services: $$cap_appname: depends_on: - $$cap_appname-db - image: redmine:$$cap_redmine_version + image: redmine:$$cap_app_version environment: REDMINE_DB_POSTGRES: srv-captain--$$cap_appname-db REDMINE_DB_PORT: 5432 @@ -34,7 +34,7 @@ services: caproverOneClickApp: variables: - - id: $$cap_redmine_version + - id: $$cap_app_version label: Redmine Version defaultValue: '5.0.4' description: 'Check out their Docker page for the valid tags https://hub.docker.com/_/redmine?tab=tags' diff --git a/public/v4/apps/remark42.yml b/public/v4/apps/remark42.yml index cfc25d8db..b3bf6c07d 100644 --- a/public/v4/apps/remark42.yml +++ b/public/v4/apps/remark42.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: umputun/remark42:$$cap_tag_version + image: umputun/remark42:$$cap_app_version hostname: $$cap_appname.$$cap_root_domain restart: always environment: @@ -115,7 +115,7 @@ services: containerHttpPort: '8080' caproverOneClickApp: variables: - - id: $$cap_tag_version + - id: $$cap_app_version label: Remark42 docker image tag defaultValue: 'v1.9.0' description: Valid tag from https://hub.docker.com/r/umputun/remark42/tags diff --git a/public/v4/apps/request-baskets.yml b/public/v4/apps/request-baskets.yml index 55429b44b..a277d136a 100644 --- a/public/v4/apps/request-baskets.yml +++ b/public/v4/apps/request-baskets.yml @@ -1,12 +1,12 @@ captainVersion: 4 services: $$cap_appname: - image: darklynx/request-baskets:$$cap_version + image: darklynx/request-baskets:$$cap_app_version caproverExtra: containerHttpPort: '55555' caproverOneClickApp: variables: - - id: $$cap_version + - id: $$cap_app_version label: Request Baskets Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/darklynx/request-baskets/tags/ defaultValue: 'v1.1.0' diff --git a/public/v4/apps/resilio-sync.yml b/public/v4/apps/resilio-sync.yml index 71fd80d22..ec00a0057 100644 --- a/public/v4/apps/resilio-sync.yml +++ b/public/v4/apps/resilio-sync.yml @@ -3,7 +3,7 @@ services: $$cap_appname: ports: - $$cap_port_sync:55555 - image: resilio/sync:$$cap_version + image: resilio/sync:$$cap_app_version restart: always volumes: - $$cap_appname-data:/mnt/sync @@ -14,7 +14,7 @@ caproverOneClickApp: - label: Resilio Sync Docker Version defaultValue: 2.6.4 description: It's highly recommended that you don't use the latest tag but instead the major version you need. - id: $$cap_version + id: $$cap_app_version - label: Listening port for Sync traffic description: Port that Sync listens on for data synchronization (TCP & UDP). defaultValue: '55555' diff --git a/public/v4/apps/rstudio.yml b/public/v4/apps/rstudio.yml index 3b3af625a..2902eae9a 100644 --- a/public/v4/apps/rstudio.yml +++ b/public/v4/apps/rstudio.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: rocker/rstudio:$$cap_rstudio_version + image: rocker/rstudio:$$cap_app_version volumes: - $$cap_appname-code:/home/rstudio restart: always @@ -12,7 +12,7 @@ services: containerHttpPort: '8787' caproverOneClickApp: variables: - - id: $$cap_rstudio_version + - id: $$cap_app_version label: RStudio Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/rocker/rstudio/tags defaultValue: '4.0.4' diff --git a/public/v4/apps/saleor.yml b/public/v4/apps/saleor.yml index 458e49047..dee0be141 100644 --- a/public/v4/apps/saleor.yml +++ b/public/v4/apps/saleor.yml @@ -3,7 +3,7 @@ services: $$cap_appname-api: caproverExtra: containerHttpPort: 8000 - image: ghcr.io/saleor/saleor:$$cap_SALEOR_CORE_VERSION + image: ghcr.io/saleor/saleor:$$cap_app_version environment: DASHBOARD_URL: http://$$cap_appname.$$cap_root_domain DATABASE_URL: postgresql://$$cap_POSTGRES_USER:$$cap_POSTGRES_PASSWORD@srv-captain--$$cap_appname-db/$$cap_POSTGRES_DB @@ -43,7 +43,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' dockerfileLines: - - FROM ghcr.io/saleor/saleor:$$cap_SALEOR_CORE_VERSION + - FROM ghcr.io/saleor/saleor:$$cap_app_version - CMD celery -A saleor --app=saleor.celeryconf:app worker --loglevel=info -B environment: DATABASE_URL: postgresql://$$cap_POSTGRES_USER:$$cap_POSTGRES_PASSWORD@srv-captain--$$cap_appname-db/$$cap_POSTGRES_DB @@ -86,7 +86,7 @@ caproverOneClickApp: You can access the dashboard at `http://$$cap_appname.$$cap_root_domain` You can access the API at `http://$$cap_appname-api.$$cap_root_domain` variables: - - id: $$cap_SALEOR_CORE_VERSION + - id: $$cap_app_version label: Core | Version description: Saleor core version. Check out their valid tags at https://github.com/saleor/saleor/pkgs/container/saleor defaultValue: '3.12.5' diff --git a/public/v4/apps/seafile.yml b/public/v4/apps/seafile.yml index fd961db11..d1d8f80d8 100644 --- a/public/v4/apps/seafile.yml +++ b/public/v4/apps/seafile.yml @@ -18,7 +18,7 @@ services: caproverExtra: notExposeAsWebApp: true $$cap_appname: - image: 'seafileltd/seafile-mc:$$cap_seafile_version' + image: 'seafileltd/seafile-mc:$$cap_app_version' volumes: - '$$cap_appname-seafile-data:/shared' environment: @@ -37,7 +37,7 @@ services: - seafile-net caproverOneClickApp: variables: - - id: $$cap_seafile_version + - id: $$cap_app_version label: Seafile Version defaultValue: 8.0.7 description: Check out their Docker page for the valid tags https://hub.docker.com/r/seafileltd/seafile-mc/tags diff --git a/public/v4/apps/seatable.yml b/public/v4/apps/seatable.yml index 9bd367581..77ee23d21 100644 --- a/public/v4/apps/seatable.yml +++ b/public/v4/apps/seatable.yml @@ -43,7 +43,7 @@ services: - seatable-net caproverExtra: dockerfileLines: - - FROM seatable/seatable:$$cap_seatable_version + - FROM seatable/seatable:$$cap_app_version - EXPOSE 80 - RUN apt-get -y install expect - RUN mkdir -p /shared @@ -52,7 +52,7 @@ services: caproverOneClickApp: variables: - - id: $$cap_seatable_version + - id: $$cap_app_version label: SeaTable Version defaultValue: 1.8.0 description: 'Check out their docker page for the valid tags https://hub.docker.com/r/seatable/seatable/tags?page=1&ordering=last_updated' diff --git a/public/v4/apps/sentry.yml b/public/v4/apps/sentry.yml index add128162..280c1325d 100644 --- a/public/v4/apps/sentry.yml +++ b/public/v4/apps/sentry.yml @@ -29,7 +29,7 @@ services: SENTRY_REDIS_HOST: srv-captain--$$cap_appname-redis caproverExtra: dockerfileLines: - - FROM sentry:$$cap_sentry_version + - FROM sentry:$$cap_app_version - RUN groupadd -r $$cap_appname-cron && useradd -r -g $$cap_appname-cron $$cap_appname-cron - USER $$cap_appname-cron - CMD sentry run cron @@ -48,7 +48,7 @@ services: SENTRY_DB_PASSWORD: $$cap_pg_pass caproverExtra: dockerfileLines: - - FROM sentry:$$cap_sentry_version + - FROM sentry:$$cap_app_version - RUN groupadd -r $$cap_appname-worker && useradd -r -g $$cap_appname-worker $$cap_appname-worker - USER $$cap_appname-worker - CMD sentry run worker @@ -61,7 +61,7 @@ services: - $$cap_appname-data:/var/lib/sentry/files restart: always environment: - CAP_SENTRY_VERSION: $$cap_sentry_version + CAP_SENTRY_VERSION: $$cap_app_version CAP_SENTRY_SUPERUSER_EMAIL: $$cap_sentry_superuser_email CAP_SENTRY_SUPERUSER_PASSWORD: $$cap_sentry_superuser_password SENTRY_POSTGRES_HOST: srv-captain--$$cap_appname-postgres @@ -81,7 +81,7 @@ services: caproverExtra: containerHttpPort: '9000' dockerfileLines: - - FROM sentry:$$cap_sentry_version + - FROM sentry:$$cap_app_version - "RUN echo 'auth.allow-registration: false' > /etc/sentry/config.yml" - "RUN echo 'beacon.anonymous: true' >> /etc/sentry/config.yml" - 'RUN echo ''mail.from: ""'' >> /etc/sentry/config.yml' @@ -97,7 +97,7 @@ services: - "RUN echo 'echo 1 of 4 : running upgrade' >> ./init.sh" - RUN echo 'sentry upgrade --noinput --traceback --no-repair' >> ./init.sh - "RUN echo 'echo 2 of 4 : set sentry:version-configured' >> ./init.sh" - - RUN echo 'sentry config set sentry:version-configured ${CAP_SENTRY_VERSION}' >> ./init.sh + - RUN echo 'sentry config set sentry:version-configured ${CAP_APP_VERSION}' >> ./init.sh - "RUN echo 'echo 3 of 4 : creating user' >> ./init.sh" - RUN echo 'sentry createuser --email=${CAP_SENTRY_SUPERUSER_EMAIL} --password=${CAP_SENTRY_SUPERUSER_PASSWORD} --superuser --no-input' >> ./init.sh - RUN echo 'echo Configuration completed!' >> ./init.sh @@ -119,7 +119,7 @@ caproverOneClickApp: description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/redis/tags/ defaultValue: 3.2-alpine validRegex: /^([^\s^\/])+$/ - - id: $$cap_sentry_version + - id: $$cap_app_version label: Sentry Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/_/sentry/ defaultValue: 9.1.0 diff --git a/public/v4/apps/serpbear.yml b/public/v4/apps/serpbear.yml index 8424fd9d8..6a585c6df 100644 --- a/public/v4/apps/serpbear.yml +++ b/public/v4/apps/serpbear.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: $$cap_appname: restart: always - image: 'towfiqi/serpbear:$$cap_serpbear_version' + image: 'towfiqi/serpbear:$$cap_app_version' environment: NEXT_PUBLIC_APP_URL: 'http://$$cap_appname.$$cap_root_domain' USER: $$cap_serpbear_user @@ -16,7 +16,7 @@ services: - '$$cap_appname-serpbear-data:/app/data' caproverOneClickApp: variables: - - id: $$cap_serpbear_version + - id: $$cap_app_version label: SerpBear Version description: >- Check out the docker page for valid tags diff --git a/public/v4/apps/shiori.yml b/public/v4/apps/shiori.yml index aa887c969..ee0a9c192 100644 --- a/public/v4/apps/shiori.yml +++ b/public/v4/apps/shiori.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: # Shiori $$cap_appname: - image: ghcr.io/go-shiori/shiori:$$cap_shiori_version + image: ghcr.io/go-shiori/shiori:$$cap_app_version environment: SHIORI_DBMS: mysql SHIORI_MYSQL_USER: $$cap_mariadb-user @@ -28,7 +28,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_shiori_version + - id: $$cap_app_version label: Shiori Version Tag description: Check out their Docker page for the valid tags https://github.com/go-shiori/shiori/pkgs/container/shiori/versions?filters%5Bversion_type%5D=tagged defaultValue: 'v1.5.5' diff --git a/public/v4/apps/shopware.yml b/public/v4/apps/shopware.yml index 85ffe5f63..e9637137a 100644 --- a/public/v4/apps/shopware.yml +++ b/public/v4/apps/shopware.yml @@ -15,7 +15,7 @@ services: $$cap_appname-shopware: depends_on: - $$cap_appname-db - image: shyim/shopware:$$cap_sw_version + image: shyim/shopware:$$cap_app_version restart: always environment: DATABASE_HOST: srv-captain--$$cap_appname-db:3306 @@ -56,7 +56,7 @@ caproverOneClickApp: - id: $$cap_db_pass label: Database password description: '' - - id: $$cap_sw_version + - id: $$cap_app_version label: Shopware Version defaultValue: 6.2.0 description: Check out their Docker page for the valid tags https://hub.docker.com/r/shyim/shopware/tags/ diff --git a/public/v4/apps/sinusbot.yml b/public/v4/apps/sinusbot.yml index b39055aa0..59e5406ae 100644 --- a/public/v4/apps/sinusbot.yml +++ b/public/v4/apps/sinusbot.yml @@ -4,7 +4,7 @@ services: environment: UID: $$cap_uid GID: $$cap_gid - image: sinusbot/docker:$$cap_version + image: sinusbot/docker:$$cap_app_version restart: always volumes: - $$cap_appname-data:/opt/sinusbot/data @@ -16,7 +16,7 @@ caproverOneClickApp: - label: SinusBot Docker Version defaultValue: 1.0.0-beta.10-202ee4d description: It's highly recommended that you don't use the latest tag but instead the major version you need. - id: $$cap_version + id: $$cap_app_version - label: UID description: User ID to run the service as (using root is not recommended), see https://github.com/SinusBot/docker#unprivileged-user defaultValue: '1000' diff --git a/public/v4/apps/smokeping.yml b/public/v4/apps/smokeping.yml index 23be42e92..d04e9a78d 100644 --- a/public/v4/apps/smokeping.yml +++ b/public/v4/apps/smokeping.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: $$cap_appname: documentation: https://docs.linuxserver.io/images/docker-smokeping - image: linuxserver/smokeping:$$cap_smokeping_version + image: linuxserver/smokeping:$$cap_app_version restart: always volumes: - $$cap_appname-config:/config @@ -15,7 +15,7 @@ services: containerHttpPort: '80' caproverOneClickApp: variables: - - id: $$cap_smokeping_version + - id: $$cap_app_version label: Smokeping Version defaultValue: '2.7.3' description: Smokeping Image Version diff --git a/public/v4/apps/sonarqube.yml b/public/v4/apps/sonarqube.yml index 93ddad832..44d4572a8 100644 --- a/public/v4/apps/sonarqube.yml +++ b/public/v4/apps/sonarqube.yml @@ -15,7 +15,7 @@ services: ports: - 5432:5432 $$cap_appname: - image: sonarqube:$$cap_sonar_version + image: sonarqube:$$cap_app_version depends_on: - $$cap_appname-db volumes: @@ -37,7 +37,7 @@ caproverOneClickApp: defaultValue: '9.6' description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/postgres/tags/ validRegex: /^([^\s^\/])+$/ - - id: $$cap_sonar_version + - id: $$cap_app_version label: Sonarqube Version defaultValue: 10.2.1-community description: Check out their Docker page for the valid tags https://hub.docker.com/_/sonarqube?tab=tags/ diff --git a/public/v4/apps/sonarr.yml b/public/v4/apps/sonarr.yml index 712bf71b5..2fa43ca06 100644 --- a/public/v4/apps/sonarr.yml +++ b/public/v4/apps/sonarr.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: linuxserver/sonarr:$$cap_sonarr_version + image: linuxserver/sonarr:$$cap_app_version environment: TZ: $$cap_tz PUID: $$cap_puid @@ -15,7 +15,7 @@ services: containerHttpPort: 8989 caproverOneClickApp: variables: - - id: $$cap_sonarr_version + - id: $$cap_app_version label: Sonarr Version defaultValue: preview description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/sonarr/tags diff --git a/public/v4/apps/sourcegraph.yml b/public/v4/apps/sourcegraph.yml index 8378547f9..c5b43e81b 100644 --- a/public/v4/apps/sourcegraph.yml +++ b/public/v4/apps/sourcegraph.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: sourcegraph/server:$$cap_container_version + image: sourcegraph/server:$$cap_app_version volumes: - $$cap_appname-config:/etc/sourcegraph - $$cap_appname-data:/var/opt/sourcegraph @@ -10,7 +10,7 @@ services: containerHttpPort: '7080' caproverOneClickApp: variables: - - id: $$cap_container_version + - id: $$cap_app_version label: Version defaultValue: 3.2.2 description: Check out their Docker page for the valid tags https://hub.docker.com/r/sourcegraph/server/tags diff --git a/public/v4/apps/spigot.yml b/public/v4/apps/spigot.yml index f3509d02d..9814872d4 100644 --- a/public/v4/apps/spigot.yml +++ b/public/v4/apps/spigot.yml @@ -9,7 +9,7 @@ services: MC_MAXMEM: $$cap_maxmem MC_MINMEM: $$cap_minmem SPIGOT_AUTORESTART: $$cap_autorestart - image: nimmis/spigot@$$cap_version + image: nimmis/spigot@$$cap_app_version restart: always volumes: - $$cap_appname-data:/minecraft @@ -24,7 +24,7 @@ caproverOneClickApp: - label: Docker Image Version description: The Docker image used does not offer version tags. Since the use of the latest tag is not recommended, refer to the image version by SHA tag. defaultValue: sha256:b968685fadb79e6dacca8efc030ee53f695441b8d6dfde4b86e027ba1f6796db - id: $$cap_version + id: $$cap_app_version - label: Game Server Port (TCP/UDP) description: This is the port the server will expose for players to join. defaultValue: '25565' diff --git a/public/v4/apps/squidex.yml b/public/v4/apps/squidex.yml index d7104a57d..4f99ed68a 100644 --- a/public/v4/apps/squidex.yml +++ b/public/v4/apps/squidex.yml @@ -3,7 +3,7 @@ services: $$cap_appname: depends_on: - $$cap_appname-db - image: 'squidex/squidex:$$cap_squidex_version' + image: 'squidex/squidex:$$cap_app_version' volumes: - '$$cap_appname-data:/app/Assets' restart: always @@ -37,7 +37,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_squidex_version + - id: $$cap_app_version label: Squidex Version defaultValue: 4.6.0 description: >- diff --git a/public/v4/apps/statping.yml b/public/v4/apps/statping.yml index 772ca9a83..cce8905ee 100644 --- a/public/v4/apps/statping.yml +++ b/public/v4/apps/statping.yml @@ -4,7 +4,7 @@ services: $$cap_appname: depends_on: - $$cap_appname-postgres - image: statping/statping:$$cap_statping_version + image: statping/statping:$$cap_app_version volumes: - $$cap_appname-app:/app environment: @@ -31,7 +31,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_statping_version + - id: $$cap_app_version label: Statping Version defaultValue: 'v0.90.74' description: Check out their docker page for the valid tags https://hub.docker.com/r/statping/statping/tags diff --git a/public/v4/apps/stirling-pdf.yml b/public/v4/apps/stirling-pdf.yml index db3567287..1768cd68c 100644 --- a/public/v4/apps/stirling-pdf.yml +++ b/public/v4/apps/stirling-pdf.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: frooodle/s-pdf:$$cap_stirling_version + image: frooodle/s-pdf:$$cap_app_version environment: - DOCKER_ENABLE_SECURITY=false volumes: @@ -14,7 +14,7 @@ services: containerHttpPort: '8080' caproverOneClickApp: variables: - - id: $$cap_stirling_version + - id: $$cap_app_version label: stirling version tag description: Check out their docker page for the valid tags @ https://hub.docker.com/r/frooodle/s-pdf defaultValue: 0.19.1 diff --git a/public/v4/apps/strapi-postgres.yml b/public/v4/apps/strapi-postgres.yml index 3dae5d3b0..b4e52543f 100644 --- a/public/v4/apps/strapi-postgres.yml +++ b/public/v4/apps/strapi-postgres.yml @@ -3,7 +3,7 @@ services: $$cap_appname-core: depends_on: - $$cap_appname-postgres - image: strapi/strapi:$$cap_strapi_version + image: strapi/strapi:$$cap_app_version volumes: - $$cap_appname-data:/srv/app restart: always @@ -29,7 +29,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_strapi_version + - id: $$cap_app_version label: Strapi Version defaultValue: 3.3.3 description: Check out their page for the valid versions https://hub.docker.com/r/strapi/strapi/tags diff --git a/public/v4/apps/strapi.yml b/public/v4/apps/strapi.yml index 216d38f8c..5db67a440 100644 --- a/public/v4/apps/strapi.yml +++ b/public/v4/apps/strapi.yml @@ -3,7 +3,7 @@ services: $$cap_appname: depends_on: - $$cap_appname-mongo - image: naskio/strapi:$$cap_strapi_version + image: naskio/strapi:$$cap_app_version volumes: - $$cap_appname-data:/srv/app restart: always @@ -32,7 +32,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_strapi_version + - id: $$cap_app_version label: Strapi Version defaultValue: 4.3.2 description: Check out the Docker page for the valid tags https://hub.docker.com/r/strapi/strapi/tags diff --git a/public/v4/apps/supertokens.yml b/public/v4/apps/supertokens.yml index 10dc0837f..88f2f9d14 100644 --- a/public/v4/apps/supertokens.yml +++ b/public/v4/apps/supertokens.yml @@ -16,7 +16,7 @@ services: $$cap_appname: depends_on: - $$cap_appname-postgres - image: supertokens/supertokens-postgresql:$$cap_supertokens_version + image: supertokens/supertokens-postgresql:$$cap_app_version restart: always environment: API_KEYS: $$cap_supertokens_api_keys @@ -37,7 +37,7 @@ caproverOneClickApp: description: Auth Provider solution alternative to Auth0 / Firebase Auth / AWS Cognito documentation: For more information, https://supertokens.com/docs/guides variables: - - id: $$cap_supertokens_version + - id: $$cap_app_version label: SuperTokens Version description: Choose the latest version of SuperTokens from https://hub.docker.com/r/supertokens/supertokens-postgresql/tags defaultValue: '7.0' diff --git a/public/v4/apps/surrealdb.yml b/public/v4/apps/surrealdb.yml index ebe404029..94410c7a9 100644 --- a/public/v4/apps/surrealdb.yml +++ b/public/v4/apps/surrealdb.yml @@ -10,12 +10,12 @@ services: caproverExtra: notExposeAsWebApp: 'true' dockerfileLines: - - FROM surrealdb/surrealdb:$$cap_surrealdb_version + - FROM surrealdb/surrealdb:$$cap_app_version - EXPOSE 8000 - CMD ["start", "--user", "$$cap_db_user", "--pass", "$$cap_db_pass", "--bind","0.0.0.0:8000", "file://data/srdb.db"] caproverOneClickApp: variables: - - id: $$cap_surrealdb_version + - id: $$cap_app_version label: SurrealDB Version defaultValue: '1.0.0-beta.7' description: Check out their Docker page for the valid tags https://hub.docker.com/r/surrealdb/surrealdb/tags diff --git a/public/v4/apps/syncthing.yml b/public/v4/apps/syncthing.yml index 0d0f789e1..bd1df8536 100644 --- a/public/v4/apps/syncthing.yml +++ b/public/v4/apps/syncthing.yml @@ -3,7 +3,7 @@ services: $$cap_appname: ports: - $$cap_port_sync:22000 - image: syncthing/syncthing:$$cap_version + image: syncthing/syncthing:$$cap_app_version restart: always volumes: - $$cap_appname-data:/var/syncthing @@ -14,7 +14,7 @@ caproverOneClickApp: - label: Syncthing Docker Version defaultValue: 1.5.0 description: It's highly recommended that you don't use the latest tag but instead the major version you need. - id: $$cap_version + id: $$cap_app_version - label: Sync Protocol Listening Port description: Port that Syncthing listens on for data synchronization (TCP). defaultValue: '22000' diff --git a/public/v4/apps/tautulli.yml b/public/v4/apps/tautulli.yml index cb50fc8bb..10275ff9d 100644 --- a/public/v4/apps/tautulli.yml +++ b/public/v4/apps/tautulli.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: tautulli/tautulli:$$cap_version + image: tautulli/tautulli:$$cap_app_version restart: always volumes: - $$cap_appname-config:/config @@ -13,7 +13,7 @@ services: containerHttpPort: '8181' caproverOneClickApp: variables: - - id: $$cap_version + - id: $$cap_app_version label: Tautulli Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/tautulli/tautulli/tags?page=1&ordering=last_updated defaultValue: 'v2.7.5' diff --git a/public/v4/apps/teamspeak.yml b/public/v4/apps/teamspeak.yml index 362fad424..2863ae974 100644 --- a/public/v4/apps/teamspeak.yml +++ b/public/v4/apps/teamspeak.yml @@ -7,7 +7,7 @@ services: - $$cap_port_query:10011 environment: TS3SERVER_LICENSE: accept - image: teamspeak:$$cap_version + image: teamspeak:$$cap_app_version restart: always volumes: - $$cap_appname-data:/var/ts3server/ @@ -18,7 +18,7 @@ caproverOneClickApp: - label: TeamSpeak Docker Version defaultValue: 3.13.7 description: It's highly recommended that you don't use the latest tag but instead the major version you need, e.g. teamspeak:3.12.0 - id: $$cap_version + id: $$cap_app_version - label: Voice Port (UDP) description: Port for voice (UDP) defaultValue: '9987' diff --git a/public/v4/apps/telegraf.yml b/public/v4/apps/telegraf.yml index f7813d1f6..b469d9a98 100644 --- a/public/v4/apps/telegraf.yml +++ b/public/v4/apps/telegraf.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: telegraf:$$cap_version + image: telegraf:$$cap_app_version restart: always volumes: - $$cap_appname-config:/etc/telegraf @@ -12,7 +12,7 @@ caproverOneClickApp: - label: Telegraf Version defaultValue: 1.17.3-alpine description: Find versions on DockerHub https://hub.docker.com/_/telegraf?tab=tags - id: $$cap_version + id: $$cap_app_version instructions: end: Telegraf is now starting. Navigate to the mountpoint of $$cap_appname-config to configure your instance. Read https://github.com/docker-library/docs/tree/master/telegraf#using-a-custom-config-file start: Telegraf is an open source agent written in Go for collecting metrics and data on the system it's running on or from other services. Telegraf writes data it collects to InfluxDB in the correct format. diff --git a/public/v4/apps/teslamate.yml b/public/v4/apps/teslamate.yml index 0d95b0c1b..1e750094f 100644 --- a/public/v4/apps/teslamate.yml +++ b/public/v4/apps/teslamate.yml @@ -40,7 +40,7 @@ services: caproverExtra: containerHttpPort: 4000 websocketSupport: 'true' - image: teslamate/teslamate:$$cap_TESLAMATE_VERSION + image: teslamate/teslamate:$$cap_app_version environment: ENCRYPTION_KEY: $$cap_SECRET_KEY DATABASE_USER: $$cap_DATABASE_USER @@ -74,7 +74,7 @@ caproverOneClickApp: defaultValue: '1.28' description: Check out their Docker page for the valid tags https://hub.docker.com/r/teslamate/grafana/tags validRegex: /^([^\s^\/])+$/ - - id: $$cap_TESLAMATE_VERSION + - id: $$cap_app_version label: Application | Version defaultValue: '1.28' description: Check out their Docker page for the valid tags https://hub.docker.com/r/teslamate/teslamate/tags diff --git a/public/v4/apps/the-lounge.yml b/public/v4/apps/the-lounge.yml index 8c6866921..089a3d44b 100644 --- a/public/v4/apps/the-lounge.yml +++ b/public/v4/apps/the-lounge.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: thelounge/thelounge:$$cap_lounge_version + image: thelounge/thelounge:$$cap_app_version restart: always volumes: - $$cap_appname-data:/var/opt/thelounge @@ -9,7 +9,7 @@ services: containerHttpPort: '9000' caproverOneClickApp: variables: - - id: $$cap_lounge_version + - id: $$cap_app_version label: The Lounge Version Tag defaultValue: 4.1.0 description: Check out their Docker page for the valid tags https://hub.docker.com/r/thelounge/thelounge/tags diff --git a/public/v4/apps/thingsboard-postgres.yml b/public/v4/apps/thingsboard-postgres.yml index 29ad9df75..fe72b399e 100644 --- a/public/v4/apps/thingsboard-postgres.yml +++ b/public/v4/apps/thingsboard-postgres.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: '$$cap_appname': - image: 'thingsboard/tb-postgres:$$cap_version' + image: 'thingsboard/tb-postgres:$$cap_app_version' ports: - '$$mqtt_port:1883' - '$$coap_port:5683' @@ -14,7 +14,7 @@ services: containerHttpPort: '9090' caproverOneClickApp: variables: - - id: '$$cap_version' + - id: $$cap_app_version label: ThingsBoard Version defaultValue: '3.2.2' description: Check out their Docker page for the valid tags hhttps://hub.docker.com/r/thingsboard/tb-postgres/tags diff --git a/public/v4/apps/thumbor.yml b/public/v4/apps/thumbor.yml index 19024f83c..e0000f5fc 100644 --- a/public/v4/apps/thumbor.yml +++ b/public/v4/apps/thumbor.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: minimalcompact/thumbor:$$cap_thumbor_version + image: minimalcompact/thumbor:$$cap_app_version volumes: - $$cap_appname-data:/data restart: always @@ -9,7 +9,7 @@ services: THUMBOR_PORT: '80' caproverOneClickApp: variables: - - id: $$cap_thumbor_version + - id: $$cap_app_version label: Thumbor Version defaultValue: 6.7.0 description: Check out their Docker page for the valid tags https://hub.docker.com/r/minimalcompact/thumbor/tags/ diff --git a/public/v4/apps/traggo.yml b/public/v4/apps/traggo.yml index f39d65996..ebdab770d 100644 --- a/public/v4/apps/traggo.yml +++ b/public/v4/apps/traggo.yml @@ -10,10 +10,10 @@ services: caproverExtra: containerHttpPort: '3030' dockerfileLines: - - FROM traggo/server:$$cap_traggo_version + - FROM traggo/server:$$cap_app_version caproverOneClickApp: variables: - - id: $$cap_traggo_version + - id: $$cap_app_version label: Traggo Version Tag description: 'Check out their Docker page for the valid tags: https://hub.docker.com/r/traggo/server/tags' defaultValue: '0.2.1' diff --git a/public/v4/apps/transfer-sh.yml b/public/v4/apps/transfer-sh.yml index c04055932..f581cab4a 100644 --- a/public/v4/apps/transfer-sh.yml +++ b/public/v4/apps/transfer-sh.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: dutchcoders/transfer.sh:$$cap_transfersh_version + image: dutchcoders/transfer.sh:$$cap_app_version environment: LISTENER: '8080' FORCE_HTTPS: 'false' @@ -11,7 +11,7 @@ services: containerHttpPort: '8080' caproverOneClickApp: variables: - - id: $$cap_transfersh_version + - id: $$cap_app_version label: Transfer SH Version defaultValue: v1.4.0 description: Check out their Docker page for the valid tags https://hub.docker.com/r/dutchcoders/transfer.sh/tags diff --git a/public/v4/apps/transmission.yml b/public/v4/apps/transmission.yml index 6dfb49761..847c9a881 100644 --- a/public/v4/apps/transmission.yml +++ b/public/v4/apps/transmission.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: ghcr.io/linuxserver/transmission:$$cap_transmission_version + image: ghcr.io/linuxserver/transmission:$$cap_app_version environment: PUID: '1000' PGID: '1000' @@ -23,7 +23,7 @@ services: containerHttpPort: '9091' caproverOneClickApp: variables: - - id: $$cap_transmission_version + - id: $$cap_app_version label: Transmission Version defaultValue: arm64v8-version-3.00-r2 description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/transmission/tags diff --git a/public/v4/apps/trudesk.yml b/public/v4/apps/trudesk.yml index 5b137c1aa..0212b4178 100644 --- a/public/v4/apps/trudesk.yml +++ b/public/v4/apps/trudesk.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: polonel/trudesk:$$cap_trudesk_version + image: polonel/trudesk:$$cap_app_version volumes: - $$cap_appname-data:/usr/src/trudesk/public/uploads - $$cap_appname-plugins:/usr/src/trudesk/plugins @@ -50,7 +50,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_trudesk_version + - id: $$cap_app_version label: Trudesk Version defaultValue: '1.2.10' description: Check out their docker page for the valid tags https://hub.docker.com/r/polonel/trudesk/tags diff --git a/public/v4/apps/tubesync.yml b/public/v4/apps/tubesync.yml index fe960ee84..6a2a5b78d 100644 --- a/public/v4/apps/tubesync.yml +++ b/public/v4/apps/tubesync.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: ghcr.io/meeb/tubesync:$$cap_tubesync_version + image: ghcr.io/meeb/tubesync:$$cap_app_version volumes: - $$cap_appname-config:/config - $$cap_appname-downloads:/downloads @@ -16,7 +16,7 @@ services: containerHttpPort: '4848' caproverOneClickApp: variables: - - id: $$cap_tubesync_version + - id: $$cap_app_version label: TubeSync Version defaultValue: 'v0.12.0' description: Check out their docker page for the valid tags https://github.com/meeb/tubesync/tags diff --git a/public/v4/apps/typebot.yml b/public/v4/apps/typebot.yml index dc3996791..310b1fa6e 100644 --- a/public/v4/apps/typebot.yml +++ b/public/v4/apps/typebot.yml @@ -3,7 +3,7 @@ services: $$cap_appname-builder: caproverExtra: containerHttpPort: 3000 - image: baptistearno/typebot-builder:$$cap_TYPEBOT_VERSION + image: baptistearno/typebot-builder:$$cap_app_version environment: DATABASE_URL: postgresql://$$cap_POSTGRES_USER:$$cap_POSTGRES_PASSWORD@srv-captain--$$cap_appname-db/$$cap_POSTGRES_DB NEXTAUTH_URL: http://$$cap_appname-builder.$$cap_root_domain @@ -26,7 +26,7 @@ services: $$cap_appname-viewer: caproverExtra: containerHttpPort: 3000 - image: baptistearno/typebot-viewer:$$cap_TYPEBOT_VERSION + image: baptistearno/typebot-viewer:$$cap_app_version environment: DATABASE_URL: postgresql://$$cap_POSTGRES_USER:$$cap_POSTGRES_PASSWORD@srv-captain--$$cap_appname-db/$$cap_POSTGRES_DB NEXTAUTH_URL: http://$$cap_appname-builder.$$cap_root_domain @@ -90,7 +90,7 @@ caproverOneClickApp: description: Password of the database user. defaultValue: $$cap_gen_random_hex(16) validRegex: /.{1,}/ - - id: $$cap_TYPEBOT_VERSION + - id: $$cap_app_version label: TYPEBOT_VERSION description: Version of Typebot. Check out their valid tags at https://hub.docker.com/r/baptistearno/typebot-builder/tags defaultValue: 2.22.2 diff --git a/public/v4/apps/ubooquity.yml b/public/v4/apps/ubooquity.yml index 165dc4411..c98da83a8 100644 --- a/public/v4/apps/ubooquity.yml +++ b/public/v4/apps/ubooquity.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: lscr.io/linuxserver/ubooquity:$$cap_ubooquity_version + image: lscr.io/linuxserver/ubooquity:$$cap_app_version environment: PUID: '1000' PGID: '1000' @@ -19,7 +19,7 @@ services: containerHttpPort: '2202' caproverOneClickApp: variables: - - id: $$cap_ubooquity_version + - id: $$cap_app_version label: Ubooquity Version defaultValue: 2.1.2 description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/ubooquity/tags diff --git a/public/v4/apps/umami-mysql.yml b/public/v4/apps/umami-mysql.yml index 5206d7041..37020060d 100644 --- a/public/v4/apps/umami-mysql.yml +++ b/public/v4/apps/umami-mysql.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: # Umami mysql $$cap_appname: - image: ghcr.io/umami-software/umami:mysql-$$cap_umami_version + image: ghcr.io/umami-software/umami:mysql-$$cap_app_version restart: always environment: DATABASE_URL: mysql://umami:$$cap_mysql_pass@srv-captain--$$cap_appname-mysql/umami @@ -30,7 +30,7 @@ caproverOneClickApp: defaultValue: '8' description: Checkout their page for the valid tags https://hub.docker.com/_/mysql validRegex: /^([^\s^\/])+$/ - - id: $$cap_umami_version + - id: $$cap_app_version label: Caprover Umami Version defaultValue: 'v1.38.0' description: Checkout their github page for the valid tags https://github.com/umami-software/umami/pkgs/container/umami diff --git a/public/v4/apps/umami-only.yml b/public/v4/apps/umami-only.yml index 2c2ddd923..736bfc522 100644 --- a/public/v4/apps/umami-only.yml +++ b/public/v4/apps/umami-only.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: # Umami $$cap_appname: - image: ghcr.io/umami-software/umami:$$cap_db_type-$$cap_umami_version + image: ghcr.io/umami-software/umami:$$cap_db_type-$$cap_app_version restart: always environment: DATABASE_URL: $$cap_db_type://$$cap_db_user:$$cap_db_pass@$$cap_db_url/$$cap_db_name @@ -10,7 +10,7 @@ services: containerHttpPort: '3000' caproverOneClickApp: variables: - - id: '$$cap_umami_version' + - id: $$cap_app_version label: Caprover Umami Version defaultValue: 'v1.38.0' description: Checkout their github page for the valid tags https://github.com/umami-software/umami/pkgs/container/umami diff --git a/public/v4/apps/umami-postgresql.yml b/public/v4/apps/umami-postgresql.yml index 556a6b169..563e25516 100644 --- a/public/v4/apps/umami-postgresql.yml +++ b/public/v4/apps/umami-postgresql.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: # Umami postgres $$cap_appname: - image: ghcr.io/umami-software/umami:postgresql-$$cap_umami_version + image: ghcr.io/umami-software/umami:postgresql-$$cap_app_version restart: always environment: DATABASE_URL: postgresql://umami:$$cap_postgres_pass@srv-captain--$$cap_appname-postgres/umami @@ -30,7 +30,7 @@ caproverOneClickApp: defaultValue: '14.5-alpine' description: Checkout their page for the valid tags https://hub.docker.com/_/postgres validRegex: /^([^\s^\/])+$/ - - id: $$cap_umami_version + - id: $$cap_app_version label: Caprover Umami Version defaultValue: 'v1.38.0' description: Checkout their github page for the valid tags https://github.com/umami-software/umami/pkgs/container/umami diff --git a/public/v4/apps/uptime-kuma.yml b/public/v4/apps/uptime-kuma.yml index d6f982068..577e29595 100644 --- a/public/v4/apps/uptime-kuma.yml +++ b/public/v4/apps/uptime-kuma.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: # Uptime Kuma $$cap_appname: - image: louislam/uptime-kuma:$$cap_kuma_version + image: louislam/uptime-kuma:$$cap_app_version restart: unless-stopped volumes: - $$cap_appname-data:/app/data @@ -11,7 +11,7 @@ services: websocketSupport: 'true' caproverOneClickApp: variables: - - id: $$cap_kuma_version + - id: $$cap_app_version label: Uptime Kuma Version defaultValue: 1.23.11 description: Check out their Docker page for the valid tags https://hub.docker.com/r/louislam/uptime-kuma/tags diff --git a/public/v4/apps/valkey.yml b/public/v4/apps/valkey.yml index 8edff78ac..0650be4a4 100644 --- a/public/v4/apps/valkey.yml +++ b/public/v4/apps/valkey.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: valkey/valkey:$$cap_valkey_version + image: valkey/valkey:$$cap_app_version volumes: - $$cap_appname-valkey-data:/data restart: always @@ -11,7 +11,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_valkey_version + - id: $$cap_app_version label: Valkey Version Tag description: 'Check out their Docker page for the valid tags: https://hub.docker.com/valkey/valkey?tab=tags' defaultValue: '8.0.1-alpine' diff --git a/public/v4/apps/verdaccio.yml b/public/v4/apps/verdaccio.yml index 678a37062..1dc00f67c 100644 --- a/public/v4/apps/verdaccio.yml +++ b/public/v4/apps/verdaccio.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: verdaccio/verdaccio:$$cap__verdaccio_version + image: verdaccio/verdaccio:$$cap_app_version volumes: - $$cap_appname-storage:/verdaccio/storage - $$cap_appname-conf:/verdaccio/conf @@ -12,7 +12,7 @@ services: containerHttpPort: '4873' caproverOneClickApp: variables: - - id: $$cap__verdaccio_version + - id: $$cap_app_version label: Verdaccio Version defaultValue: 3.11.6 description: 'Additional tags can be found here: https://hub.docker.com/r/verdaccio/verdaccio/tags' diff --git a/public/v4/apps/vscode-coder.yml b/public/v4/apps/vscode-coder.yml index 18db4fc4d..28ac59e7b 100644 --- a/public/v4/apps/vscode-coder.yml +++ b/public/v4/apps/vscode-coder.yml @@ -13,7 +13,7 @@ services: caproverExtra: containerHttpPort: '8080' dockerfileLines: - - FROM codercom/code-server:$$cap_coder_version + - FROM codercom/code-server:$$cap_app_version - '# Similar to the original file, except setting the user to root to prevent permission issues.' - USER root caproverOneClickApp: @@ -22,7 +22,8 @@ caproverOneClickApp: id: $$cap_coder_password label: Password validRegex: /^[^"]*$/ - - id: $$cap_coder_version + defaultValue: $$cap_gen_random_hex(16) + - id: $$cap_app_version label: Code Server Version defaultValue: 3.9.1 description: Check out their Docker page for the valid tags https://hub.docker.com/r/codercom/code-server/tags/ diff --git a/public/v4/apps/vsts.yml b/public/v4/apps/vsts.yml index 0c4d8a2da..4c2b8c466 100644 --- a/public/v4/apps/vsts.yml +++ b/public/v4/apps/vsts.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: microsoft/vsts-agent:$$cap_vsts_version + image: microsoft/vsts-agent:$$cap_app_version restart: always environment: VSTS_ACCOUNT: $$cap_vsts_account @@ -12,7 +12,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock caproverOneClickApp: variables: - - id: $$cap_vsts_version + - id: $$cap_app_version label: VSTS Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/microsoft/vsts-agent/tags/ defaultValue: ubuntu-16.04-standard diff --git a/public/v4/apps/vvveb-only.yml b/public/v4/apps/vvveb-only.yml index 2a3b838be..196a8d043 100644 --- a/public/v4/apps/vvveb-only.yml +++ b/public/v4/apps/vvveb-only.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname-vvveb: - image: vvveb/vvvebcms:$$cap_vvveb_version + image: vvveb/vvvebcms:$$cap_app_version volumes: - $$cap_appname-vvveb-data:/var/www/html restart: always @@ -34,7 +34,7 @@ caproverOneClickApp: description: '' validRegex: /.{1,}/ defaultValue: $$cap_gen_random_hex(16) - - id: $$cap_vvveb_version + - id: $$cap_app_version label: Vvveb Version defaultValue: 'php8.3-fpm-alpine' description: Check out their Docker page for the valid tags https://hub.docker.com/r/vvveb/vvvebcms/tags diff --git a/public/v4/apps/vvveb.yml b/public/v4/apps/vvveb.yml index c2eb4904d..0caf5405a 100644 --- a/public/v4/apps/vvveb.yml +++ b/public/v4/apps/vvveb.yml @@ -15,7 +15,7 @@ services: $$cap_appname-vvveb: depends_on: - $$cap_appname-db - image: vvveb/vvvebcms:$$cap_vvveb_version + image: vvveb/vvvebcms:$$cap_app_version volumes: - $$cap_appname-vvveb-data:/var/www/html restart: always @@ -35,7 +35,7 @@ caproverOneClickApp: description: '' validRegex: /^(\w|[^\s"'\\])+$/ defaultValue: $$cap_gen_random_hex(16) - - id: $$cap_vvveb_version + - id: $$cap_app_version label: Vvveb Version defaultValue: 'php8.3-fpm-alpine' description: Check out their Docker page for the valid tags https://hub.docker.com/r/vvveb/vvvebcms/tags diff --git a/public/v4/apps/wakapi.yml b/public/v4/apps/wakapi.yml index 432fe9740..0de250816 100644 --- a/public/v4/apps/wakapi.yml +++ b/public/v4/apps/wakapi.yml @@ -2,7 +2,7 @@ captainVersion: 4 services: # Wakapi $$cap_appname: - image: ghcr.io/muety/wakapi:$$cap_wakapi_version + image: ghcr.io/muety/wakapi:$$cap_app_version restart: always volumes: - $$cap_appname-data:/data @@ -42,7 +42,7 @@ caproverOneClickApp: defaultValue: '16.1-alpine' description: Checkout their page for the valid tags https://hub.docker.com/_/postgres validRegex: /^([^\s^\/])+$/ - - id: $$cap_wakapi_version + - id: $$cap_app_version label: Wakapi Version defaultValue: '2.9.3' description: Checkout their github page for the valid tags https://github.com/muety/wakapi/pkgs/container/wakapi diff --git a/public/v4/apps/wallabag.yml b/public/v4/apps/wallabag.yml index cd8bdf4c4..797a3bff2 100644 --- a/public/v4/apps/wallabag.yml +++ b/public/v4/apps/wallabag.yml @@ -4,7 +4,7 @@ services: $$cap_appname: depends_on: - $$cap_appname-mariadb - image: wallabag/wallabag:$$cap_wallabag_version + image: wallabag/wallabag:$$cap_app_version restart: 'always' environment: MYSQL_ROOT_PASSWORD: $$cap_mariadb-rootpass @@ -31,7 +31,7 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: - - id: $$cap_wallabag_version + - id: $$cap_app_version label: Version Tag description: Check out their Docker page for the valid tags https://hub.docker.com/r/wallabag/wallabag/tags defaultValue: '2.4.0' diff --git a/public/v4/apps/weblate.yml b/public/v4/apps/weblate.yml index 38d004cec..7321a74bd 100644 --- a/public/v4/apps/weblate.yml +++ b/public/v4/apps/weblate.yml @@ -18,7 +18,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' $$cap_appname: - image: weblate/weblate:$$cap_weblate_version + image: weblate/weblate:$$cap_app_version depends_on: - $$cap_appname-postgres - $$cap_appname-redis @@ -55,7 +55,7 @@ caproverOneClickApp: label: Redis Docker version defaultValue: 7-alpine description: Check out their Docker page for the valid versions https://hub.docker.com/r/library/redis/tags - - id: $$cap_weblate_version + - id: $$cap_app_version label: weblate Docker Image tag defaultValue: 4.14.1-1 description: latest, edge, bleeding, or version - Check out their Docker page for the valid tags https://hub.docker.com/r/weblate/weblate/tags diff --git a/public/v4/apps/webtop.yml b/public/v4/apps/webtop.yml index 95b1e334b..5df201438 100644 --- a/public/v4/apps/webtop.yml +++ b/public/v4/apps/webtop.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: lscr.io/linuxserver/webtop:$$cap_WEBTOP_VERSION + image: lscr.io/linuxserver/webtop:$$cap_app_version hostname: $$cap_appname.$$cap_root_domain environment: TZ: $$cap_WEBTOP_TZ @@ -28,7 +28,7 @@ caproverOneClickApp: Please turn on "Websocket Support" in the settings. You can access it at http://$$cap_appname.$$cap_root_domain with login user `$$cap_WEBTOP_CUSTOM_USER` and password `$$cap_WEBTOP_PASSWORD` variables: - - id: $$cap_WEBTOP_VERSION + - id: $$cap_app_version label: Version Tag description: Check out their documentation for the valid tags https://docs.linuxserver.io/images/docker-webtop#version-tags defaultValue: ubuntu-xfce diff --git a/public/v4/apps/wiki-js.yml b/public/v4/apps/wiki-js.yml index 4f974f5c6..0e38a5210 100644 --- a/public/v4/apps/wiki-js.yml +++ b/public/v4/apps/wiki-js.yml @@ -16,7 +16,7 @@ services: DB_USER: wikijs DB_PASS: $$cap_DB_PASS DB_NAME: wiki - image: requarks/wiki:$$cap_version + image: requarks/wiki:$$cap_app_version restart: always caproverExtra: containerHttpPort: '3000' @@ -25,7 +25,7 @@ caproverOneClickApp: - label: Wiki.js Version defaultValue: '2.5' description: It's highly recommended that you don't use the latest tag but instead the major version you need, e.g. requarks/wiki:2 - id: $$cap_version + id: $$cap_app_version - label: Postgres Version defaultValue: 14.1-alpine id: $$cap_postgres_version diff --git a/public/v4/apps/woodpecker.yml b/public/v4/apps/woodpecker.yml index 51ec70b1b..9e21d87b3 100644 --- a/public/v4/apps/woodpecker.yml +++ b/public/v4/apps/woodpecker.yml @@ -3,7 +3,7 @@ services: $$cap_appname: caproverExtra: containerHttpPort: '8000' - image: woodpeckerci/woodpecker-server:$$cap_woodpecker_version + image: woodpeckerci/woodpecker-server:$$cap_app_version hostname: $$cap_appname.$$cap_root_domain volumes: - $$cap_appname-server:/var/lib/woodpecker @@ -80,7 +80,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' dockerfileLines: - - FROM woodpeckerci/woodpecker-agent:$$cap_woodpecker_version + - FROM woodpeckerci/woodpecker-agent:$$cap_app_version - CMD ["agent"] depends_on: - $$cap_appname @@ -117,7 +117,7 @@ caproverOneClickApp: Woodpecker has been successfully deployed! It might take few moments before it's fully started. You can access it at http://$$cap_appname.$$cap_root_domain variables: - - id: $$cap_woodpecker_version + - id: $$cap_app_version label: Version Tag description: Check out their Docker Hub page for the valid tags https://hub.docker.com/r/woodpeckerci/woodpecker-server/tags defaultValue: pull_1209 diff --git a/public/v4/apps/wordpress-only.yml b/public/v4/apps/wordpress-only.yml index e34d9ea33..8fd2eaefe 100644 --- a/public/v4/apps/wordpress-only.yml +++ b/public/v4/apps/wordpress-only.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname-wordpress: - image: wordpress:$$cap_wp_version + image: wordpress:$$cap_app_version volumes: - $$cap_appname-wp-data:/var/www/html restart: always @@ -33,7 +33,7 @@ caproverOneClickApp: description: '' validRegex: /.{1,}/ defaultValue: $$cap_gen_random_hex(16) - - id: $$cap_wp_version + - id: $$cap_app_version label: WordPress Version defaultValue: 5.4.0 description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/wordpress/tags/ diff --git a/public/v4/apps/wordpress.yml b/public/v4/apps/wordpress.yml index 9bb35e596..9ee34211a 100644 --- a/public/v4/apps/wordpress.yml +++ b/public/v4/apps/wordpress.yml @@ -15,7 +15,7 @@ services: $$cap_appname-wordpress: depends_on: - $$cap_appname-db - image: wordpress:$$cap_wp_version + image: wordpress:$$cap_app_version volumes: - $$cap_appname-wp-data:/var/www/html restart: always @@ -34,7 +34,7 @@ caproverOneClickApp: description: '' validRegex: /^(\w|[^\s"'\\])+$/ defaultValue: $$cap_gen_random_hex(16) - - id: $$cap_wp_version + - id: $$cap_app_version label: WordPress Version defaultValue: '6.0.1' description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/wordpress/tags/ diff --git a/public/v4/apps/yagpdb.yml b/public/v4/apps/yagpdb.yml index d680ecfa7..5501d0519 100644 --- a/public/v4/apps/yagpdb.yml +++ b/public/v4/apps/yagpdb.yml @@ -21,7 +21,7 @@ services: - $$cap_appname-soundboard:/app/soundboard caproverExtra: dockerfileLines: - - FROM teyker/yagpdb:$$cap_yagpdb_version + - FROM teyker/yagpdb:$$cap_app_version - CMD ["/app/yagpdb", "-all", "-pa", "-exthttps=true", "-https=false"] # Redis $$cap_appname-redis: @@ -45,7 +45,7 @@ services: caproverOneClickApp: variables: - - id: $$cap_yagpdb_version + - id: $$cap_app_version label: Yagpdb Version defaultValue: 'v1.28.0' description: Checkout their docker page for the valid tags https://hub.docker.com/r/teyker/yagpdb/tags diff --git a/public/v4/apps/yourls.yml b/public/v4/apps/yourls.yml index 8ea96bc76..fc17adc4b 100644 --- a/public/v4/apps/yourls.yml +++ b/public/v4/apps/yourls.yml @@ -15,7 +15,7 @@ services: $$cap_appname: depends_on: - $$cap_appname-db - image: yourls:$$cap_yourls_version + image: yourls:$$cap_app_version volumes: - $$cap_appname-plugins:/usr/src/yourls/plugins restart: always @@ -62,7 +62,7 @@ caproverOneClickApp: defaultValue: '5.7' description: Check out the Docker pages for the valid tags https://hub.docker.com/r/library/mysql/tags/ validRegex: /^([^\s^\/])+$/ - - id: $$cap_yourls_version + - id: $$cap_app_version label: yourls Version defaultValue: '1.9.2' description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/yourls/tags/ diff --git a/public/v4/apps/zammad.yml b/public/v4/apps/zammad.yml index 8517c846c..99242a867 100644 --- a/public/v4/apps/zammad.yml +++ b/public/v4/apps/zammad.yml @@ -18,7 +18,7 @@ caproverOneClickApp: description: Zammad is a web-based, open source user support/ticketing solution. documentation: Taken from https://hub.docker.com/r/zammad/zammad-docker-compose. variables: - - id: $$cap_zammad_VERSION + - id: $$cap_app_version label: Zammad Version defaultValue: '5.1.0-48' description: Check out their docker page for the valid tags https://hub.docker.com/r/zammad/zammad-docker-compose/tags @@ -78,13 +78,13 @@ services: caproverExtra: notExposeAsWebApp: true dockerfileLines: - - FROM zammad/zammad-docker-compose:zammad-postgresql-$$cap_zammad_VERSION + - FROM zammad/zammad-docker-compose:zammad-postgresql-$$cap_app_version - ENTRYPOINT [] - CMD /usr/local/bin/backup.sh zammad-backup $$cap_appname-elasticsearch: restart: always - image: zammad/zammad-docker-compose:zammad-elasticsearch-$$cap_zammad_VERSION + image: zammad/zammad-docker-compose:zammad-elasticsearch-$$cap_app_version environment: discovery.type: single-node volumes: @@ -127,7 +127,7 @@ services: caproverExtra: notExposeAsWebApp: true dockerfileLines: - - FROM zammad/zammad-docker-compose:zammad-$$cap_zammad_VERSION + - FROM zammad/zammad-docker-compose:zammad-$$cap_app_version - ENTRYPOINT [] - CMD /docker-entrypoint.sh zammad-init && tail -f /dev/null @@ -156,7 +156,7 @@ services: notExposeAsWebApp: false containerHttpPort: 8080 dockerfileLines: - - FROM zammad/zammad-docker-compose:zammad-$$cap_zammad_VERSION + - FROM zammad/zammad-docker-compose:zammad-$$cap_app_version - ENTRYPOINT [] - CMD /docker-entrypoint.sh zammad-nginx @@ -165,7 +165,7 @@ services: POSTGRES_PORT: 5432 POSTGRES_USER: $$cap_zammad_POSTGRESQL_USER POSTGRES_PASSWORD: $$cap_zammad_POSTGRESQL_PASS - image: zammad/zammad-docker-compose:zammad-postgresql-$$cap_zammad_VERSION + image: zammad/zammad-docker-compose:zammad-postgresql-$$cap_app_version restart: always volumes: - $$cap_appname-postgresql-data:/var/lib/postgresql/data @@ -184,7 +184,7 @@ services: caproverExtra: notExposeAsWebApp: true dockerfileLines: - - FROM zammad/zammad-docker-compose:zammad-$$cap_zammad_VERSION + - FROM zammad/zammad-docker-compose:zammad-$$cap_app_version - ENTRYPOINT [] - CMD /docker-entrypoint.sh zammad-railsserver @@ -198,7 +198,7 @@ services: caproverExtra: notExposeAsWebApp: true dockerfileLines: - - FROM zammad/zammad-docker-compose:zammad-$$cap_zammad_VERSION + - FROM zammad/zammad-docker-compose:zammad-$$cap_app_version - ENTRYPOINT [] - CMD /docker-entrypoint.sh zammad-scheduler @@ -214,7 +214,7 @@ services: caproverExtra: notExposeAsWebApp: false dockerfileLines: - - FROM zammad/zammad-docker-compose:zammad-$$cap_zammad_VERSION + - FROM zammad/zammad-docker-compose:zammad-$$cap_app_version - ENTRYPOINT [] - CMD /docker-entrypoint.sh zammad-websocket diff --git a/scripts/validate_version.js b/scripts/validate_version.js new file mode 100644 index 000000000..8ca3c9384 --- /dev/null +++ b/scripts/validate_version.js @@ -0,0 +1,21 @@ +const path = require('path'); +const yaml = require('yaml'); +const fs = require('fs-extra'); + +const APPS_DIRECTORY = `public/v4/apps`; +const pathOfApps = path.join(__dirname, '..', APPS_DIRECTORY); + +// validating version 4 +const filesInErrors = []; +fs.readdir(pathOfApps).then((apps) => { + for (var i = 0; i < apps.length; i++) { + const contentString = fs.readFileSync(path.join(pathOfApps, apps[i]), 'utf-8'); + const content = yaml.parse(contentString); + //console.log(content.caproverOneClickApp.variables); + if (!content.caproverOneClickApp.variables.find((v) => v.id === '$$cap_app_version')) { + filesInErrors.push(content.caproverOneClickApp.displayName); + } + } +}).then(() => { + console.error(filesInErrors); +}); From 22426a20647818541652ffaf1dd4689b20fd35be Mon Sep 17 00:00:00 2001 From: Simon Belbeoch Date: Mon, 11 Nov 2024 15:42:44 +0100 Subject: [PATCH 2/6] add version validation into the linter --- scripts/validate_apps.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/validate_apps.js b/scripts/validate_apps.js index 9dc1f30aa..a6be7b298 100644 --- a/scripts/validate_apps.js +++ b/scripts/validate_apps.js @@ -55,6 +55,10 @@ throw new Error(`Cannot find services for ${apps[i]}`); } + if (!content.caproverOneClickApp.variables.find((v) => v.id === '$$cap_app_version')) { + throw new Error(`Cannot find version for ${apps[i]}`); + } + Object.keys(content.services).forEach( (serviceName) => { // jshint ignore:line const s = content.services[serviceName]; @@ -146,4 +150,4 @@ .catch(function (err) { console.error(err); process.exit(127); - }); \ No newline at end of file + }); From 7070ca6151d04a8ae04a1fab1f6d4b2314660007 Mon Sep 17 00:00:00 2001 From: Simon Belbeoch Date: Mon, 11 Nov 2024 15:43:37 +0100 Subject: [PATCH 3/6] fix all files without variable for version --- public/v4/apps/cloudflareddns.yml | 7 ++++++- public/v4/apps/codimd.yml | 7 ++++++- public/v4/apps/directus-mysql-redis.yml | 4 ++-- public/v4/apps/directus.yml | 4 ++-- public/v4/apps/greenlight.yml | 7 ++++++- public/v4/apps/invoiceplane.yml | 7 ++++++- public/v4/apps/jupyter-lab.yml | 7 ++++++- public/v4/apps/jupyter-tensorflow.yml | 6 +++++- public/v4/apps/mongodb-backup-s3.yml | 6 +++++- public/v4/apps/nginx-redirect.yml | 6 +++++- public/v4/apps/ohmyform.yml | 6 +++++- public/v4/apps/papercups.yml | 4 ++-- public/v4/apps/prerender.yml | 6 +++++- public/v4/apps/rethinkdb.yml | 8 ++++++-- public/v4/apps/rsync-looped.yml | 6 +++++- public/v4/apps/seafile-nomemcached.yml | 4 ++-- public/v4/apps/sshd.yml | 6 +++++- public/v4/apps/steam-openid-provider.yml | 6 +++++- public/v4/apps/tiddlywiki.yml | 6 +++++- 19 files changed, 89 insertions(+), 24 deletions(-) diff --git a/public/v4/apps/cloudflareddns.yml b/public/v4/apps/cloudflareddns.yml index d7aa47afa..e6c65c5ed 100644 --- a/public/v4/apps/cloudflareddns.yml +++ b/public/v4/apps/cloudflareddns.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: oznu/cloudflare-ddns:latest + image: oznu/cloudflare-ddns:$$cap_app_version environment: API_KEY: $$cap_api_key ZONE: $$cap_zone @@ -14,6 +14,11 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: + - id: $$cap_app_version + label: Version + defaultValue: 'latest' + description: The version of the CloudFlare DDNS image to use. Defaults to latest. + validRegex: /.{1,}/ - id: $$cap_api_key label: Cloudflare API token defaultValue: '' diff --git a/public/v4/apps/codimd.yml b/public/v4/apps/codimd.yml index f88dd7660..119a94706 100644 --- a/public/v4/apps/codimd.yml +++ b/public/v4/apps/codimd.yml @@ -24,7 +24,7 @@ services: PGID: 1000 PUID: 1000 TZ: $$cap_timezone - image: linuxserver/codimd:1.6.0-ls44 + image: linuxserver/codimd:$$cap_app_version restart: always volumes: - $$cap_appname-config:/config @@ -32,6 +32,11 @@ services: containerHttpPort: '3000' caproverOneClickApp: variables: + - id: $$cap_app_version + label: Version + defaultValue: '1.6.0-ls44' + description: The version of the CodiMD image to use. Defaults to 1.6.0-ls44. + validRegex: /.{1,}/ - label: Database Password description: Password to connect to the database defaultValue: $$cap_gen_random_hex(16) diff --git a/public/v4/apps/directus-mysql-redis.yml b/public/v4/apps/directus-mysql-redis.yml index d57953ddd..c236906bf 100644 --- a/public/v4/apps/directus-mysql-redis.yml +++ b/public/v4/apps/directus-mysql-redis.yml @@ -25,7 +25,7 @@ services: depends_on: - $$cap_appname-mysql - $$cap_appname-redis - image: directus/directus:$$cap_directus_tag + image: directus/directus:$$cap_app_version volumes: - $$cap_appname-uploads:/directus/uploads - $$cap_appname-extensions:/directus/extensions @@ -57,7 +57,7 @@ services: caproverOneClickApp: variables: - label: Directus image tag - id: $$cap_directus_tag + id: $$cap_app_version defaultValue: '9.22.1' validRegex: /.{1,}/ description: Tag of Directus image on https://hub.docker.com/r/directus/directus/tags diff --git a/public/v4/apps/directus.yml b/public/v4/apps/directus.yml index 8de9441d7..4f2406190 100644 --- a/public/v4/apps/directus.yml +++ b/public/v4/apps/directus.yml @@ -23,7 +23,7 @@ services: depends_on: - $$cap_appname-postgres - $$cap_appname-redis - image: directus/directus:$$cap_directus_tag + image: directus/directus:$$cap_app_version volumes: - $$cap_appname-uploads:/directus/uploads - $$cap_appname-extensions:/directus/extensions @@ -49,7 +49,7 @@ caproverOneClickApp: variables: - description: Tag of Directus image on https://hub.docker.com/r/directus/directus/tags defaultValue: 10.4.3 - id: $$cap_directus_tag + id: $$cap_app_version label: Directus image tag validRegex: /.{1,}/ - description: Name of the Directus database instance. diff --git a/public/v4/apps/greenlight.yml b/public/v4/apps/greenlight.yml index a8d3c4b3a..57da47af8 100644 --- a/public/v4/apps/greenlight.yml +++ b/public/v4/apps/greenlight.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname-greenlight: - image: bigbluebutton/greenlight:v2 + image: bigbluebutton/greenlight:$$cap_app_version volumes: - $$cap_appname-greenlight-log:/usr/src/app/log - $$cap_appname-greenlight-storage:/usr/src/app/storage @@ -50,6 +50,11 @@ services: WEB_CONCURRENCY: $$cap_WEB_CONCURRENCY caproverOneClickApp: variables: + - id: $$cap_app_version + label: Version + defaultValue: 'v2' + description: The version of the Greenlight image to use. Defaults to v2. + validRegex: /.{1,}/ - id: $$cap_SECRET_KEY_BASE description: Create a Secret Key for Rails label: SECRET_KEY_BASE diff --git a/public/v4/apps/invoiceplane.yml b/public/v4/apps/invoiceplane.yml index 92075f775..a03570a19 100644 --- a/public/v4/apps/invoiceplane.yml +++ b/public/v4/apps/invoiceplane.yml @@ -14,7 +14,7 @@ services: notExposeAsWebApp: 'true' $$cap_appname: - image: 'thomascenni/alpine-invoiceplane:v1.5.11' + image: thomascenni/alpine-invoiceplane:$$cap_app_version volumes: - $$cap_appname-storage:/storage - $$cap_appname-config:/config @@ -28,6 +28,11 @@ services: caproverOneClickApp: variables: + - id: $$cap_app_version + label: Version + defaultValue: 'v1.5.11' + description: The version of the InvoicePlane image to use. Defaults to v1.5.11. + validRegex: /.{1,}/ - defaultValue: $$cap_gen_random_hex(20) description: This is the MySQL root password. Randomly generated. Can be changed also. id: $$cap_MYSQL_ROOT_PWD diff --git a/public/v4/apps/jupyter-lab.yml b/public/v4/apps/jupyter-lab.yml index 7e4c018dd..47931f1a8 100644 --- a/public/v4/apps/jupyter-lab.yml +++ b/public/v4/apps/jupyter-lab.yml @@ -9,13 +9,18 @@ services: caproverExtra: containerHttpPort: '8888' dockerfileLines: - - FROM jupyter/datascience-notebook:9f9e5ca8fe5a + - FROM jupyter/datascience-notebook:$$cap_app_version - RUN pip install lxml - RUN jupyter notebook --generate-config - RUN echo 'c.NotebookApp.token = "$$cap_jupyter_default_token"' >> /home/jovyan/.jupyter/jupyter_notebook_config.py - EXPOSE 8888 caproverOneClickApp: variables: + - id: $$cap_app_version + label: Version + defaultValue: '9f9e5ca8fe5a' + description: The version of the Jupyter image to use. Defaults to 9f9e5ca8fe5a. + validRegex: /.{1,}/ - id: $$cap_jupyter_default_token label: Jupyter default token description: The default login token allows you to set a password within the application. For better experience leave empty and enable basic auth within the CaprRover dashboard. diff --git a/public/v4/apps/jupyter-tensorflow.yml b/public/v4/apps/jupyter-tensorflow.yml index fea2ac35b..919def385 100644 --- a/public/v4/apps/jupyter-tensorflow.yml +++ b/public/v4/apps/jupyter-tensorflow.yml @@ -10,13 +10,17 @@ services: caproverExtra: containerHttpPort: '8888' dockerfileLines: - - FROM jupyter/tensorflow-notebook:36d857bb0121 + - FROM jupyter/tensorflow-notebook:$$cap_app_version - RUN pip install lxml - RUN jupyter notebook --generate-config -y - RUN echo 'c.NotebookApp.token = "$$cap_jupyter_default_token"' >> /home/jovyan/.jupyter/jupyter_notebook_config.py - EXPOSE 8888 caproverOneClickApp: variables: + - id: $$cap_app_version + label: Jupyter Notebook Version + defaultValue: 36d857bb0121 + description: The version of Jupyter Notebook to use. You can find the available versions at https://hub.docker.com/r/jupyter/tensorflow-notebook/tags - id: $$cap_jupyter_default_token label: Jupyter default token description: The default login token allows you to set a password within the application. For better experience leave empty and enable basic auth within the CaprRover dashboard. diff --git a/public/v4/apps/mongodb-backup-s3.yml b/public/v4/apps/mongodb-backup-s3.yml index 361b258f3..105805dd4 100644 --- a/public/v4/apps/mongodb-backup-s3.yml +++ b/public/v4/apps/mongodb-backup-s3.yml @@ -18,10 +18,14 @@ services: INIT_BACKUP: $$cap_init_backup INIT_RESTORE: $$cap_init_restore DISABLE_CRON: $$cap_disable_cron - image: halvves/mongodb-backup-s3@sha256:e709db5e0fe5d44873ac5a385af214e951f2a0366a7c02b515ebf7c983658b0c + image: halvves/mongodb-backup-s3@$$cap_app_version restart: always caproverOneClickApp: variables: + - description: The version of the image to use. You can find the available versions at https://hub.docker.com/r/halvves/mongodb-backup-s3/tags + id: $$cap_app_version + label: Image Version + defaultValue: sha256:e709db5e0fe5d44873ac5a385af214e951f2a0366a7c02b515ebf7c983658b0c - description: Your aws access key id (for your s3 bucket) id: $$cap_aws_access_key_id label: AWS ACCESS KEY ID diff --git a/public/v4/apps/nginx-redirect.yml b/public/v4/apps/nginx-redirect.yml index d69538f4f..106873c42 100644 --- a/public/v4/apps/nginx-redirect.yml +++ b/public/v4/apps/nginx-redirect.yml @@ -1,12 +1,16 @@ captainVersion: 4 services: $$cap_appname: - image: caprover/nginx-redirect:latest + image: caprover/nginx-redirect:$$cap_app_version restart: always environment: RETURN_LOCATION: return 301 $$cap_redirect_url$request_uri; caproverOneClickApp: variables: + - id: $$cap_app_version + label: Image Version + defaultValue: latest + description: The version of the image to use. You can find the available versions at https://hub.docker.com/r/caprover/nginx-redirect/tags - id: $$cap_redirect_url label: Redirect address description: For example use https://caprover.com to redirect all request to CapRover. diff --git a/public/v4/apps/ohmyform.yml b/public/v4/apps/ohmyform.yml index f8dd2757c..25aedb7cc 100644 --- a/public/v4/apps/ohmyform.yml +++ b/public/v4/apps/ohmyform.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: ohmyform/ohmyform:0.9.9 + image: ohmyform/ohmyform:$$cap_app_version volumes: - $$cap_appname-data:/data environment: @@ -26,6 +26,10 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: + - id: $$cap_app_version + label: Image Version + defaultValue: 0.9.9 + description: The version of the image to use. You can find the available versions at https://hub.docker.com/r/ohmyform/ohmyform/tags - id: $$cap_ohmyform_email label: Admin E-Mail description: E-Mail for the OhMyForm admin user diff --git a/public/v4/apps/papercups.yml b/public/v4/apps/papercups.yml index 7aa7ff676..15d81500c 100644 --- a/public/v4/apps/papercups.yml +++ b/public/v4/apps/papercups.yml @@ -35,7 +35,7 @@ services: caproverExtra: containerHttpPort: '4000' dockerfileLines: - - FROM papercups/papercups:$$cap_papercups_tag + - FROM papercups/papercups:$$cap_app_version - ENTRYPOINT sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && echo 'running' && /entrypoint.sh run" $$cap_appname-db: @@ -49,7 +49,7 @@ services: caproverOneClickApp: variables: - - id: $$cap_papercups_tag + - id: $$cap_app_version label: Papercups Tag defaultValue: 1.1.0 description: 'Check out their docker page for the valid tags https://hub.docker.com/r/papercups/papercups/tags' diff --git a/public/v4/apps/prerender.yml b/public/v4/apps/prerender.yml index e87d6440c..7d9a4d657 100644 --- a/public/v4/apps/prerender.yml +++ b/public/v4/apps/prerender.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: tvanro/prerender-alpine:6.4.0 + image: tvanro/prerender-alpine:$$cap_app_version restart: always environment: MEMORY_CACHE: $$cap_memory_cache @@ -12,6 +12,10 @@ services: containerHttpPort: '3000' caproverOneClickApp: variables: + - id: $$cap_app_version + label: Prerender Version + defaultValue: 6.4.0 + description: 'Check out their docker page for the valid tags https://hub.docker.com/r/tvanro/prerender-alpine/tags' - id: $$cap_memory_cache label: Enable memory cache? defaultValue: 1 diff --git a/public/v4/apps/rethinkdb.yml b/public/v4/apps/rethinkdb.yml index 2b16a9cc7..b014ca808 100644 --- a/public/v4/apps/rethinkdb.yml +++ b/public/v4/apps/rethinkdb.yml @@ -1,13 +1,17 @@ captainVersion: 4 services: $$cap_appname: - image: rethinkdb:2.3.6 + image: rethinkdb:$$cap_app_version volumes: - $$cap_appname-data:/data/rethinkdb_data/ caproverExtra: containerHttpPort: '8080' caproverOneClickApp: - variables: [] + variables: + - id: $$cap_app_version + label: RethinkDB Version + defaultValue: 2.3.6 + description: The version of the image to use. You can find the available versions at https://hub.docker.com/r/rethinkdb/tags instructions: end: > RethinkDB is deployed and available as http://$$cap_appname.$$cap_root_domain/. diff --git a/public/v4/apps/rsync-looped.yml b/public/v4/apps/rsync-looped.yml index ab8180ef4..fc49dd1ad 100644 --- a/public/v4/apps/rsync-looped.yml +++ b/public/v4/apps/rsync-looped.yml @@ -4,7 +4,7 @@ services: caproverExtra: notExposeAsWebApp: 'true' dockerfileLines: - - FROM alpine:3.15.0 + - FROM alpine:$$cap_app_version - RUN apk update && apk add openssh rsync nano openssl bash - ADD https://gist.githubusercontent.com/githubsaturn/b092f0f784263ebf2696c5613e9144e5/raw/0bd25d5bf7970e518bcfcfd58ca156e74b343afe/rsync-looper.sh / - RUN chmod +x /rsync-looper.sh @@ -20,6 +20,10 @@ services: - $$cap_appname-target-directory:/target-dir caproverOneClickApp: variables: + - id: $$cap_app_version + label: App Version + description: The version of the app + defaultValue: '3.15.0' - id: $$cap_REMOTE_SOURCE_DIRECTORY label: Remote source location description: The remote directory from which the content will be downloaded diff --git a/public/v4/apps/seafile-nomemcached.yml b/public/v4/apps/seafile-nomemcached.yml index 71235748c..93c3b95b2 100644 --- a/public/v4/apps/seafile-nomemcached.yml +++ b/public/v4/apps/seafile-nomemcached.yml @@ -12,7 +12,7 @@ services: notExposeAsWebApp: true $$cap_appname: - image: seafileltd/seafile-mc:$$cap_seafile_version + image: seafileltd/seafile-mc:$$cap_app_version volumes: - $$cap_appname-data:/shared # Requested, specifies the path to Seafile data persistent store. environment: @@ -27,7 +27,7 @@ services: caproverOneClickApp: variables: - - id: '$$cap_seafile_version' + - id: '$$cap_app_version' label: Seafile Version defaultValue: '8.0.7' description: Check out their Docker page for the valid tags https://hub.docker.com/r/seafileltd/seafile-mc/tags diff --git a/public/v4/apps/sshd.yml b/public/v4/apps/sshd.yml index 93d2bb735..a5054fdd4 100644 --- a/public/v4/apps/sshd.yml +++ b/public/v4/apps/sshd.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: lscr.io/linuxserver/openssh-server:version-9.7_p1-r4 + image: lscr.io/linuxserver/openssh-server:$$cap_app_version environment: PUID: 1001 PGID: 1001 @@ -25,6 +25,10 @@ services: notExposeAsWebApp: 'true' caproverOneClickApp: variables: + - id: $$cap_app_version + label: App Version + defaultValue: 'version-9.7_p1-r4' + description: The version of the app - id: $$cap_sshd_public_key label: Your SSH public key description: Enter your public key diff --git a/public/v4/apps/steam-openid-provider.yml b/public/v4/apps/steam-openid-provider.yml index 9a75fcd76..06957ce33 100644 --- a/public/v4/apps/steam-openid-provider.yml +++ b/public/v4/apps/steam-openid-provider.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: ghcr.io/byo-software/steam-openid-connect-provider:sha-c8305ce + image: ghcr.io/byo-software/steam-openid-connect-provider:$$cap_app_version restart: always environment: OpenID__RedirectUri: $$cap_redirect_uri @@ -13,6 +13,10 @@ services: containerHttpPort: '80' caproverOneClickApp: variables: + - id: $$cap_app_version + label: App Version + defaultValue: 'sha-c8305ce' + description: The version of the app to deploy. - id: $$cap_client_id label: OAuth Client ID defaultValue: 'steamidp' diff --git a/public/v4/apps/tiddlywiki.yml b/public/v4/apps/tiddlywiki.yml index 1e991ca53..fb7ffdaab 100644 --- a/public/v4/apps/tiddlywiki.yml +++ b/public/v4/apps/tiddlywiki.yml @@ -1,7 +1,7 @@ captainVersion: 4 services: $$cap_appname: - image: nicolaw/tiddlywiki + image: nicolaw/tiddlywiki:$$cap_app_version restart: always volumes: - $$cap_appname-data:/var/lib/tiddlywiki @@ -13,6 +13,10 @@ services: containerHttpPort: '8080' caproverOneClickApp: variables: + - id: $$cap_app_version + label: Version + defaultValue: '5.1.23' + description: Version of TiddlyWiki to use - id: $$cap_wikusername label: Username defaultValue: anonymous From 3d149a9a19a1ac0ef72b64edd9b379475f2ceb72 Mon Sep 17 00:00:00 2001 From: Simon Belbeoch Date: Mon, 11 Nov 2024 16:57:49 +0100 Subject: [PATCH 4/6] fix versions without tag --- public/v4/apps/airflow.yml | 10 +-- public/v4/apps/azuracast.yml | 4 +- public/v4/apps/browserless.yml | 2 +- public/v4/apps/cloudflare-tunnel.yml | 2 +- public/v4/apps/cloudflareddns.yml | 98 ----------------------- public/v4/apps/codimd.yml | 2 +- public/v4/apps/commento.yml | 3 +- public/v4/apps/davos.yml | 1 + public/v4/apps/discourse.yml | 2 +- public/v4/apps/eclipse-mosquitto.yml | 3 +- public/v4/apps/elasticsearch.yml | 2 +- public/v4/apps/filerun.yml | 4 +- public/v4/apps/forge_minecraft.yml | 2 +- public/v4/apps/greenlight.yml | 2 +- public/v4/apps/hedgedoc.yml | 2 +- public/v4/apps/imgproxy.yml | 1 + public/v4/apps/invoiceplane.yml | 2 +- public/v4/apps/jupyter-lab.yml | 2 +- public/v4/apps/kibana.yml | 2 +- public/v4/apps/mailtrain.yml | 3 +- public/v4/apps/moodle.yml | 2 +- public/v4/apps/nginx-redirect.yml | 2 +- public/v4/apps/posthog.yml | 1 + public/v4/apps/prometheus.yml | 2 +- public/v4/apps/resilio-sync.yml | 2 +- public/v4/apps/rsync-looped.yml | 2 +- public/v4/apps/sinusbot.yml | 2 +- public/v4/apps/smokeping.yml | 2 +- public/v4/apps/sshd.yml | 59 -------------- public/v4/apps/steam-openid-provider.yml | 2 +- public/v4/apps/syncthing.yml | 2 +- public/v4/apps/teamspeak.yml | 2 +- public/v4/apps/tiddlywiki.yml | 2 +- public/v4/apps/wiki-js.yml | 2 +- public/v4/logos/sshd.png | Bin 7461 -> 0 bytes scripts/validate_apps.js | 10 +++ 36 files changed, 51 insertions(+), 192 deletions(-) delete mode 100644 public/v4/apps/cloudflareddns.yml delete mode 100644 public/v4/apps/sshd.yml delete mode 100644 public/v4/logos/sshd.png diff --git a/public/v4/apps/airflow.yml b/public/v4/apps/airflow.yml index 024c23db0..e13d27404 100644 --- a/public/v4/apps/airflow.yml +++ b/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,7 +38,7 @@ 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) @@ -47,15 +47,15 @@ caproverOneClickApp: - 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' diff --git a/public/v4/apps/azuracast.yml b/public/v4/apps/azuracast.yml index c1d743d82..d093e61a5 100644 --- a/public/v4/apps/azuracast.yml +++ b/public/v4/apps/azuracast.yml @@ -190,8 +190,8 @@ caproverOneClickApp: variables: - id: $$cap_app_version label: Version - description: Valid values include "latest" for Rolling Release, "stable" for Stable release channel, and any specific version. - defaultValue: 'latest' + description: check out the AzuraCast Docker page for the valid tags https://hub.docker.com/r/azuracast/azuracast/tags + defaultValue: '0.19.7' - id: $$cap_AZURACAST_DB_PASSWORD label: MariaDB Root Password description: Specify a password for the root user of the built-in MariaDB database. diff --git a/public/v4/apps/browserless.yml b/public/v4/apps/browserless.yml index 0e1c83f54..9d152621a 100644 --- a/public/v4/apps/browserless.yml +++ b/public/v4/apps/browserless.yml @@ -40,7 +40,7 @@ caproverOneClickApp: - id: $$cap_app_version label: Browserless Version defaultValue: 1-chrome-stable - description: Browserless Image Version + description: Check out the Browserless Docker page for the valid tags https://hub.docker.com/r/browserless/chrome/tags validRegex: /^([^\s^\/])+$/ - id: $$cap_demo_mode label: Demo Mode diff --git a/public/v4/apps/cloudflare-tunnel.yml b/public/v4/apps/cloudflare-tunnel.yml index 6defb81db..4e03a3f59 100644 --- a/public/v4/apps/cloudflare-tunnel.yml +++ b/public/v4/apps/cloudflare-tunnel.yml @@ -17,7 +17,7 @@ caproverOneClickApp: - id: $$cap_app_version label: Cloudflare Cloudflared Version defaultValue: '1517-bb29a0e19437' - description: 'The version of Cloudflare Cloudflared to use.' + description: cloudflare-tunnel version to use. Check https://hub.docker.com/r/cloudflare/cloudflared/tags for available versions. instructions: start: >- This CapRover app deploys a Cloudflare tunnel, allowing you to securely expose your services to the internet. Make sure to provide the Cloudflare Tunnel Token when you deploy this app. diff --git a/public/v4/apps/cloudflareddns.yml b/public/v4/apps/cloudflareddns.yml deleted file mode 100644 index e6c65c5ed..000000000 --- a/public/v4/apps/cloudflareddns.yml +++ /dev/null @@ -1,98 +0,0 @@ -captainVersion: 4 -services: - $$cap_appname: - image: oznu/cloudflare-ddns:$$cap_app_version - environment: - API_KEY: $$cap_api_key - ZONE: $$cap_zone - SUBDOMAIN: $$cap_subdomain - PROXIED: $$cap_proxied - RRTYPE: $$cap_rrtype - DNS_SERVER: $$cap_dns_server - CRON: $$cap_cron - caproverExtra: - notExposeAsWebApp: 'true' -caproverOneClickApp: - variables: - - id: $$cap_app_version - label: Version - defaultValue: 'latest' - description: The version of the CloudFlare DDNS image to use. Defaults to latest. - validRegex: /.{1,}/ - - id: $$cap_api_key - label: Cloudflare API token - defaultValue: '' - description: Your CloudFlare scoped API token. See the Creating a Cloudflare API token upward. - validRegex: /.{1,}/ - - id: $$cap_zone - label: DNS zone - defaultValue: $$cap_root_domain - description: The DNS zone that DDNS updates should be applied to. Defaults to your CapRover root domain. - validRegex: /.{1,}/ - - id: $$cap_subdomain - label: Zone's subdomain - defaultValue: '*' - description: A subdomain of the ZONE to write DNS changes to. If this is not supplied the root zone will be used. Defaults to your CapRover apps subdomains. - - id: $$cap_proxied - label: Proxied? - defaultValue: 'false' - description: If you are using free ClourFlare tier, leave as false. Set to true to make traffic go through the CloudFlare CDN. - validRegex: /.{1,}/ - - id: $$cap_rrtype - label: Resource record type - defaultValue: 'A' - description: Set to AAAA to use set IPv6 records instead of IPv4 records. Defaults to A for IPv4 records. - validRegex: /.{1,}/ - - id: $$cap_dns_server - label: DNS server - defaultValue: '1.1.1.1' - description: Set to the IP address of the DNS server you would like to use. Defaults to 1.1.1.1 (CloudFlare DNS) otherwise. - validRegex: /.{1,}/ - - id: $$cap_cron - label: Cron - defaultValue: '*/5 * * * *' - description: Sets how often your container checks for IP changes. Defaults to every 5 minutes. You can read more about CRON configuration here https://en.wikipedia.org/wiki/Cron - validRegex: /.{1,}/ - instructions: - start: >- - This small Alpine Linux based Docker image will allow you to use the free CloudFlare DNS Service as a Dynamic DNS Provider (DDNS). - - Default values are tuned to work with CapRover. - - - - To create a CloudFlare API token for your DNS zone go to https://dash.cloudflare.com/profile/api-tokens and follow these steps: - - - - 1 - Click Create Token - - - - 2 - Provide the token a name, for example, cloudflare-ddns - - - - 3 - Grant the token the following permissions: - - Zone - Zone Settings - Read - - Zone - Zone - Read - - Zone - DNS - Edit - - - - 4 - Set the zone resources to: - - Include - All zones - - - - 5 - Complete the wizard and copy the generated token into the Cloudflare API token field - end: >- - Cloudflare DDNS has been successfully deployed. - displayName: CloudFlare DDNS - isOfficial: false - description: This small image will allow you to use the free CloudFlare DNS Service as a Dynamic DNS Provider (DDNS). - documentation: Taken from https://github.com/oznu/docker-cloudflare-ddns diff --git a/public/v4/apps/codimd.yml b/public/v4/apps/codimd.yml index 119a94706..d84355902 100644 --- a/public/v4/apps/codimd.yml +++ b/public/v4/apps/codimd.yml @@ -35,7 +35,7 @@ caproverOneClickApp: - id: $$cap_app_version label: Version defaultValue: '1.6.0-ls44' - description: The version of the CodiMD image to use. Defaults to 1.6.0-ls44. + description: The version of the CodiMD image to use. Check https://hub.docker.com/r/linuxserver/codimd/tags for available versions. validRegex: /.{1,}/ - label: Database Password description: Password to connect to the database diff --git a/public/v4/apps/commento.yml b/public/v4/apps/commento.yml index 0eccddc02..89c9684b5 100644 --- a/public/v4/apps/commento.yml +++ b/public/v4/apps/commento.yml @@ -29,7 +29,8 @@ caproverOneClickApp: description: Starts with 'sha256:'. Find on https://gitlab.com/commento/commento/container_registry/337942 - id: $$cap_commento_postgres_password label: Postgres Password - description: Password must be at least 12 characters. Please use a random string. + defaultValue: $$cap_gen_random_string(16) + description: Password must be at least 12 characters. Please use a random string. validRegex: /^[^\@]{12,}$/ instructions: start: >- diff --git a/public/v4/apps/davos.yml b/public/v4/apps/davos.yml index 8fa795fac..bb0268c2f 100644 --- a/public/v4/apps/davos.yml +++ b/public/v4/apps/davos.yml @@ -12,6 +12,7 @@ caproverOneClickApp: id: $$cap_app_version label: Davos Version validRegex: /^([^\s^\/])+$/ + description: 'Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/davos/tags' - defaultValue: '1000' id: $$cap_davos_puid label: Puid diff --git a/public/v4/apps/discourse.yml b/public/v4/apps/discourse.yml index f80774bfb..a4396c5ff 100644 --- a/public/v4/apps/discourse.yml +++ b/public/v4/apps/discourse.yml @@ -82,7 +82,7 @@ caproverOneClickApp: - id: $$cap_app_version label: Discourse Version defaultValue: 2.8.11 - description: Version of Discourse + description: Version of Discourse to use. Check https://hub.docker.com/r/bitnami/discourse/tags for available versions. validRegex: /^([^\s^\/])+$/ - id: $$cap_postgresql_version label: Postgresql (database) version diff --git a/public/v4/apps/eclipse-mosquitto.yml b/public/v4/apps/eclipse-mosquitto.yml index fb9b6f0ec..cd1b30b9b 100644 --- a/public/v4/apps/eclipse-mosquitto.yml +++ b/public/v4/apps/eclipse-mosquitto.yml @@ -14,8 +14,9 @@ caproverOneClickApp: variables: - id: $$cap_app_version label: Eclipes-Mosquitto Image Version - defaultValue: latest + defaultValue: '2' validRegex: /^([^\s^\/])+$/ + description: The version of the Eclipes-Mosquitto image to use. Check https://hub.docker.com/_/eclipse-mosquitto/tags for available versions. instructions: start: Eclipse Mosquitto is an open source message broker which implements MQTT version 5, 3.1.1 and 3.1. Enter Parameters below end: Eclipes-Mosquitto is deployed and available as srv-captain--$$cap_appname:1883 to other apps and srv-captain--$$cap_appname:9001 as a websocket. diff --git a/public/v4/apps/elasticsearch.yml b/public/v4/apps/elasticsearch.yml index c3ee6ed3c..764595727 100644 --- a/public/v4/apps/elasticsearch.yml +++ b/public/v4/apps/elasticsearch.yml @@ -18,7 +18,7 @@ caproverOneClickApp: variables: - id: $$cap_app_version label: 'Elasticsearch Version Tag' - description: 'Check out the releases overview: https://hub.docker.com/_/elasticsearch' + description: 'Check out the releases overview: https://hub.docker.com/_/elasticsearch/tags' defaultValue: 8.4.1 validRegex: /^([^\s^\/])+$/ - id: $$cap_elasticsearch_cluster_name diff --git a/public/v4/apps/filerun.yml b/public/v4/apps/filerun.yml index 9c6df0a6d..22b376436 100644 --- a/public/v4/apps/filerun.yml +++ b/public/v4/apps/filerun.yml @@ -39,8 +39,8 @@ caproverOneClickApp: validRegex: /.{1,}/ - id: $$cap_app_version label: Filerun Version. - defaultValue: 'latest' - description: Use 'latest' tag for normal installation. Check out their Docker page for the valid tags https://hub.docker.com/r/filerun/filerun/tags + defaultValue: '8.1' + description: Use '8.1' tag for normal installation. Check out their Docker page for the valid tags https://hub.docker.com/r/filerun/filerun/tags validRegex: /^([^\s^\/])+$/ instructions: start: >- diff --git a/public/v4/apps/forge_minecraft.yml b/public/v4/apps/forge_minecraft.yml index 32b24d6ae..618b4148c 100644 --- a/public/v4/apps/forge_minecraft.yml +++ b/public/v4/apps/forge_minecraft.yml @@ -52,7 +52,7 @@ caproverOneClickApp: defaultValue: 1.20.1 - id: $$cap_app_version label: forge server version - description: 'Choose the version that works with your mc version , see: https://files.minecraftforge.net/' + description: 'Choose the version tag from the tags that works with your mc version , see: https://files.minecraftforge.net/' defaultValue: 47.0.46 - id: $$server_type label: Server type diff --git a/public/v4/apps/greenlight.yml b/public/v4/apps/greenlight.yml index 57da47af8..35f295abf 100644 --- a/public/v4/apps/greenlight.yml +++ b/public/v4/apps/greenlight.yml @@ -53,7 +53,7 @@ caproverOneClickApp: - id: $$cap_app_version label: Version defaultValue: 'v2' - description: The version of the Greenlight image to use. Defaults to v2. + description: The version of the Greenlight image to use. Defaults to v2. Check https://hub.docker.com/r/bigbluebutton/greenlight/tags for available versions. validRegex: /.{1,}/ - id: $$cap_SECRET_KEY_BASE description: Create a Secret Key for Rails diff --git a/public/v4/apps/hedgedoc.yml b/public/v4/apps/hedgedoc.yml index 37e28e589..26101dc90 100644 --- a/public/v4/apps/hedgedoc.yml +++ b/public/v4/apps/hedgedoc.yml @@ -31,7 +31,7 @@ caproverOneClickApp: - id: $$cap_app_version label: HedgeDoc Version defaultValue: '1.7.2' - description: Make sure to use the latest release from https://hedgedoc.org/latest-release + description: Make sure to use the latest release tag from the tags of https://hedgedoc.org/latest-release validRegex: '/^([^\\s^\\/])+$/' # db variables - id: '$$cap_pgversion' diff --git a/public/v4/apps/imgproxy.yml b/public/v4/apps/imgproxy.yml index 1795fc59b..6f6dc5dbe 100644 --- a/public/v4/apps/imgproxy.yml +++ b/public/v4/apps/imgproxy.yml @@ -16,6 +16,7 @@ caproverOneClickApp: id: $$cap_app_version label: imgproxy Version validRegex: /^(?:2|3)(?:\.[0-9]+){0,2}$/ + description: 'Please check https://hub.docker.com/r/darthsim/imgproxy/tags for available versions.' - defaultValue: $$cap_gen_random_hex(128) id: $$cap_imgproxy_key label: Signature Key diff --git a/public/v4/apps/invoiceplane.yml b/public/v4/apps/invoiceplane.yml index a03570a19..3c584c92c 100644 --- a/public/v4/apps/invoiceplane.yml +++ b/public/v4/apps/invoiceplane.yml @@ -31,7 +31,7 @@ caproverOneClickApp: - id: $$cap_app_version label: Version defaultValue: 'v1.5.11' - description: The version of the InvoicePlane image to use. Defaults to v1.5.11. + description: The version of the InvoicePlane image to use. Defaults to v1.5.11. For more information, see https://hub.docker.com/r/thomascenni/alpine-invoiceplane/tags validRegex: /.{1,}/ - defaultValue: $$cap_gen_random_hex(20) description: This is the MySQL root password. Randomly generated. Can be changed also. diff --git a/public/v4/apps/jupyter-lab.yml b/public/v4/apps/jupyter-lab.yml index 47931f1a8..c4bd730fe 100644 --- a/public/v4/apps/jupyter-lab.yml +++ b/public/v4/apps/jupyter-lab.yml @@ -19,7 +19,7 @@ caproverOneClickApp: - id: $$cap_app_version label: Version defaultValue: '9f9e5ca8fe5a' - description: The version of the Jupyter image to use. Defaults to 9f9e5ca8fe5a. + description: The version of the Jupyter image to use. Defaults to 9f9e5ca8fe5a. For more information, see https://hub.docker.com/r/jupyter/datascience-notebook/tags validRegex: /.{1,}/ - id: $$cap_jupyter_default_token label: Jupyter default token diff --git a/public/v4/apps/kibana.yml b/public/v4/apps/kibana.yml index 4d4dbd1ee..4b4eb815e 100644 --- a/public/v4/apps/kibana.yml +++ b/public/v4/apps/kibana.yml @@ -15,7 +15,7 @@ caproverOneClickApp: variables: - label: Kibana version defaultValue: 8.4.1 - description: It's highly recommended that you don't use the latest tag but instead the major version you need. See https://hub.docker.com/_/kibana for a list of versions. + description: It's highly recommended that you don't use the latest tag but instead the major version you need. See https://hub.docker.com/_/kibana/tags for a list of versions. id: $$cap_app_version - label: Default App id defaultValue: home diff --git a/public/v4/apps/mailtrain.yml b/public/v4/apps/mailtrain.yml index 7653e2226..492d07c45 100644 --- a/public/v4/apps/mailtrain.yml +++ b/public/v4/apps/mailtrain.yml @@ -69,6 +69,7 @@ caproverOneClickApp: - id: $$cap_mariadb_password label: Mariadb User password description: '' + defaultValue: $$cap_gen_random_hex(16) validRegex: /.{1,}/ - id: $$cap_redis_version label: Redis Version @@ -82,7 +83,7 @@ caproverOneClickApp: validRegex: /^([^\s^\/])+$/ - id: $$cap_app_version label: Mailtrain Version - defaultValue: latest + defaultValue: 'v2.20210609.0' description: Check out their Docker page for the valid tags https://hub.docker.com/r/mailtrain/mailtrain/tags validRegex: /^([^\s^\/])+$/ - id: $$cap_mailtrain_sandbox-appname diff --git a/public/v4/apps/moodle.yml b/public/v4/apps/moodle.yml index 6d9b6a16b..72ddc5c7f 100644 --- a/public/v4/apps/moodle.yml +++ b/public/v4/apps/moodle.yml @@ -55,7 +55,7 @@ caproverOneClickApp: validRegex: /.{1,}/ - id: $$cap_app_version label: Moodle Version - defaultValue: latest + defaultValue: '3.11.7-debian-10-r3' description: Check out their Docker page for the valid tags https://hub.docker.com/r/bitnami/moodle/tags/ validRegex: /^([^\s^\/])+$/ - id: $$cap_md_sitename diff --git a/public/v4/apps/nginx-redirect.yml b/public/v4/apps/nginx-redirect.yml index 106873c42..ed190d8ab 100644 --- a/public/v4/apps/nginx-redirect.yml +++ b/public/v4/apps/nginx-redirect.yml @@ -9,7 +9,7 @@ caproverOneClickApp: variables: - id: $$cap_app_version label: Image Version - defaultValue: latest + defaultValue: 1-14d89df description: The version of the image to use. You can find the available versions at https://hub.docker.com/r/caprover/nginx-redirect/tags - id: $$cap_redirect_url label: Redirect address diff --git a/public/v4/apps/posthog.yml b/public/v4/apps/posthog.yml index 67f60cd4c..3878c2c67 100644 --- a/public/v4/apps/posthog.yml +++ b/public/v4/apps/posthog.yml @@ -271,6 +271,7 @@ caproverOneClickApp: - id: $$cap_app_version label: PostHog's version defaultValue: e2f4b4a8b46667f75ad9bdacf4a487a5dd2d5dbf + description: 'You can find the latest version at https://hub.docker.com/r/posthog/posthog/tags' - id: $$cap_secret_key label: PostHog-LLM Secret Key diff --git a/public/v4/apps/prometheus.yml b/public/v4/apps/prometheus.yml index e0d6aa51f..510c34867 100644 --- a/public/v4/apps/prometheus.yml +++ b/public/v4/apps/prometheus.yml @@ -12,7 +12,7 @@ caproverOneClickApp: variables: - label: Prometheus Docker Hash defaultValue: sha256:43b19072ef98fd0ea5a29ac794fbadf365cca6d5247830034c7b86ae9650126c - description: Starts with 'sha256:'. Find on Docker Hub. Default is latest as of 2020-06-30. + description: Starts with 'sha256:'. Find on Docker Hub. Default is latest as of 2020-06-30. See https://hub.docker.com/r/prom/prometheus/tags id: $$cap_app_version instructions: end: Prometheus is now starting. diff --git a/public/v4/apps/resilio-sync.yml b/public/v4/apps/resilio-sync.yml index ec00a0057..6d996b60a 100644 --- a/public/v4/apps/resilio-sync.yml +++ b/public/v4/apps/resilio-sync.yml @@ -13,7 +13,7 @@ caproverOneClickApp: variables: - label: Resilio Sync Docker Version defaultValue: 2.6.4 - description: It's highly recommended that you don't use the latest tag but instead the major version you need. + description: It's highly recommended that you don't use the latest tag but instead the major version you need. You can find the latest version at https://hub.docker.com/r/resilio/sync/tags id: $$cap_app_version - label: Listening port for Sync traffic description: Port that Sync listens on for data synchronization (TCP & UDP). diff --git a/public/v4/apps/rsync-looped.yml b/public/v4/apps/rsync-looped.yml index fc49dd1ad..9db2c7eb8 100644 --- a/public/v4/apps/rsync-looped.yml +++ b/public/v4/apps/rsync-looped.yml @@ -22,7 +22,7 @@ caproverOneClickApp: variables: - id: $$cap_app_version label: App Version - description: The version of the app + description: The version of the app`. you can find the latest version at https://hub.docker.com/_/alpine/tags defaultValue: '3.15.0' - id: $$cap_REMOTE_SOURCE_DIRECTORY label: Remote source location diff --git a/public/v4/apps/sinusbot.yml b/public/v4/apps/sinusbot.yml index 59e5406ae..cf530db26 100644 --- a/public/v4/apps/sinusbot.yml +++ b/public/v4/apps/sinusbot.yml @@ -15,7 +15,7 @@ caproverOneClickApp: variables: - label: SinusBot Docker Version defaultValue: 1.0.0-beta.10-202ee4d - description: It's highly recommended that you don't use the latest tag but instead the major version you need. + description: It's highly recommended that you don't use the latest tag but instead the major version you need. You can find the latest version at https://hub.docker.com/r/sinusbot/docker/tags id: $$cap_app_version - label: UID description: User ID to run the service as (using root is not recommended), see https://github.com/SinusBot/docker#unprivileged-user diff --git a/public/v4/apps/smokeping.yml b/public/v4/apps/smokeping.yml index d04e9a78d..fb1560a0e 100644 --- a/public/v4/apps/smokeping.yml +++ b/public/v4/apps/smokeping.yml @@ -18,7 +18,7 @@ caproverOneClickApp: - id: $$cap_app_version label: Smokeping Version defaultValue: '2.7.3' - description: Smokeping Image Version + description: Smokeping Image Version. Check out their docker page for the valid tags https://hub.docker.com/r/linuxserver/smokeping/tags validRegex: /^([^\s^\/])+$/ - id: $$cap_puid label: PUID diff --git a/public/v4/apps/sshd.yml b/public/v4/apps/sshd.yml deleted file mode 100644 index a5054fdd4..000000000 --- a/public/v4/apps/sshd.yml +++ /dev/null @@ -1,59 +0,0 @@ -captainVersion: 4 -services: - $$cap_appname: - image: lscr.io/linuxserver/openssh-server:$$cap_app_version - environment: - PUID: 1001 - PGID: 1001 - TZ: Europe/London - PUBLIC_KEY: $$cap_sshd_public_key - DOCKER_MODS: linuxserver/mods:openssh-server-ssh-tunnel - # USER_PASSWORD: $$cap_sshd_public_key - # - PUBLIC_KEY_FILE=/path/to/file #optional - # - PUBLIC_KEY_DIR=/path/to/directory/containing/_only_/pubkeys #optional - # - PUBLIC_KEY_URL=https://github.com/username.keys #optional - # - SUDO_ACCESS=false #optional - # - PASSWORD_ACCESS=false #optional - # - USER_PASSWORD=password #optional - # - USER_PASSWORD_FILE=/path/to/file #optional - USER_NAME: $$cap_sshd_username - volumes: - - $$cap_appname-config:/config - ports: - - $$cap_sshd_port:2222 - caproverExtra: - notExposeAsWebApp: 'true' -caproverOneClickApp: - variables: - - id: $$cap_app_version - label: App Version - defaultValue: 'version-9.7_p1-r4' - description: The version of the app - - id: $$cap_sshd_public_key - label: Your SSH public key - description: Enter your public key - - id: $$cap_sshd_username - label: Your SSH Username - defaultValue: 'caprover' - - id: $$cap_sshd_port - label: Your SSH exposed port (your host mapped port) - description: Enter a port number - defaultValue: '4646' - validRegex: /^\d+$/ - instructions: - start: >- - The following app sets up an SSHd service in a container that you can use to connect to and inspect other container's volumes, or to get quick access to a test container. - - - IMPORTANT: - - This setup uses **public key** login. - end: >- - The container is built and deployed. You can now connect to this container from your local machine by running the following command: - - ssh -i /path/to/private.key $$cap_sshd_username@$$cap_appname.$$cap_root_domain -p $$cap_sshd_port - - displayName: SSH Container - isOfficial: true - description: Just a simple container that has sshd installed so you can SSH directly into this container. - documentation: 'Taken from https://github.com/linuxserver/docker-openssh-server' diff --git a/public/v4/apps/steam-openid-provider.yml b/public/v4/apps/steam-openid-provider.yml index 06957ce33..de62f9f03 100644 --- a/public/v4/apps/steam-openid-provider.yml +++ b/public/v4/apps/steam-openid-provider.yml @@ -16,7 +16,7 @@ caproverOneClickApp: - id: $$cap_app_version label: App Version defaultValue: 'sha-c8305ce' - description: The version of the app to deploy. + description: The version of the app to deploy. You can find the latest version at https://github.com/byo-software/steam-openid-connect-provider/pkgs/container/steam-openid-connect-provider - id: $$cap_client_id label: OAuth Client ID defaultValue: 'steamidp' diff --git a/public/v4/apps/syncthing.yml b/public/v4/apps/syncthing.yml index bd1df8536..52af4d721 100644 --- a/public/v4/apps/syncthing.yml +++ b/public/v4/apps/syncthing.yml @@ -13,7 +13,7 @@ caproverOneClickApp: variables: - label: Syncthing Docker Version defaultValue: 1.5.0 - description: It's highly recommended that you don't use the latest tag but instead the major version you need. + description: It's highly recommended that you don't use the latest tag but instead the major version you need. See https://hub.docker.com/r/syncthing/syncthing/tags for a list of versions. id: $$cap_app_version - label: Sync Protocol Listening Port description: Port that Syncthing listens on for data synchronization (TCP). diff --git a/public/v4/apps/teamspeak.yml b/public/v4/apps/teamspeak.yml index 2863ae974..e113d84bd 100644 --- a/public/v4/apps/teamspeak.yml +++ b/public/v4/apps/teamspeak.yml @@ -17,7 +17,7 @@ caproverOneClickApp: variables: - label: TeamSpeak Docker Version defaultValue: 3.13.7 - description: It's highly recommended that you don't use the latest tag but instead the major version you need, e.g. teamspeak:3.12.0 + description: It's highly recommended that you don't use the latest tag but instead the major version you need. For example, 3.13.7 in https://hub.docker.com/r/teamspeak/teamspeak/tags id: $$cap_app_version - label: Voice Port (UDP) description: Port for voice (UDP) diff --git a/public/v4/apps/tiddlywiki.yml b/public/v4/apps/tiddlywiki.yml index fb7ffdaab..b153a69c3 100644 --- a/public/v4/apps/tiddlywiki.yml +++ b/public/v4/apps/tiddlywiki.yml @@ -16,7 +16,7 @@ caproverOneClickApp: - id: $$cap_app_version label: Version defaultValue: '5.1.23' - description: Version of TiddlyWiki to use + description: Version of TiddlyWiki to use. You can find the latest version at https://hub.docker.com/r/nicolaw/tiddlywiki/tags - id: $$cap_wikusername label: Username defaultValue: anonymous diff --git a/public/v4/apps/wiki-js.yml b/public/v4/apps/wiki-js.yml index 0e38a5210..f7a26dee1 100644 --- a/public/v4/apps/wiki-js.yml +++ b/public/v4/apps/wiki-js.yml @@ -24,7 +24,7 @@ caproverOneClickApp: variables: - label: Wiki.js Version defaultValue: '2.5' - description: It's highly recommended that you don't use the latest tag but instead the major version you need, e.g. requarks/wiki:2 + description: It's highly recommended that you don't use the latest tag but instead the major version you need, e.g. requarks/wiki:2. you can find the latest version at https://hub.docker.com/r/requarks/wiki/tags id: $$cap_app_version - label: Postgres Version defaultValue: 14.1-alpine diff --git a/public/v4/logos/sshd.png b/public/v4/logos/sshd.png deleted file mode 100644 index 147bd2f8f11b40b2fce59f22cd2769e17d5e328d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7461 zcmdUUXH-*Nw{GZ7P(Y*;IwB<^1nImA3J3vd5~WI{6GA6IC=n?U0Y#)2r74|AhX6r% zK|w%3I)+dL>7hsJjqf=38)uw*$2q^gamU?b@3H5eYp%A}TF+c_J(&B(daTTR%m4s@ z)j(g@3;>|A`|~i;Q#AcDL41@Kt>0|}3r5O?Vtf)u`DXIgf9MAQ+;9E!P?;%Gol=w> z{&%4M<_Ks1pvS&W0H+WaH)nYm0{*tM1_}TOxEko*vOs2U{0MHewG8grM$l99GBSxO zE=u+mUZ8$D&*Sv1RK*k?5A_%wyT(-t536N!tthIih_tjWVymMFZzJojn9AO{lyaY* zF5{{A)z`YoFI5{NaEHDKug&Ul)zFI8!PeQq-RxydgtT_t3<0&dC@AOwrCTqF5Ro zh=U1kH<0$UI3O}G3ap=*SxK!$YctkGgwSqz;a$*H%Gc|~S%XAKp?Dez201~T37tHB z>SZCTt8S1~=ye=$((fdpjuQ~+I z`!!G>)5xsJUuy{BNL#lAuAzfy{Iae-7%l{-k@s5BwMJ?M7{`_X=}~*)UE(w6-V~)f z*}6|4qc+Wr88=#Lp00vOVyvTA-P~2PR-5)lV%*m!Jm-ZB-f%b2O_XKakbo$Jnrmj& zQ>%l`om~zJk6LKV-3MaRPIqd}rLQ?$#sgroHglB#rqYINOy(3CEgA))xT$9BC5QeZS48>@bwE=KSS=FJ+R#^|F5&z zZsjX@g|5oMGR!VH-Uy~}ePASR_DdET=px`DgdLx~?RbbT`_e$O;ZJm(KYYTv9h6%0 zlX%v}G5HWLN0Vf;#IfvSMRe&3o=JBrcf-HJqjhIzw#<<&xpv?5_E-4&+yxG;Fb0F2 z5oh#7o7KFeLvhCf+^eePh)5lGA&)C0Ze3vf9P9@Ju5Aemu)Afn%iq*YGRJ3U_B^6R zMQsc&97c9h3?;EpmyI~=CPR43A3N$91;=uTZrS%74QPSuR=CN=wSH4hQXFF~Y{&58zH{OXKa2quG{G)otRum>C8y%6&T@zuJH$2`dxWue{1HO!!>%|4U6wqviAoE3dRV~K^XS%L#r32Q zDi5?t+44QqWYfQ~TBe;)V7bcJsXs7=!9t)cFNE)^t-VkA;Mn!C7Ma9-#vc*P*1G!= z)u1(B**NRJEW3})SYbJ)KINl@Vay&HNU6T^nDNUOLH z`}W9VI_FozOhQUXi)NA{=H}OH_i}sa{M*+KhAi6Ce;sHT7aU1FOEdfwuyDcMX-uZUs>0!;Pr#L3JJb1DLfwDxYCdn4X?K$ zon$-pf2wH3&ih=X*52|h&$=O~o(a~~*|}Dl8>JTBeJ%go<0hpu5M8m2Kb@+>+u9~t z?r0ovwnSN&?r3-kZw-Jn3z9yJzx9mc&3uO?|Mc@~8>F%fR&MRXmQ&uy>wfxQZ5#%YHt9zBf z&ZZN3e7{0_kDDXHYXL6ew^HCqqDCQ~`gn;pTa3=Fyf|mUQX%aiunpaHkfkW&WZ4I2@>MEIk(q6mn*~aSdv_B?06N|tJV9rKVHdc-4)3(v& zy~9iJd*(d2?=8zy8C|WpuV6O%VeN}iiB5ZxKO4;Lf3anncsAVlIJf^u^y=E?(}Tdf z=dmcJmG(tW)nu~1s&9Eq4T3e$hg#8yijzJDpnLTPRhG>2Y ztu`GAc(HkFP3QIO^k4Or-yIAm^i5J zu`h2kb#<4WL)MLxJ2mDtv@pm5-17m@RI0)rB2Y9QGi|H+F3GtPDd8rXV83mg`j9pG zyW#~qgKJ-jZwf#CH-fXWEui}5zCY{h?-`ITUy`B08d^Q`H@*)Y^(76I#BLbVuCuSz zXMP(vnzs0xG*=*)lt(2s(qxVyh!m~13aL~_soCC;Edd|U%2V47clepmoiR<+jXm!U z5+Cw+J%0)t`$T-BG;<*z)I4=(xcR8ph*NvDhCXcr5~JG zM}uB@(NR?T<22*q0_PCN-GSn4ll8-~Kfj=}LR2};=wW&_yGjCd;{FsX{+OSqL59An z@YXC{VnGcAQYE4++geX)ay=bcfP|WVpkw0JnLHPYPExXcrWCDdw2nfBrfIwIk}eRX zyUOFDZO?E+o^;{Hw5K|};o&B01xLvmLAm#2V0n`5Rzp(X!N2i&6!YR>6iT4R;_u^hhEr2 zMTtPT9&sF9MZ;fm7Ge%ui;R!78ahU#7)I7as(%h@J3{}&>!E23aUXOM&g-*jeQ4WE z8MwM)Q)&p%P~&p#eFH$dwABCR1b14qAQ3hm(~3 zwW^NI51sVtkn`4?9%mw_QUv(nKJa8W^O|?MX5_w+%^C^AaD>#8gCFs0`{g5B3WaHJv$wgm8|;Ueczx(L1`FW^+|wth ziPrdx+O_a8f8r@#qA&uJHvOfGJBs0^?Po^A$aA{z3N-c*q7rCInfueAxrx&nO9ca7 z+`@DMIrXFo!hIvrUWCB2L@|#vN3)<+DVi8T%yECaHF759cn41A02dMLjtAcP&~HsF z0k~;mZ`$h94T`s=OqR^4+0mn31=98)i)r#CwTun_=EW6c(Vr-K+l)kuLzz(@JGS%g zebs@7QjnG&6|=PY+nrevsdspcm&uaPr)g)!Rib^C0rtgVhnZ3z#Y}^&y+&N0Uq?1H zXe<0~v&zvcr{K7^=k%RLyvaJ;(^-hceBW>`S~=jB9#* zOeJ+mW;E6RerIJDe~+~q(o2dBa8}*9>?PdBbHaz638KS#HkUTxwYsPi(r7@Usl?(C zb<#zAf}n<#dxBPopU@V&zp~Y#GV$_ij+e3^QWJXuuFFl(ZI9#78ow209S53Q&5fz$ z9@2UHn#=dx)K5-K4)Wn={?|GSpDUwlnl%|5>SJULg3Zyde&VUi@Oejg2G0Eb66dL~ z+1kVS99#LG?G}ovZIh^s_pfQW@XQoHELbsYPfeld@Ov{5vUP@IIp8j{ERZhaDR( z3TgEf&O(wTPCZ+e6~AJ&=& z7m6t=mwLopO#6i?!<}j(=U31D(KP9E_M;o~LjIOv_}9BBqO1zYSPkvD2@`fXKEoDF z<3-!iVWWTxXX~Z*l3tQW_mt*jhxxvM`psjMx`?bT9J6s&`_V=L-!%`=i`IG(uAi`0 z9Q}h?-ayhUQ_tZl>dF44sG9QYz9zmTqS; z)4M>Zw*G{@=~9-T*a^ONib1$b)*ruaP zh3jhG_Qia@FY;DN+b@5Ofy>H1skhZ7tC&2hG5ZiFG zNS0r|sl2JeYyiD%ILV7^m3C5_eC}zvmk7p#WQ5j!n+4J%5Y4soKH7iVa?yvi&ihyn zR(w~8YPf03U;~|NJiH&a_U_B3Nk$`L$CtRZla^mHK-{oJ&{py+oUbux{S~si_htP7 z5&WVRup~ruQfi;jF^|l$EiUu3uk+Hlw>NzX$?qU{=nfJ*BK^=?H?1CdoJtLat=rX_{S+%Bz|T_7Sfs;3 zrD{^n7(!jjZm-^=M>JB#vD0;MBSup5rMGAAm0QDwE~J<|aek* zizxV!p6omCXDl{$0Q%6Lo$F17buB0r#F$(`d^S(~&VPXb4|}mkpa)5|&1pxKGzkBs z8sm176z}1Z$TSI_F={n4$U<`A7duDJR%{O zg_|p$^UQ(9^Sj2vo9y;FvXiYD=?{~ATU<`@+m_Z^2hW@E$uS<#2@-krFCe?PrBGj{ zw2x6JI~BC@h2z5I^RnVLzAxBOG9efCB)31t@LKA(p2FkaT zxUer)t17A}fH0!B&plR8jQ({px(C`N_0Z^YrqNI!UH+@+BTMD5+!*ajYQpVM=UmyM z-+sw!k4g2qz)^cBe-t+{Ug?}ga|g>y=AH_^(?E-Swlp~Ox#u3yKeN4}K4od}PGxLI z)@RUo_d!dcT^#=mDOAn#*LKQV6l(my*x`p81ffM?oe;D=a_A42mn@cUqW190NZ}Po_5K6 z{Q*U|>db!FtBq+tc7NH9;tYN9t8$-exZV=v#O^IYN-1XHU24Ibc5!>b_mt;_+SKW1LU$*!0zPWX+cSg!oZkTe|Dzk<>TlgW{E6ru^%qTyiLR5OGzpPI{15di1>}k3Cm1>6S(6oTo zc%-7fn}uC3@%BqUwA7`XUN(s~ftjd@%Zg6VXXLvQg=<yFvf|bjyVdMouU<)S_ zte_~opZlw274&}p2qQ7tL-B290#T4D%eand{sBo%eS7Bh)OV?N)yYts^xdhI;x=o$AVOvBXciZE7Y5TOl@|v#Bl|g zJ)i(tFrx}+j=W4sh|OluNcTSR^W_p{y@3oJY?lyd0V zUv)y`PdqI>J%A1oj!kRu+V|Wv_%NoP&Fl(hw@548G$kD4+!fZbPSVz$vHH>8(R}yb z%FdhP{{5z|;77OCNu&a_cAoLfs%sQ0Q%{IO{`v)i2uobd{QDZXUseX*BQEg~d}`$# zs~ro9AK4vu-p0L6f1ozQc-@jaGg%{TWirm>bxz|YvHU4un&ws?32=7!iED`xx_j7nplaR7K?cJvIrA|bb zvbp_)g{O~_x}L$tolD=P4Lt1q9U^PZH4KQlS#GQnxaDbS(O~rnD_tdbr`MPVl2?=( zYP;l;M2to(ImOJfcP&}Xk;L{p@Do;w3e;=)StUH7_L4y`q@+@`VsK+JWh+2kklgod zp@G_JQTh(wAKQ@m?L4VRVyV6WQc2fxVO#O#HGP(Y&d4N}QYTp;b)uolnLCj?!~Ke{P6 zt(m0G&Ld}wp*<$U8Di909UNYK{{cGF(vcGj<7(92R(0W2H~*UR3(wXs8Q4x%a$}JS zXFBmneO|~;aVI$p26n5llC#tUxO=HVZ^CK){&kYVJi+1lN*CLeDzRcQTjQ^OVb`~p*Kf_- z)MAHblV|3%jGDNhd9(y$997Z8>qeJTAEG)wp-a_p^0S|wqfgg6{C3x^dLsV@76acy~~Yf{;v3{=7Sx= zd_+batkVCnw*aI^MR1=WgbSet>iBJF=;rfL*12|*sn{IrB|Y@5`N35I6`wMGVF%RQ`b=>O|X~F%!L!y zjaF7a;evLm3i@ygtaba|*e+W69FoS_FdJe@IUe#j9M>XlKJOv?wI}f_KoPAI=d2v2 zdv)t2Sy7qelzNjs+z7Qs=mzbtev}!K-}%eo=6rThND6fIlvC8-Jk9OqV>R|igOU&K z5e)pBLqBw6b}KRgGE&o zZX)O`aurk!oB-gs)5mqO$&wYp_+tzUF2zVq%<7gUs7W0Qtj^w>=3PUtq4PKoBP2>V z6(cp#1^Vq)Ep$-Y^759epZRf=@L0-4NGEwUP=WN^Mq49@q(#%%j8{pvNDCKjsq6#) zwMln*mZ2>r_<}*{2=`~6=KD+c{6%~Q>#Ok416@bgom^;K zL1lMm>07jKD_^CU-OD+dl7ul1-u+IFs5hR;e!Sk)qgJ&BW=t|@ZtB@C*zk6 zP2^=YDk+qTcAQaj{o-3lZ8Qp?LZ`w`o~7?jE0n>Q5UZ$!WHpieOXEWHC-goXi2!G? zbz-4`tC%;9kNTW_WLB1JF>8nVjFDpo;r9B7Oi5@Gpe!;pvY*11{TmoL3d>h`K#uqv z2ZJoGzT>AblHfm#qz(cOck=QF=peiToqYYBo(KoI`MV1Li=PxWf1oGqj}WHNpu({K Xu<@0ZUJ#=c05G^?tXp~8;pzVZY4<$9 diff --git a/scripts/validate_apps.js b/scripts/validate_apps.js index a6be7b298..8aaa1ae44 100644 --- a/scripts/validate_apps.js +++ b/scripts/validate_apps.js @@ -58,6 +58,16 @@ if (!content.caproverOneClickApp.variables.find((v) => v.id === '$$cap_app_version')) { throw new Error(`Cannot find version for ${apps[i]}`); } + const versionApp = content.caproverOneClickApp.variables.find((v) => v.id === '$$cap_app_version') + if(versionApp.defaultValue === 'latest'){ + throw new Error(`"latest" tag is not allowed as it can change and break the setup, see ${apps[i]}`); + } + if(!versionApp.description) { + throw new Error(`Version description must included here, see ${apps[i]}`); + } + if(!versionApp.description.match('tags') && !versionApp.description.match('github') && !versionApp.description.match('gitlab')) { + throw new Error(`Version description must contain a link to the tags page, see ${apps[i]}`); + } Object.keys(content.services).forEach( (serviceName) => { // jshint ignore:line From e8cff0e27e48ff4cc0b988b3d97a1135b9de2c1d Mon Sep 17 00:00:00 2001 From: Simon Belbeoch Date: Mon, 11 Nov 2024 17:12:06 +0100 Subject: [PATCH 5/6] remove dead code --- scripts/validate_apps.js | 64 ++-------------------------------------- 1 file changed, 3 insertions(+), 61 deletions(-) diff --git a/scripts/validate_apps.js b/scripts/validate_apps.js index 8aaa1ae44..cbdd6989e 100644 --- a/scripts/validate_apps.js +++ b/scripts/validate_apps.js @@ -15,11 +15,11 @@ const pathOfApps = path.join(pathOfVersion, 'apps'); return fs.readdir(pathOfApps) - .then(function (items) { + .then(function (files) { - const apps = items.filter(v => v.includes('.yml')); + const apps = files.filter(v => v.includes('.yml')); - if (items.length !== apps.length) { + if (files.length !== apps.length) { throw new Error('All files in v4 must end with .yml'); } @@ -95,65 +95,7 @@ }); } - // validating version 2 - function validateV2() { - - const version = '2'; - const pathOfVersion = path.join(pathOfPublic, 'v' + version); - const pathOfApps = path.join(pathOfVersion, 'apps'); - - if (!fs.existsSync(pathOfApps)) { - return; - } - - return fs.readdir(pathOfApps) - .then(function (items) { - - const apps = items.filter(v => v.includes('.json')); - - if (items.length !== apps.length) { - throw new Error('All files in v2 must end with .json'); - } - - for (var i = 0; i < apps.length; i++) { - const contentString = fs.readFileSync(path.join(pathOfApps, apps[i])); - const content = JSON.parse(contentString); - const captainVersion = (content.captainVersion + ''); - const versionString = (version + ''); - if (versionString !== captainVersion) - throw new Error(`unmatched versions ${versionString} ${captainVersion} for ${apps[i]}`); - - apps[i] = apps[i].replace('.json', ''); - - if (!content.description) { - throw new Error(`Cannot find description for ${apps[i]}`); - } - if (content.description.length > 200) { - throw new Error(`Description too long for ${apps[i]} - keep it below 200 chars`); - } - - const logoFileName = apps[i] + '.png'; - - const logoFullPath = path.join(pathOfVersion, 'logos', logoFileName); - - if (!fs.existsSync(logoFullPath) || - !fs.statSync(logoFullPath).isFile()) { - let printablePath = logoFullPath; - printablePath = printablePath.substr(printablePath.indexOf(`/${PUBLIC}`)); - throw new Error(`Cannot find logo for ${apps[i]} ${printablePath}`); - } - - console.log(`Validated ${apps[i]}`); - - } - - }); - } - Promise.resolve() - .then(function () { - return validateV2(); - }) .then(function () { return validateV4(); }) From 6ae767bcedadc025e21d41057e05110ae205e52b Mon Sep 17 00:00:00 2001 From: Simon Belbeoch Date: Mon, 11 Nov 2024 17:17:25 +0100 Subject: [PATCH 6/6] suggestion of evolution in validate_apps.js --- scripts/validate_apps.js | 50 ++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/scripts/validate_apps.js b/scripts/validate_apps.js index cbdd6989e..97436e5e7 100644 --- a/scripts/validate_apps.js +++ b/scripts/validate_apps.js @@ -6,7 +6,6 @@ const PUBLIC = `public`; const pathOfPublic = path.join(__dirname, '..', PUBLIC); - // validating version 4 function validateV4() { @@ -23,61 +22,58 @@ throw new Error('All files in v4 must end with .yml'); } - for (var i = 0; i < apps.length; i++) { - const contentString = fs.readFileSync(path.join(pathOfApps, apps[i]), 'utf-8'); + for (const app of apps) { + const contentString = fs.readFileSync(path.join(pathOfApps, app), 'utf-8'); const content = yaml.parse(contentString); const captainVersion = (content.captainVersion + ''); const versionString = (version + ''); - if (versionString !== captainVersion) - throw new Error(`unmatched versions ${versionString} ${captainVersion} for ${apps[i]}`); + const appName = app.replace('.yml', ''); - apps[i] = apps[i].replace('.yml', ''); + if (versionString !== captainVersion){ + throw new Error(`unmatched versions ${versionString} ${captainVersion} for ${appName}`); + } if (!content.caproverOneClickApp) { - throw new Error(`Cannot find caproverOneClickApp for ${apps[i]}`); + throw new Error(`Cannot find caproverOneClickApp for ${appName}`); } if (!content.caproverOneClickApp.description) { - throw new Error(`Cannot find description for ${apps[i]}`); + throw new Error(`Cannot find description for ${appName}`); } if (content.caproverOneClickApp.description.length > 200) { - throw new Error(`Description too long for ${apps[i]} - keep it below 200 chars`); + throw new Error(`Description too long for ${appName} - keep it below 200 chars`); } if (!content.caproverOneClickApp.instructions || !content.caproverOneClickApp.instructions.start || !content.caproverOneClickApp.instructions.end) { - throw new Error(`Cannot find instructions.start or instructions.end for ${apps[i]}`); + throw new Error(`Cannot find instructions.start or instructions.end for ${appName}`); } if (!content.services) { - throw new Error(`Cannot find services for ${apps[i]}`); + throw new Error(`Cannot find services for ${appName}`); } if (!content.caproverOneClickApp.variables.find((v) => v.id === '$$cap_app_version')) { - throw new Error(`Cannot find version for ${apps[i]}`); + throw new Error(`Cannot find version for ${appName}`); } + const versionApp = content.caproverOneClickApp.variables.find((v) => v.id === '$$cap_app_version') + if(versionApp.defaultValue === 'latest'){ - throw new Error(`"latest" tag is not allowed as it can change and break the setup, see ${apps[i]}`); + throw new Error(`"latest" tag is not allowed as it can change and break the setup, see ${appName}`); } + if(!versionApp.description) { - throw new Error(`Version description must included here, see ${apps[i]}`); + throw new Error(`Version description must included here, see ${appName}`); } + if(!versionApp.description.match('tags') && !versionApp.description.match('github') && !versionApp.description.match('gitlab')) { - throw new Error(`Version description must contain a link to the tags page, see ${apps[i]}`); + throw new Error(`Version description must contain a link to the tags page, see ${appName}`); } - Object.keys(content.services).forEach( - (serviceName) => { // jshint ignore:line - const s = content.services[serviceName]; - if (s.image && s.image.endsWith(':latest')) { - // throw new Error(`"latest" tag is not allowed as it can change and break the setup, see ${apps[i]}`); - } - }); - - const logoFileName = apps[i] + '.png'; + const logoFileName = appName + '.png'; const logoFullPath = path.join(pathOfVersion, 'logos', logoFileName); @@ -85,13 +81,11 @@ !fs.statSync(logoFullPath).isFile()) { let printablePath = logoFullPath; printablePath = printablePath.substr(printablePath.indexOf(`/${PUBLIC}`)); - throw new Error(`Cannot find logo for ${apps[i]} ${printablePath}`); + throw new Error(`Cannot find logo for ${appName} ${printablePath}`); } - console.log(`Validated ${apps[i]}`); - + console.log(`Validated ${appName}`); } - }); }