From a5d5dcaaf01ed29a4aedd719176f60d69ef09b61 Mon Sep 17 00:00:00 2001 From: kgnfth <73314940+kgnfth@users.noreply.github.com> Date: Fri, 18 Dec 2020 01:23:50 +0100 Subject: [PATCH] Remove containerHttpPort 80 :fire: (#322) --- public/v4/apps/bitwardenrs.yml | 2 -- public/v4/apps/chevereto.yml | 2 -- public/v4/apps/cockpit.yml | 2 -- public/v4/apps/directus.yml | 2 -- public/v4/apps/dolibarr.yml | 2 -- public/v4/apps/drone-gitea.yml | 2 -- public/v4/apps/gitlab-ce.yml | 2 -- public/v4/apps/lychee.yml | 2 -- public/v4/apps/matomo.yml | 2 -- public/v4/apps/organizr.yml | 6 +----- public/v4/apps/phpldapadmin.yml | 2 -- 11 files changed, 1 insertion(+), 25 deletions(-) diff --git a/public/v4/apps/bitwardenrs.yml b/public/v4/apps/bitwardenrs.yml index 9cfc555..23fe575 100644 --- a/public/v4/apps/bitwardenrs.yml +++ b/public/v4/apps/bitwardenrs.yml @@ -5,8 +5,6 @@ services: volumes: - $$cap_appname-data:/data restart: always - caproverExtra: - containerHttpPort: '80' caproverOneClickApp: variables: - id: $$cap_bitwardenrs_version diff --git a/public/v4/apps/chevereto.yml b/public/v4/apps/chevereto.yml index 6062e1b..5cbc2e6 100644 --- a/public/v4/apps/chevereto.yml +++ b/public/v4/apps/chevereto.yml @@ -15,8 +15,6 @@ services: CHEVERETO_DB_NAME: $$cap_mariadb-db volumes: - $$cap_appname-images:/var/www/html/images - caproverExtra: - containerHttpPort: '80' # MariaDB $$cap_appname-mariadb: image: mariadb:$$cap_mariadb_version diff --git a/public/v4/apps/cockpit.yml b/public/v4/apps/cockpit.yml index 8db4c57..5e16b09 100644 --- a/public/v4/apps/cockpit.yml +++ b/public/v4/apps/cockpit.yml @@ -5,8 +5,6 @@ services: volumes: - $$cap_appname-storage:/var/www/html/storage restart: always - caproverExtra: - containerHttpPort: '80' caproverOneClickApp: variables: - id: $$cap_cockpit_version diff --git a/public/v4/apps/directus.yml b/public/v4/apps/directus.yml index 970ad73..1fcc459 100644 --- a/public/v4/apps/directus.yml +++ b/public/v4/apps/directus.yml @@ -32,8 +32,6 @@ services: DIRECTUS_DATABASE_PASSWORD: $$cap_mysql_passwd DIRECTUS_AUTH_SECRETKEY: $$cap_directus_auth_secret_key DIRECTUS_AUTH_PUBLICKEY: $$cap_directus_auth_public_key - caproverExtra: - containerHttpPort: '80' caproverOneClickApp: variables: - description: Tag of Directus image on https://hub.docker.com/r/directus/directus/tags diff --git a/public/v4/apps/dolibarr.yml b/public/v4/apps/dolibarr.yml index ff1250b..faf8d1f 100644 --- a/public/v4/apps/dolibarr.yml +++ b/public/v4/apps/dolibarr.yml @@ -31,8 +31,6 @@ services: DOLI_ADMIN_LOGIN: $$cap_admin-login DOLI_ADMIN_PASSWORD: $$cap_admin-pass DOLI_URL_ROOT: http://$$cap_appname.$$cap_root_domain - caproverExtra: - containerHttpPort: '80' caproverOneClickApp: variables: - id: $$cap_postgres-version diff --git a/public/v4/apps/drone-gitea.yml b/public/v4/apps/drone-gitea.yml index ec28997..787ca27 100644 --- a/public/v4/apps/drone-gitea.yml +++ b/public/v4/apps/drone-gitea.yml @@ -29,8 +29,6 @@ services: DRONE_GITEA_CLIENT_ID: $$cap_drone_gitea_client_id DRONE_GITEA_CLIENT_SECRET: $$cap_drone_gitea_client_secret DRONE_RPC_SECRET: $$cap_drone_secret - caproverExtra: - containerHttpPort: '80' caproverOneClickApp: variables: - id: $$cap_drone_version diff --git a/public/v4/apps/gitlab-ce.yml b/public/v4/apps/gitlab-ce.yml index 517deb3..5ff3634 100644 --- a/public/v4/apps/gitlab-ce.yml +++ b/public/v4/apps/gitlab-ce.yml @@ -10,8 +10,6 @@ services: restart: always environment: GITLAB_OMNIBUS_CONFIG: $$cap_gitlab_omnibus_config - caproverExtra: - containerHttpPort: '80' caproverOneClickApp: variables: - id: $$cap_gitlab_version diff --git a/public/v4/apps/lychee.yml b/public/v4/apps/lychee.yml index af27063..bc76b66 100644 --- a/public/v4/apps/lychee.yml +++ b/public/v4/apps/lychee.yml @@ -23,8 +23,6 @@ services: - $$cap_appname-conf:/conf - $$cap_appname-uploads:/uploads - $$cap_appname-sym:/sym - caproverExtra: - containerHttpPort: '80' # MariaDB $$cap_appname-mariadb: image: mariadb:$$cap_mariadb_version diff --git a/public/v4/apps/matomo.yml b/public/v4/apps/matomo.yml index f55b91a..b6954c2 100644 --- a/public/v4/apps/matomo.yml +++ b/public/v4/apps/matomo.yml @@ -28,8 +28,6 @@ services: MATOMO_DATABASE_USERNAME: matomo MATOMO_DATABASE_PASSWORD: $$cap_db_pass MATOMO_DATABASE_DBNAME: matomo - caproverExtra: - containerHttpPort: '80' caproverOneClickApp: variables: - id: $$cap_matomo_version diff --git a/public/v4/apps/organizr.yml b/public/v4/apps/organizr.yml index fe426bc..f2c9a43 100644 --- a/public/v4/apps/organizr.yml +++ b/public/v4/apps/organizr.yml @@ -1,6 +1,6 @@ captainVersion: 4 services: - '$$cap_appname': + $$cap_appname: image: organizr/organizr:$$cap_version environment: TZ: '$$cap_tz' @@ -9,11 +9,8 @@ services: branch: '$$cap_branch' #'v2-master' #v2-master or #v2-develop PUID: 1000 PGID: 1000 - volumes: - '$$cap_appname-config:/config' - caproverExtra: - containerHttpPort: '80' caproverOneClickApp: variables: - id: '$$cap_version' @@ -32,7 +29,6 @@ caproverOneClickApp: label: Organizr branch defaultValue: 'v2-master' description: Branch name to use - instructions: start: |- Do you have quite a bit of services running on your computer or server? Do you have a lot of bookmarks or have to memorize a bunch of ip's and ports? diff --git a/public/v4/apps/phpldapadmin.yml b/public/v4/apps/phpldapadmin.yml index 59b22a8..674f6b5 100644 --- a/public/v4/apps/phpldapadmin.yml +++ b/public/v4/apps/phpldapadmin.yml @@ -22,8 +22,6 @@ services: PHPLDAPADMIN_SERVER_ADMIN: $$cap_phpldapadmin_admin-email PHPLDAPADMIN_SERVER_PATH: https://$$cap_appname-admin.$$cap_root_domain PHPLDAPADMIN_HTTPS: false - caproverExtra: - containerHttpPort: '80' caproverOneClickApp: variables: - id: $$cap_openldap_version