Merge branch 'develop'

Author: jmgasper

Dockerfile

@@ -17,10 +17,10 @@ RUN rm -R /vanillapp/plugins/stubcontent
 # Clone the forum-plugins repository
 RUN git clone https://github.com/topcoder-platform/forums-plugins.git /tmp/forums-plugins
 
-# Remove SqlPlugin from PROD env
-RUN if [ "$ENV" = "prod" ]; \
-    then rm -R /tmp/forums-plugins/DebugPlugin; \
-    fi
+# Remove DebugPlugin from PROD env
+# RUN if [ "$ENV" = "prod" ]; \
+#    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