armory plugin

OpsMx · Nov 6, 2023 · 98b888e · 98b888e
1 parent e402884
commit 98b888e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/.github/workflows/fiat-oes.yml b/.github/workflows/fiat-oes.yml
@@ -51,6 +51,10 @@ jobs:
       - name: dockerBuildpush
         uses: docker/build-push-action@v2
         with:
+          build-args: |
+            CUSTOMPLUGIN_RELEASEORG=opsmx
+            CUSTOMPLUGIN_RELEASEREPO=armory-observability-plugin
+            CUSTOMPLUGIN_RELEASEVERSION=v1.0.1
           context: .
           file: docker/ubi8/Dockerfile-fips
           push: true
@@ -59,6 +63,10 @@ jobs:
       - name: dockerBuildpushjaeger
         uses: docker/build-push-action@v2
         with:
+          build-args: |
+            CUSTOMPLUGIN_RELEASEORG=opsmx
+            CUSTOMPLUGIN_RELEASEREPO=armory-observability-plugin
+            CUSTOMPLUGIN_RELEASEVERSION=v1.0.1
           context: .
           file: docker/ubi8/Dockerfile-dev
           push: true

diff --git a/docker/ubi8/Dockerfile-dev b/docker/ubi8/Dockerfile-dev
@@ -39,10 +39,18 @@ RUN adduser spinnaker
 RUN mkdir -p /opt/fiat/plugins
 
 #custom plugin zip files adding
-#ARG CUSTOMPLUGIN_RELEASEVERSION
-#ENV CUSTOMPLUGIN_RELEASEVERSION=$CUSTOMPLUGIN_RELEASEVERSION
-RUN wget -O Armory.ObservabilityPlugin-armory-observability-plugin-v1.4.2-SNAPSHOT.zip -c https://github.com/OpsMx/armory-observability-plugin/releases/download/v1.0.0/armory-observability-plugin-v1.4.2-SNAPSHOT.zip -P /opt/fiat/plugins 
-RUN mv Armory.ObservabilityPlugin-armory-observability-plugin-v1.4.2-SNAPSHOT.zip /opt/fiat/plugins/
+ARG CUSTOMPLUGIN_RELEASEORG
+ENV CUSTOMPLUGIN_RELEASEORG=$CUSTOMPLUGIN_RELEASEORG
+
+ARG CUSTOMPLUGIN_RELEASEREPO
+ENV CUSTOMPLUGIN_RELEASEREPO=$CUSTOMPLUGIN_RELEASEREPO
+
+ARG CUSTOMPLUGIN_RELEASEVERSION
+ENV CUSTOMPLUGIN_RELEASEVERSION=$CUSTOMPLUGIN_RELEASEVERSION
+
+RUN wget -O Armory.armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}-SNAPSHOT.zip -c https://github.com/${CUSTOMPLUGIN_RELEASEORG}/${CUSTOMPLUGIN_RELEASEREPO}/releases/download/${CUSTOMPLUGIN_RELEASEVERSION}/armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}.zip -P /opt/fiat/plugins 
+
+RUN mv Armory.armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}-SNAPSHOT.zip /opt/fiat/plugins/
 
 
 RUN chmod -R 777 /opt/fiat/plugins/

diff --git a/docker/ubi8/Dockerfile-fips b/docker/ubi8/Dockerfile-fips
@@ -37,11 +37,18 @@ RUN adduser spinnaker
 RUN mkdir -p /opt/fiat/plugins
 
 #custom plugin zip files adding
-#ARG CUSTOMPLUGIN_RELEASEVERSION
-#ENV CUSTOMPLUGIN_RELEASEVERSION=$CUSTOMPLUGIN_RELEASEVERSION
-RUN wget -O Armory.ObservabilityPlugin-armory-observability-plugin-v1.4.2-SNAPSHOT.zip -c https://github.com/OpsMx/armory-observability-plugin/releases/download/v1.0.0/armory-observability-plugin-v1.4.2-SNAPSHOT.zip -P /opt/fiat/plugins 
-RUN mv Armory.ObservabilityPlugin-armory-observability-plugin-v1.4.2-SNAPSHOT.zip /opt/fiat/plugins/
+ARG CUSTOMPLUGIN_RELEASEORG
+ENV CUSTOMPLUGIN_RELEASEORG=$CUSTOMPLUGIN_RELEASEORG
 
+ARG CUSTOMPLUGIN_RELEASEREPO
+ENV CUSTOMPLUGIN_RELEASEREPO=$CUSTOMPLUGIN_RELEASEREPO
+
+ARG CUSTOMPLUGIN_RELEASEVERSION
+ENV CUSTOMPLUGIN_RELEASEVERSION=$CUSTOMPLUGIN_RELEASEVERSION
+
+RUN wget -O Armory.armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}-SNAPSHOT.zip -c https://github.com/${CUSTOMPLUGIN_RELEASEORG}/${CUSTOMPLUGIN_RELEASEREPO}/releases/download/${CUSTOMPLUGIN_RELEASEVERSION}/armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}.zip -P /opt/fiat/plugins 
+
+RUN mv Armory.armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}-SNAPSHOT.zip /opt/fiat/plugins/
 
 RUN chmod -R 777 /opt/fiat/plugins/
 RUN chown -R spinnaker:spinnaker /opt/