Merge pull request #463 from topcoder-platform/develop

v1.3

Author: jmgasper

.circleci/config.yml

@@ -29,7 +29,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}
+      - run: ./build.sh ${APPNAME} ${CI_DEPLOY_TOKEN} ${LOGICAL_ENV} ${BRANCH}
       #- save_cache: *save_cache_settings
       - deploy:
           name: Running MasterScript.
@@ -43,13 +43,15 @@ builddeploy_steps: &builddeploy_steps
 
 jobs:
   # Build & Deploy against development backend
+  # 'BRANCH' is used for plugins and other dependency repos
   "build-dev":
     <<: *defaults
     environment:
       DEPLOY_ENV: "DEV"
       LOGICAL_ENV: "dev"
       APPNAME: "vanilla-forums"
       CI_DEPLOY_TOKEN: $CI_DEPLOY_TOKEN
+      BRANCH: "develop"
     steps: *builddeploy_steps
 
   "build-prod":
@@ -59,6 +61,7 @@ jobs:
       LOGICAL_ENV: "prod"    
       APPNAME: "vanilla-forums"
       CI_DEPLOY_TOKEN: $CI_DEPLOY_TOKEN
+      BRANCH: "master"
     steps: *builddeploy_steps
 
 workflows:

Dockerfile

@@ -3,7 +3,9 @@ FROM webdevops/php-apache
 ARG CI_DEPLOY_TOKEN
 ARG VANILLA_VERSION=3.3
 ARG ENV
+ARG BRANCH
 
+ENV TIDEWAYS_SERVICE vanilla
 ENV WEB_DOCUMENT_ROOT /vanillapp
 
 # Get the latest release of Vanilla Forums
@@ -14,33 +16,42 @@ RUN chmod -R 777 /vanillapp
 
 # Delete the auto-enabled 'stubcontent' plugin which adds stub contents
 RUN rm -R /vanillapp/plugins/stubcontent
+
+RUN echo "'$BRANCH' branch will be used for dependency repos ..."
+
 # Clone the forum-plugins repository
-RUN git clone https://github.com/topcoder-platform/forums-plugins.git /tmp/forums-plugins
+RUN git clone --branch ${BRANCH} https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-plugins.git /tmp/forums-plugins
+
+# Copy the Filestack plugin
+RUN git clone --branch ${BRANCH} https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-filestack-plugin /tmp/forums-plugins/Filestack
+
+# Copy the Groups plugin
+RUN git clone --branch ${BRANCH} https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-groups-plugin /tmp/forums-plugins/Groups
+
+# Copy the SumoLogic plugin
+RUN git clone --branch ${BRANCH} https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-sumologic-plugin /tmp/forums-plugins/Sumologic
+
+# Copy the TopcoderEditor plugin
+RUN git clone --branch ${BRANCH} https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-topcoder-editor-plugin /tmp/forums-plugins/TopcoderEditor
+
+# Copy the forum-theme repository
+RUN git clone --branch ${BRANCH} https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-theme.git /vanillapp/themes/topcoder
 
 # 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
-
-#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
-RUN wget https://us.v-cdn.net/5018160/uploads/addons/KSBIPJYMC0F2.zip
-RUN unzip KSBIPJYMC0F2.zip
-RUN cp -r debugbar /vanillapp/plugins
+# Get the debug bar plugin
+RUN if [ "$ENV" = "dev" ]; then \
+    wget https://us.v-cdn.net/5018160/uploads/addons/KSBIPJYMC0F2.zip; \
+    unzip KSBIPJYMC0F2.zip; \
+    cp -r debugbar /vanillapp/plugins; \
+fi
 
 # Install Topcoder dependencies
 RUN composer install --working-dir /vanillapp/plugins/Topcoder
@@ -57,5 +68,17 @@ 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
-# Clone the forum-theme repository
-RUN git clone 'https://github.com/topcoder-platform/forums-theme.git' /vanillapp/themes/topcoder
+
+
+# Tideways
+RUN if [ "$ENV" = "dev" ]; then \
+    apt-get update && apt-get install -y gnupg2; \
+    echo 'deb https://packages.tideways.com/apt-packages debian 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 && \
+    apt-get autoremove --assume-yes && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; \
+    echo 'extension=tideways.so\ntideways.connection=tcp://tideways-daemon:9135\ntideways.enable_cli=0\n' >> opt/docker/etc/php/php.ini; \
+fi

build.sh

@@ -3,7 +3,12 @@ set -eo pipefail
 APP_NAME=$1
 CI_DEPLOY_TOKEN=$2
 ENV=$3
+BRANCH=$4
 UPDATE_CACHE=""
 echo "" > vanilla.env
-ENV=$ENV CI_DEPLOY_TOKEN=$CI_DEPLOY_TOKEN docker-compose -f docker-compose.yml build $APP_NAME
+if [ "$ENV" = "dev" ]; then
+  ENV=$ENV CI_DEPLOY_TOKEN=$CI_DEPLOY_TOKEN BRANCH=$BRANCH docker-compose -f docker-compose.yml -f docker-compose.dev.yml build $APP_NAME
+else
+  ENV=$ENV CI_DEPLOY_TOKEN=$CI_DEPLOY_TOKEN BRANCH=$BRANCH docker-compose -f docker-compose.yml build $APP_NAME
+fi
 #docker create --name app $APP_NAME:latest

config/vanilla/bootstrap.before.php

@@ -374,8 +374,7 @@ function watchButton($categoryID) {
      * @return bool return true if user has a permission
      */
    function checkGroupPermission($userID,$groupID, $categoryID = null , $permissionCategoryID = null , $permission = null, $fullMatch = true) {
-       $groupModel = new GroupModel();
-       return $groupModel->checkPermission($userID,$groupID, $categoryID,$permissionCategoryID , $permission, $fullMatch);
+       return GroupModel::checkPermission($userID,$groupID, $categoryID,$permissionCategoryID , $permission, $fullMatch);
    }
 }
 

config/vanilla/bootstrap.early.php

@@ -137,4 +137,19 @@
         Gdn::sql()->query($emptyAncestorQuery);
     }
 
+    // FIX: https://github.com/topcoder-platform/forums/issues/449
+    if(!Gdn::structure()->tableExists('GroupInvitation')) {
+        // Group  Invitation Table
+        Gdn::structure()->table('GroupInvitation')
+            ->primaryKey('GroupInvitationID')
+            ->column('GroupID', 'int', false, 'index')
+            ->column('Token', 'varchar(32)', false, 'unique')
+            ->column('InvitedByUserID', 'int', false, 'index')
+            ->column('InviteeUserID', 'int', false, 'index')
+            ->column('DateInserted', 'datetime', false, 'index')
+            ->column('Status', ['pending', 'accepted', 'declined', 'deleted'])
+            ->column('DateAccepted', 'datetime', true)
+            ->column('DateExpires', 'datetime')
+            ->set(false, false);
+    }
 }

config/vanilla/config.php

@@ -113,6 +113,8 @@
 $Configuration['Plugins']['Sumologic']['HttpSourceURL'] = '';
 $Configuration['Plugins']['Sumologic']['BatchSize'] = 10;
 
+// e.g. '+15 min',  '+1 day'
+$Configuration['Plugins']['Groups']['InviteExpiration']= '+20 min';
 
 // RichEditor
 $Configuration['RichEditor']['Quote']['Enable'] = true;

docker-compose.dev.yml

@@ -1,21 +1,11 @@
 version: '3'
 services:
-  mysql-local:
-    image: mysql
-    container_name: mysql-local
-    ports:
-      - 3306:3306
-    env_file:
-      - ./mysql.env
-    security_opt:
-      - seccomp:unconfined
-    command: --default-authentication-plugin=mysql_native_password
   vanilla-forums:
     links:
-      - mysql-local
-      - memcached-local
-  memcached-local:
-    image: memcached:1.5
-    container_name: memcached-local
+      - tideways-daemon
+  tideways-daemon:
+    container_name: tideways-daemon
+    build:
+      context: ./tideways-daemon
     ports:
-      - "11211:11211"
+      - 9135:9135

docker-compose.local.yml

@@ -0,0 +1,21 @@
+version: '3'
+services:
+  mysql-local:
+    image: mysql
+    container_name: mysql-local
+    ports:
+      - 3306:3306
+    env_file:
+      - ./mysql.env
+    security_opt:
+      - seccomp:unconfined
+    command: --default-authentication-plugin=mysql_native_password
+  vanilla-forums:
+    links:
+      - mysql-local
+      - memcached-local
+  memcached-local:
+    image: memcached:1.5
+    container_name: memcached-local
+    ports:
+      - "11211:11211"

docker-compose.yml

@@ -11,5 +11,6 @@ services:
         - ENV
         - VANILLA_VERSION=3.3
         - CI_DEPLOY_TOKEN
+        - BRANCH
     ports:
       - 80:80

tideways-daemon/Dockerfile

@@ -0,0 +1,20 @@
+FROM debian:stable-slim
+
+ARG TIDEWAYS_ENVIRONMENT_DEFAULT=production
+ENV TIDEWAYS_ENVIRONMENT=$TIDEWAYS_ENVIRONMENT_DEFAULT
+
+RUN useradd --system tideways
+RUN apt-get update && apt-get install -yq --no-install-recommends gnupg2 curl sudo ca-certificates
+
+RUN echo 'deb https://packages.tideways.com/apt-packages debian main' > /etc/apt/sources.list.d/tideways.list && \
+    curl -L -sS 'https://packages.tideways.com/key.gpg' | apt-key add -
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -yq tideways-daemon && \
+    apt-get autoremove --assume-yes && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+EXPOSE 9135
+
+USER tideways
+
+ENTRYPOINT ["tideways-daemon","--hostname=tideways-daemon","--address=0.0.0.0:9135"]