From 57655526299db9359e2ce4837f5387844de24f1e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Aug 2020 22:28:42 +0530 Subject: [PATCH 1/3] Bump prismjs from 1.20.0 to 1.21.0 in /app/client (#308) Bumps [prismjs](https://github.com/PrismJS/prism) from 1.20.0 to 1.21.0. - [Release notes](https://github.com/PrismJS/prism/releases) - [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md) - [Commits](https://github.com/PrismJS/prism/compare/v1.20.0...v1.21.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/client/package.json | 2 +- app/client/yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/client/package.json b/app/client/package.json index bd589e3bdc..b239f4ef7c 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -72,7 +72,7 @@ "normalizr": "^3.3.0", "popper.js": "^1.15.0", "prettier": "^1.18.2", - "prismjs": "^1.20.0", + "prismjs": "^1.21.0", "re-reselect": "^3.4.0", "react": "^16.12.0", "react-base-table": "^1.9.1", diff --git a/app/client/yarn.lock b/app/client/yarn.lock index 781ea92f0e..10b4a26d63 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -9824,9 +9824,10 @@ pretty-format@^24.9.0: ansi-styles "^3.2.0" react-is "^16.8.4" -prismjs@^1.20.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.20.0.tgz#9b685fc480a3514ee7198eac6a3bf5024319ff03" +prismjs@^1.21.0: + version "1.21.0" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.21.0.tgz#36c086ec36b45319ec4218ee164c110f9fc015a3" + integrity sha512-uGdSIu1nk3kej2iZsLyDoJ7e9bnPzIgY0naW/HdknGj61zScaprVEVGHrPoXqI+M9sP0NDnTK2jpkvmldpuqDw== optionalDependencies: clipboard "^2.0.0" From dc10566740ff06e9adf6e0ac40ca7a226e7eff1a Mon Sep 17 00:00:00 2001 From: Apoorv Mishra Date: Sun, 16 Aug 2020 17:36:34 +0530 Subject: [PATCH 2/3] Update install.sh to install docker-compose separately (#319) Fixes #318 The issue occurred because code assumes that if docker is already installed, docker-compose would have been installed too. This PR is an attempt to fix it. --- deploy/install.sh | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/deploy/install.sh b/deploy/install.sh index 293e942fbf..303f1caa0e 100755 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -36,14 +36,25 @@ install_docker() { sudo ${package_manager} -y update --quiet echo "Installing docker" sudo ${package_manager} -y install docker-ce docker-ce-cli containerd.io --quiet - - if [ ! -f /usr/bin/docker-compose ];then - echo "Installing docker-compose" - sudo curl -L "https://github.com/docker/compose/releases/download/1.26.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose - sudo chmod +x /usr/local/bin/docker-compose - sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose - fi +} +install_docker_compose() { + if [ $package_manager == "apt-get" -o $package_manager == "yum" ];then + if [ ! -f /usr/bin/docker-compose ];then + echo "Installing docker-compose..." + sudo curl -L "https://github.com/docker/compose/releases/download/1.26.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose + sudo chmod +x /usr/local/bin/docker-compose + sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose + echo "docker-compose installed!" + fi + else + echo "+++++++++++ IMPORTANT READ ++++++++++++++++++++++" + echo "docker-compose not found! Please install docker-compose first and then continue with this installation." + echo "Refer https://docs.docker.com/compose/install/ for installing docker-compose." + echo -e "Exiting for now. Bye! \U1F44B" + echo "+++++++++++++++++++++++++++++++++++++++++++++++++" + exit + fi } start_docker() { @@ -242,6 +253,7 @@ curl -O --silent https://raw.githubusercontent.com/appsmithorg/appsmith/release/ if ! is_command_present docker ;then if [ $package_manager == "apt-get" -o $package_manager == "yum" ];then install_docker + else echo "" echo "+++++++++++ IMPORTANT READ ++++++++++++++++++++++" @@ -252,6 +264,11 @@ if ! is_command_present docker ;then fi fi +# Install docker-compose +if ! is_command_present docker-compose; then + install_docker_compose +fi + # Starting docker service if [ $package_manager == "yum" -o $package_manager == "apt-get" ];then start_docker @@ -306,4 +323,4 @@ echo "Need help troubleshooting?" echo "Join our discord server https://discord.com/invite/rBTTVJp" echo "" echo "Your application is running on http://localhost" -echo -e "Peace out \U1F596" \ No newline at end of file +echo -e "Peace out \U1F596" From 3c80de61e52b84f5a3725bc107bc566c600c6c37 Mon Sep 17 00:00:00 2001 From: Nikhil Nandagopal Date: Mon, 17 Aug 2020 12:32:32 +0530 Subject: [PATCH 3/3] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d1295a5163..b47e3f5e29 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,10 @@ Do all this **without HTML/CSS**, and writing any custom integrations. * [Customer Support Dashboard](https://app.appsmith.com/applications/5f2aeb2580ca1f6faaed4e4a/pages/5f2aeb2580ca1f6faaed4e4c#utm_source=github&utm_medium=homepage) +## Getting Started + +* [Cloud Hosted](https://app.appsmith.com/user/signup) +* [Deploy with Docker](https://docs.appsmith.com/quick-start#docker) ## Why Appsmith? @@ -55,10 +59,6 @@ Appsmith provides a better way of building internal tools by visualising them as * **Fine-grained access control**: Control who can edit / view your applications from a single control panel * **App management**: Build and organise multiple applications on a single platform -## Build & Deploy - -* [Docker](https://docs.appsmith.com/quick-start#docker) - ## Documentation & Support If you have encountered a bug or need to get in touch with us, you can contact us using one of the following channels: