diff --git a/install/install.sh b/install/install.sh index f53a5ce32..8d73047e7 100755 --- a/install/install.sh +++ b/install/install.sh @@ -45,7 +45,7 @@ do_install() { if [ -d "$RCTF_INSTALL_PATH" ]; then error "rCTF appears to already be installed in ${RCTF_INSTALL_PATH}" - info "... If you're trying to start rCTF, run 'docker-compose up -d'." + info "... If you're trying to start rCTF, run 'docker compose up -d'." info "... If you're trying to reinstall rCTF, 'rm -rf $RCTF_INSTALL_PATH' then re-run this script." exit 1 @@ -60,11 +60,6 @@ do_install() { curl -fsS https://get.docker.com | sh fi - if [ ! -x "$(command -v docker-compose)" ]; then - curl -fsSLo /usr/local/bin/docker-compose "https://github.com/docker/compose/releases/download/1.26.2/docker-compose-$(uname -s)-$(uname -m)" - chmod +x /usr/local/bin/docker-compose - fi - info "Configuring rCTF..." RCTF_GIT_REF="${RCTF_GIT_REF:-"master"}" @@ -108,7 +103,7 @@ do_install() { info "Downloading rCTF..." curl -fsSO "https://raw.githubusercontent.com/redpwn/rctf/$RCTF_GIT_REF/docker-compose.yml" - docker-compose pull + docker compose pull info "Finished installation to ${RCTF_INSTALL_PATH}." @@ -117,12 +112,12 @@ do_install() { read -r result