feat: upgrade to olive

Author: ghassanmas

README.rst

@@ -1,7 +1,7 @@
 Forum plugin for `Tutor <https://docs.tutor.overhang.io>`__
 ============================================================
 
-This plugin adds `discussion forums <https://github.com/edx/cs_comments_service>`__ to your `Open edX <https://open.edx.org/>`__ platform, such that students can have conversations about the courses they are following right in your LMS.
+This plugin adds `discussion forums <https://github.com/openedx/cs_comments_service>`__ to your `Open edX <https://openedx.org/>`__ platform, such that students can have conversations about the courses they are following right in your LMS.
 
 .. image:: https://overhang.io/static/catalog/screenshots/forum.png
   :alt: Forum screenshot

setup.py

@@ -40,7 +40,7 @@ def load_about():
     packages=find_packages(exclude=["tests*"]),
     include_package_data=True,
     python_requires=">=3.6",
-    install_requires=["tutor>=14.0.0,<15.0.0"],
+    install_requires=["tutor>=14.0.0,<16.0.0"], #[TEMP] Accept 14 version for testing purpose
     entry_points={
         "tutor.plugin.v1": [
             "forum = tutorforum.plugin"

tutorforum/__about__.py

@@ -1 +1 @@
-__version__ = "14.0.0"
+__version__ = "15.0.0"

tutorforum/templates/forum/build/forum/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/ruby:2.5.7-slim-stretch
+FROM docker.io/ruby:3.0.4-slim-bullseye
 MAINTAINER Overhang.IO <contact@overhang.io>
 
 ENV DEBIAN_FRONTEND=noninteractive
@@ -24,14 +24,16 @@ ENV PATH :${PATH}
 USER app
 
 # Install rake and bundler
-ENV PATH "/app/bin:/app/.gem/ruby/2.5.0/bin:$PATH"
+ENV PATH "/app/bin:/app/.gem/ruby/3.0.0/bin:$PATH"
 RUN gem install --user-install bundler --version 1.17.3
-RUN gem install --user-install rake --version 13.0.1
+RUN gem install --user-install rake --version 12.3.3
 
 # Install forum
-RUN git clone https://github.com/edx/cs_comments_service.git --branch {{ OPENEDX_COMMON_VERSION }} --depth 1 /app/cs_comments_service
+# [TEMP] Using kshitij/ruby3 branch until its merged and backported to Olive
+# Until as well this PR is merged: https://github.com/openedx/cs_comments_service/pull/395
+RUN git clone https://github.com/ghassanmas/cs_comments_service.git --branch timeout --depth 1 /app/cs_comments_service
 WORKDIR /app/cs_comments_service
-RUN bundle install --deployment
+RUN bundle install --deployment --gemfile=Gemfile3
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 
@@ -44,5 +46,6 @@ ENV MONGOID_AUTH_MECH ""
 ENV MONGODB_HOST "mongodb"
 ENV MONGODB_PORT "27017"
 ENV MONGODB_DATABASE "cs_comments_service"
+ENV BUNDLE_GEMFILE Gemfile3
 EXPOSE 4567
 CMD ./bin/unicorn -c config/unicorn_tcp.rb -I '.'

tutorforum/templates/forum/tasks/forum/init

@@ -1,2 +1,2 @@
-bundle exec rake search:initialize
-bundle exec rake search:rebuild_indices
+BUNDLE_GEMFILE=Gemfile3 bundle exec rake search:initialize
+BUNDLE_GEMFILE=Gemfile3 bundle exec rake search:rebuild_indices