Merge ~mthaddon/charm-k8s-discourse/+git/charm-k8s-discourse:markdown-saml-solved into charm-k8s-discourse:master

Proposed by Tom Haddon
Status: Merged
Approved by: Jay Kuri
Approved revision: ae007b60ab3a8b45f29980a7b1793ebc94315ecd
Merged at revision: 6327c45c2baf24c803448196691bd3f0437f8ccc
Proposed branch: ~mthaddon/charm-k8s-discourse/+git/charm-k8s-discourse:markdown-saml-solved
Merge into: charm-k8s-discourse:master
Diff against target: 25 lines (+14/-0)
1 file modified
image/Dockerfile (+14/-0)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-is (community) continuous-integration Approve
Canonical IS Reviewers Pending
Discourse Charm Maintainers Pending
Review via email: mp+398194@code.launchpad.net

Commit message

Add markdown-saml-solved image type

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

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

Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

FAILED: Continuous integration, rev:ae007b60ab3a8b45f29980a7b1793ebc94315ecd
https://jenkins.canonical.com/is/job/lp-charm-k8s-discourse-ci/1/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/is/job/lp-charm-test/1/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/855/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-discourse-ci/1//rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

PASSED: Continuous integration, rev:ae007b60ab3a8b45f29980a7b1793ebc94315ecd
https://jenkins.canonical.com/is/job/lp-charm-k8s-discourse-ci/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/7/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/865/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-discourse-ci/2//rebuild

review: Approve (continuous-integration)
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 6327c45c2baf24c803448196691bd3f0437f8ccc

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/image/Dockerfile b/image/Dockerfile
2index 70beeac..94c4e1e 100644
3--- a/image/Dockerfile
4+++ b/image/Dockerfile
5@@ -82,6 +82,20 @@ RUN cd ${CONTAINER_APP_ROOT}/app && su -s /bin/bash -c 'bin/bundle install' ${CO
6
7 RUN echo "markdown-saml image complete"
8
9+# 'markdown-saml-solved' image type.
10+FROM base-image AS markdown-saml-solved
11+
12+RUN cd ${CONTAINER_APP_ROOT}/app/plugins && git clone https://github.com/discourse/discourse-saml.git
13+RUN cd ${CONTAINER_APP_ROOT}/app/plugins && git clone https://github.com/discourse/discourse-solved.git
14+RUN cd ${CONTAINER_APP_ROOT}/app/plugins && git clone https://github.com/canonical-web-and-design/discourse-markdown-note.git
15+RUN chown -R ${CONTAINER_APP_USERNAME}:${CONTAINER_APP_GROUP} ${CONTAINER_APP_ROOT}/app/plugins
16+# Have to determine the gems needed and install them now, otherwise Discourse will
17+# try to install them at runtime, which may not work due to network access issues.
18+RUN cd ${CONTAINER_APP_ROOT}/app/plugins/discourse-saml && mkdir -p gems && chown ${CONTAINER_APP_USERNAME} gems && echo 'source "https://rubygems.org"' > Gemfile ; grep -e ^gem plugin.rb >> Gemfile && 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/* ./
19+RUN cd ${CONTAINER_APP_ROOT}/app && su -s /bin/bash -c 'bin/bundle install' ${CONTAINER_APP_USERNAME}
20+
21+RUN echo "markdown-saml-solved image complete"
22+
23 # Build the final image based on the IMAGE_TYPE specified.
24 FROM ${IMAGE_TYPE} AS final
25 # Redeclare IMAGE_TYPE variable so it can be referenced inside this build

Subscribers

People subscribed via source and target branches