From 3cb7e7d6bbcd369d220b35eb0dea261fc17c14b5 Mon Sep 17 00:00:00 2001 From: Kasra Bigdeli Date: Sun, 16 Aug 2020 07:34:16 -0400 Subject: [PATCH] Revert "Added formatter for yml too" This reverts commit f74d5219a66457262bc002cd7f7d7dbb2ccc375f. --- package.json | 4 +-- public/v4/apps/privatebin.yml | 63 ++++++++++++++++++----------------- 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/package.json b/package.json index cb7fe85..9d97f65 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ "version": "1.0.0", "description": "One Click App Repository for CapRover", "scripts": { - "formatter": "prettier --check './public/**/*.(json|yml)'", - "formatter-write": "prettier --write './public/**/*.(json|yml)'", + "formatter": "prettier --check './public/**/*.json'", + "formatter-write": "prettier --write './public/**/*.json'", "build": "rm -rf ./dist/ && mkdir -p dist && node ./scripts/build_one_click_apps.js && node ./scripts/build_one_click_apps_from_v4.js", "validate_json": "node ./scripts/validate_json.js", "publish": "npm run build && ./scripts/publish-from-actions.sh" diff --git a/public/v4/apps/privatebin.yml b/public/v4/apps/privatebin.yml index a576d06..5dd18af 100644 --- a/public/v4/apps/privatebin.yml +++ b/public/v4/apps/privatebin.yml @@ -1,34 +1,35 @@ captainVersion: 4 services: - '$$cap_appname': - image: privatebin/nginx-fpm-alpine:$$cap_version - environment: - TZ: '$$cap_tz' - PHP_TZ: '$$cap_tz' - volumes: - - '$$cap_appname-data:/srv/data' - caproverExtra: - containerHttpPort: '8080' + "$$cap_appname": + image: privatebin/nginx-fpm-alpine:$$cap_version + environment: + TZ: "$$cap_tz" + PHP_TZ: "$$cap_tz" + volumes: + - "$$cap_appname-data:/srv/data" + caproverExtra: + containerHttpPort: '8080' caproverOneClickApp: - variables: - - id: '$$cap_version' - label: PrivateBin Version - defaultValue: '1.3.4' - description: Check out their Docker page for the valid tags https://hub.docker.com/r/privatebin/nginx-fpm-alpine/tags - validRegex: "/^([^\\s^\\/])+$/" - - id: '$$cap_tz' - label: Time Zone - defaultValue: America/New_York - description: Get yours from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones - validRegex: '/.{1,}/' - instructions: - start: |- - PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. - Data is encrypted and decrypted in the browser using 256bit AES in Galois Counter mode. - - More details: https://github.com/PrivateBin/PrivateBin - end: |- - PrivateBin has been successfully deployed! - displayName: PrivateBin - description: A minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256 bits AES. - documentation: See https://github.com/PrivateBin/docker-nginx-fpm-alpine + variables: + - id: "$$cap_version" + label: PrivateBin Version + defaultValue: '1.3.4' + description: Check out their Docker page for the valid tags https://hub.docker.com/r/privatebin/nginx-fpm-alpine/tags + validRegex: "/^([^\\s^\\/])+$/" + - id: "$$cap_tz" + label: Time Zone + defaultValue: America/New_York + description: Get yours from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones + validRegex: "/.{1,}/" + instructions: + start: |- + PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. + Data is encrypted and decrypted in the browser using 256bit AES in Galois Counter mode. + + More details: https://github.com/PrivateBin/PrivateBin + end: |- + PrivateBin has been successfully deployed! + displayName: PrivateBin + description: A minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256 bits AES. + documentation: See https://github.com/PrivateBin/docker-nginx-fpm-alpine + \ No newline at end of file