Revert "Added Tideways"

This reverts commit 1c2279f.

Author: jmgasper

Dockerfile

@@ -4,18 +4,9 @@ ARG CI_DEPLOY_TOKEN
 ARG VANILLA_VERSION=3.3
 ARG ENV
 ARG BRANCH
-ARG TIDEWAYS_ENV
 
-# TIDEWAYS DAEMON
-ENV TIDEWAYS_SERVICE web
-ENV TIDEWAYS_ENVIRONMENT=$TIDEWAYS_ENV
-ENV TIDEWAYS_DAEMON_EXTRA="--env=$TIDEWAYS_ENVIRONMENT --debug"
-
-# VANILLA
-ENV VANILLA_ENV=$ENV
 ENV WEB_DOCUMENT_ROOT /vanillapp
 
-RUN echo "Tideways Daemon for '$TIDEWAYS_ENV' env"
 
 # Get the latest release of Vanilla Forums
 RUN wget https://github.com/vanilla/vanilla/releases/download/Vanilla_${VANILLA_VERSION}/vanilla-${VANILLA_VERSION}.zip
@@ -52,11 +43,22 @@ RUN git clone --branch mfe https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platfo
 #    then rm -R /tmp/forums-plugins/DebugPlugin; \
 #    fi
 
+# Copy the Filestack plugin
+RUN git clone https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-filestack-plugin /tmp/forums-plugins/Filestack
+
+#Copy the Groups plugin
+RUN git clone https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-groups-plugin /tmp/forums-plugins/Groups
+
+#Copy the SumoLogic plugin
+RUN git clone https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-sumologic-plugin /tmp/forums-plugins/Sumologic
+
+#Copy the TopcoderEditor plugin
+RUN git clone https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-topcoder-editor-plugin /tmp/forums-plugins/TopcoderEditor
 
 # Copy all plugins to the Vanilla plugins folder
 RUN cp -r /tmp/forums-plugins/. /vanillapp/plugins
 
-# Get the debug bar plugin
+#Get the debug bar plugin
 RUN if [ "$ENV" = "dev" ]; then \
     wget https://us.v-cdn.net/5018160/uploads/addons/KSBIPJYMC0F2.zip; \
     unzip KSBIPJYMC0F2.zip; \
@@ -78,24 +80,3 @@ COPY ./vanilla/. /vanillapp/.
 # Set permissions on config file
 RUN chown application:application /vanillapp/conf/config.php
 RUN chmod ug=rwx,o=rx /vanillapp/conf/config.php
-
-# Tideways
-RUN apt-get update && apt-get install -yq --no-install-recommends gnupg2;
-RUN echo 'deb https://packages.tideways.com/apt-packages-main any-version main' > /etc/apt/sources.list.d/tideways.list && \
-    curl -L -sS 'https://packages.tideways.com/key.gpg' | apt-key add - && \
-    apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -yq install tideways-php tideways-daemon && \
-    apt-get autoremove --assume-yes && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; \
-    echo 'extension=tideways.so\ntideways.enable_cli=0\ntideways.sample_rate=25' >> opt/docker/etc/php/php.ini;
-
-# Copy custom supervisor's configs and scripts
-# Netcat is used to connect to a memcached server
-RUN apt-get update && apt-get install -y netcat
-COPY ./services/*.conf /opt/docker/etc/supervisor.d/
-COPY ./services/*.sh /opt/docker/bin/service.d/
-
-# Ensure the service files are already executable
-RUN chmod +x /opt/docker/bin/service.d/flush_cache.sh
-RUN chmod +x /opt/docker/bin/service.d/tideways.sh

docker-compose.yml

@@ -1,18 +1,17 @@
-version: '3'
-services:
-  vanilla-forums:
-    image: vanilla-forums:latest
-    container_name: vanilla-forums
-    env_file:
-      - ./vanilla.env
-    build:
-      context: .
-      args:
-        - ENV='dev'
-        - VANILLA_VERSION=3.3
-        - CI_DEPLOY_TOKEN
-        - BRANCH
-        - TIDEWAYS_ENV
-    ports:
-      - 80:80
+version: '3'
+services:
+  vanilla-forums:
+    image: vanilla-forums:latest
+    container_name: vanilla-forums
+    env_file:
+      - ./vanilla.env
+    build:
+      context: .
+      args:
+        - ENV
+        - VANILLA_VERSION=3.3
+        - CI_DEPLOY_TOKEN
+        - BRANCH
+    ports:
+      - 80:80      
       - 443:443