diff --git a/README.md b/README.md index e1cf5bfaf1..a87beb0504 100644 --- a/README.md +++ b/README.md @@ -37,9 +37,10 @@ Do all this **without HTML/CSS**, and writing any custom integrations. * [Customer Support Dashboard](https://app.appsmith.com/applications/5f2aeb2580ca1f6faaed4e4a/pages/5f2d61b580ca1f6faaed4e79#utm_source=github&utm_medium=homepage) -## Build & Deploy +## Getting Started -* [Docker](https://docs.appsmith.com/quick-start#docker) +* [Cloud Hosted](https://app.appsmith.com/user/signup) +* [Deploy with Docker](https://docs.appsmith.com/quick-start#docker) ## Why Appsmith? diff --git a/app/client/yarn.lock b/app/client/yarn.lock index c37745e1e7..8378011040 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -13228,25 +13228,13 @@ pretty-format@^24.9.0: ansi-styles "^3.2.0" react-is "^16.8.4" -pretty-hrtime@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" - integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE= - -prismjs@^1.21.0, prismjs@^1.8.4: +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" -prismjs@~1.17.0: - version "1.17.1" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.17.1.tgz#e669fcbd4cdd873c35102881c33b14d0d68519be" - integrity sha512-PrEDJAFdUGbOP6xK/UsfkC5ghJsPJviKgnQOoxaDbBjwc8op68Quupwt1DeAFoG8GImPhiKXAvvsH7wDSLsu1Q== - optionalDependencies: - clipboard "^2.0.0" - private@^0.1.6, private@^0.1.8, private@~0.1.5: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" diff --git a/deploy/install.sh b/deploy/install.sh index f9d86434d4..80f6714abc 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() { @@ -211,6 +222,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