bundle plugins into image

plugins/Dockerfile

@@ -0,0 +1,8 @@
+FROM cgr.dev/chainguard/busybox:latest
+
+USER root
+
+ADD https://github.com/mattermost/mattermost-plugin-gitlab/releases/download/v1.9.1/com.github.manland.mattermost-plugin-gitlab-1.9.1.tar.gz /extra-plugins/
+ADD https://github.com/mattermost/mattermost-plugin-ai/releases/download/v0.8.2/mattermost-plugin-ai-v0.8.2-linux-amd64.tar.gz /extra-plugins/
+
+RUN chmod -R 777 /extra-plugins/*.tar.gz

values/common-values.yaml

@@ -33,28 +33,25 @@ mattermostApp:
     - name: mattermost-plugins-init
       emptyDir: {}
   extraInitContainers:
-    # Extra Container to donwload and install plugins
+    # Extra Container to install plugins
     - name: init-plugins-config
-      # TODO @marshall007: use same image as `initContainerImage` (see comment above)
-      image: cgr.dev/chainguard/busybox:latest
+      image: uds-package-mattermost/mattermost-extra-plugins:latest
       imagePullPolicy: Always
       command:
         - sh
         - "-c"
         - |
-          set -e -x
+          set -e
 
-          PLUGINS_TAR=$(ls /init-plugins)
+          PLUGINS_TAR=$(ls /extra-plugins)
 
-          echo $PLUGINS_TAR
-
-          sleep 1m
+          cd /mattermost/plugins/
 
           for plugin_tar in ${PLUGINS_TAR};
           do
-            plugin_tar="/init-plugins/${plugin_tar##*/}"
+            plugin_tar="/extra-plugins/${plugin_tar##*/}"
             echo "extracting $plugin_tar ..."
-            tar -xzvf $plugin_tar /mattermost/plugins/
+            tar -xf $plugin_tar
           done
 
           echo "finished loading plugins"
@@ -73,8 +70,6 @@ mattermostApp:
         mountPath: /mattermost/plugins/
       - name: mattermost-plugins-client
         mountPath: /mattermost/client/plugins/
-      - name: mattermost-plugins-init
-        mountPath: /init-plugins/
 
 serviceAccount:
   create: true

zarf.yaml

@@ -21,6 +21,17 @@ variables:
     description: "Database Password for Mattermost"
 
 components:
+  - name: mattermost-plugins
+    required: true
+    images:
+      - uds-package-mattermost/mattermost-extra-plugins:latest
+    actions:
+      onCreate:
+        before:
+          - dir: plugins
+            cmd: |
+              docker build . -t uds-package-mattermost/mattermost-extra-plugins:latest
+
   - name: mattermost
     required: true
     description: "Deploy Mattermost"
@@ -52,18 +63,3 @@ components:
     images:
       - registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal:9.4
       - registry1.dso.mil/ironbank/opensource/mattermost/mattermost:9.8.1
-
-  - name: mattermost-plugins
-    files:
-      - source: https://github.com/mattermost/mattermost-plugin-gitlab/releases/download/v1.9.1/com.github.manland.mattermost-plugin-gitlab-1.9.1.tar.gz
-        target: ./plugins/downloaded/com.github.manland.mattermost-plugin-gitlab.tar.gz
-      - source: https://github.com/mattermost/mattermost-plugin-ai/releases/download/v0.8.2/mattermost-plugin-ai-v0.8.2-linux-amd64.tar.gz
-        target: ./plugins/downloaded/mattermost-plugin-ai-linux-amd64.tar.gz
-    dataInjections:
-      # Injection in the data directory using the data-loader init container
-      - source: ./plugins/downloaded
-        target:
-          namespace: mattermost
-          selector: app.kubernetes.io/name=mattermost-enterprise-edition
-          container: init-plugins-config
-          path: /init-plugins