Revert "Issues-519: Deploy Tideways deamon in Vanilla container"

This reverts commit 5d37c4d.

Author: jmgasper

.circleci/config.yml

@@ -31,7 +31,7 @@ builddeploy_steps: &builddeploy_steps
       - run: *install_dependency
       - run: *install_deploysuite
       #- restore_cache: *restore_cache_settings_for_build
-      - run: ./build.sh ${APPNAME} ${CI_DEPLOY_TOKEN} ${LOGICAL_ENV} ${BRANCH} ${TIDEWAYS_ENV}
+      - run: ./build.sh ${APPNAME} ${CI_DEPLOY_TOKEN} ${LOGICAL_ENV} ${BRANCH} ${TIDEWAYS_ENVIRONMENT}
       #- save_cache: *save_cache_settings
       - deploy:
           name: Running MasterScript.

Dockerfile

@@ -7,7 +7,6 @@ ARG BRANCH
 
 ENV WEB_DOCUMENT_ROOT /vanillapp
 
-
 # Get the latest release of Vanilla Forums
 RUN wget https://github.com/vanilla/vanilla/releases/download/Vanilla_${VANILLA_VERSION}/vanilla-${VANILLA_VERSION}.zip
 RUN unzip vanilla-${VANILLA_VERSION}.zip -d /tmp

build.sh

@@ -7,5 +7,5 @@ BRANCH=$4
 TIDEWAYS_ENV=$5
 UPDATE_CACHE=""
 echo "" > vanilla.env
-ENV=$ENV CI_DEPLOY_TOKEN=$CI_DEPLOY_TOKEN BRANCH=$BRANCH TIDEWAYS_ENV=$TIDEWAYS_ENV docker-compose -f docker-compose.yml build $APP_NAME
+ENV=$ENV CI_DEPLOY_TOKEN=$CI_DEPLOY_TOKEN BRANCH=$BRANCH TIDEWAYS_ENV=$TIDEWAYS_ENV docker-compose -f docker-compose.yml -f docker-compose.dev.yml build $APP_NAME
 #docker create --name app $APP_NAME:latest