Merge ~gtrkiller/charm-k8s-discourse:master into charm-k8s-discourse:master

[Franco Luciano Forneron Buschiazzo]

Add discourse mermaid plugin support

Changes have been made so we can have a docker image type that also has mermaid on top of the existent markdown, saml and solved plugins.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Tom Haddon (mthaddon)]

One question inline about the inclusion of https://github.com/discourse/docker_manager.git

[Arturo Enrique Seijas Fernández (arturo-seijas)]

review: Needs Fixing

[Tom Haddon (mthaddon)]

One reply to Arturo's comment

[Arturo Enrique Seijas Fernández (arturo-seijas)]

IDK what happened to my comments so I'm adding them again

review: Needs Fixing

[Arturo Enrique Seijas Fernández (arturo-seijas)]

LGTM. Thnx

review: Approve

[Tom Haddon (mthaddon)]

Looks good, thanks.

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 1d8811cc1023208d0a2473c47aebe1f4dccb6783

diff --git a/image/Dockerfile b/image/Dockerfile
index 316ca9b..e918089 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -100,6 +100,22 @@ RUN cd ${CONTAINER_APP_ROOT}/app && su -s /bin/bash -c 'bin/bundle install' ${CO
 
 RUN echo "markdown-saml-solved image complete"
 
+FROM base-image AS markdown-mermaid-saml-solved
+
+RUN git clone https://github.com/discourse/discourse-saml.git ${CONTAINER_APP_ROOT}/app/plugins/discourse-saml
+# Remove additions incompatible with Discourse versions < 2.8
+RUN cd ${CONTAINER_APP_ROOT}/app/plugins/discourse-saml && git reset --hard 851f6cebe3fdd48019660b236a447abb6ddf9c89
+RUN git clone https://github.com/discourse/discourse-solved.git ${CONTAINER_APP_ROOT}/app/plugins/discourse-solved
+RUN git clone https://github.com/canonical-web-and-design/discourse-markdown-note.git ${CONTAINER_APP_ROOT}/app/plugins/discourse-markdown-note
+RUN git clone https://github.com/unfoldingWord-dev/discourse-mermaid.git ${CONTAINER_APP_ROOT}/app/plugins/discourse-mermaid
+RUN chown -R ${CONTAINER_APP_USERNAME}:${CONTAINER_APP_GROUP} ${CONTAINER_APP_ROOT}/app/plugins
+# Have to determine the gems needed and install them now, otherwise Discourse will
+# try to install them at runtime, which may not work due to network access issues.
+RUN cd ${CONTAINER_APP_ROOT}/app/plugins/discourse-saml && install -d -o ${CONTAINER_APP_USERNAME}  gems && echo 'source "https://rubygems.org"' > Gemfile ; grep -e ^gem plugin.rb >> Gemfile && su -s /bin/bash -c 'gem install bundler' ${CONTAINER_APP_USERNAME} && su -s /bin/bash -c '${CONTAINER_APP_ROOT}/app/bin/bundle install --gemfile=Gemfile --path=${CONTAINER_APP_ROOT}/app/plugins/discourse-saml/gems' ${CONTAINER_APP_USERNAME} && cd gems && ln -s ruby/* ./
+RUN cd ${CONTAINER_APP_ROOT}/app && su -s /bin/bash -c 'bin/bundle install' ${CONTAINER_APP_USERNAME}
+
+RUN echo "markdown-mermaid-saml-solved image complete"
+
 # Build the final image based on the IMAGE_TYPE specified.
 FROM ${IMAGE_TYPE} AS final
 # Redeclare IMAGE_TYPE variable so it can be referenced inside this build