Add saml and prometheus

image/scripts/app_launch.sh

@@ -7,7 +7,7 @@ export UNICORN_SIDEKIQS=1
 
 cd "$CONTAINER_APP_ROOT/app" || exit
 
-# bin/bundle exec prometheus_exporter &
+bin/bundle exec prometheus_exporter &
 bin/unicorn -c config/unicorn.conf.rb &
 
 # If one of the processes exits, the other one will be killed so that the pod will be restarted by the failing probes

rockcraft.yaml

@@ -103,35 +103,17 @@ parts:
     source-depth: 1
     organize:
       "*": srv/discourse/app/plugins/discourse-mermaid/
-  # get-saml-plugin-source:
-  #   plugin: dump
-  #   source: https://github.com/discourse/discourse-saml.git
-  #   source-depth: 1
-  #   after:
-  #     - get-discourse
-  #   organize:
-  #     "*": srv/discourse/app/plugins/discourse-saml/
-  #   build-packages:
-  #     - ruby2.7
-  #     - ruby2.7-dev
-  #   override-stage: |
-  #     craftctl default
-
-  #     set -x
-  #     mkdir -p "${CRAFT_STAGE}/srv/discourse/app/.gem"
-
-  #     mkdir -p bin
-  #     gem install -n "bin" bundler
-  #     gem install bundler
-  #     bin/bundle config set --local path 'bundle'
-  #     grep ^gem $CRAFT_STAGE/srv/discourse/app/plugins/discourse-saml/plugin.rb >> ${CRAFT_STAGE}/srv/discourse/app/plugins/discourse-saml/Gemfile
-  #     bin/bundle install --gemfile="${CRAFT_STAGE}/srv/discourse/app/plugins/discourse-saml/Gemfile"
-  #     # echo "finished installing bundles"
-  #     # gem install macaddr -v 1.0.0 -i /srv/discourse/app/plugins/discourse-saml/gems/2.7.0 --no-document --ignore-dependencies --no-user-install
-
-  #     # cat plugin.rb
-  #     # grep ^gem plugin.rb >> ${CRAFT_STAGE}/srv/discourse/app/discourse-saml/Gemfile
-  #     # ${CRAFT_STAGE}/srv/discourse/app/bin/bundle install --gemfile=${CRAFT_STAGE}/srv/discourse/app/discourse-saml/Gemfile --path=${CRAFT_STAGE}/srv/discourse/app/discourse-saml/gems
+  get-saml-plugin-source:
+    plugin: dump
+    after:
+      - get-discourse
+    source: https://github.com/discourse/discourse-saml.git
+    source-depth: 1
+    override-build: |
+      craftctl default
+      grep -e ^gem plugin.rb >> Gemfile
+    organize:
+      "*": srv/discourse/app/plugins/discourse-saml/
   get-patches:
     plugin: dump
     source: image/patches
@@ -153,6 +135,7 @@ parts:
     plugin: nil
     after:
       - get-discourse
+      - get-saml-plugin-source
       - apply-patches
     build-packages:
       - gettext-base
@@ -176,28 +159,13 @@ parts:
       - ubuntu-dev-tools
       - zlib1g-dev
     override-build: |
-      set -x
       cd $CRAFT_STAGE/srv/discourse/app
-      mkdir -p bin
       gem install -n "bin" bundler
-      find / -name "Gemfile" || true
-      find / -name "gem" || true
-      find / -name "ruby2.7" || true
-      find / -name "bundle" || true
-      # echo "start installing bundles"
-      # bin/bundle config set --local path 'bundle'
-      grep mail Gemfile
+      echo "gem 'prometheus_exporter'" >> Gemfile
       bin/bundle install
-      bin/bundle info rake
-      bin/bundle info mail
-      # echo "finished installing bundles"
-      find / -name "rake" || true
-      find / -name "rakefile" || true
-      find / -name "Rakefile" || true
-      find / -name "Rakefile.rb" || true
-      find / -name "rakefile.rb" || true
-      # gem install macaddr -v 1.0.0 -i /srv/discourse/app/plugins/discourse-saml/gems/2.7.0 --no-document --ignore-dependencies --no-user-install
+      bin/bundle install --gemfile="plugins/discourse-saml/Gemfile"
     organize:
+      '/usr/local/bin/prometheus_exporter': usr/local/bin/
       '/var/lib/gems': var/lib/gems
       'srv/discourse/app/bin/*': srv/discourse/app/bin/
       'srv/discourse/app/Rakefile': srv/discourse/app/