unzip plugin into subdirectory (#23)

Co-authored-by: Martin-Belton-gov <martin.belton@digital.education.gov.uk>
DFE-Digital · Jan 17, 2024 · 2ff71c7 · 2ff71c7
1 parent 86aa434
commit 2ff71c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/dockerpublish.yml b/.github/workflows/dockerpublish.yml
@@ -77,13 +77,17 @@ jobs:
       - name: Fetch Plugin
         id: downloadfile  # Remember to give an ID if you need the output
         run: |
+          mkdir latest-cost-plugin
+          cd /home/runner/work/Grafana.Plugin.CostManagement/Grafana.Plugin.CostManagement/latest-cost-plugin
           wget "https://github.com/${{ github.repository }}/releases/download/main/dfe-azurecostbackend-datasource-1.0.3.zip"
           
       - name: Unzip Plugin
         run: |
+          cd /home/runner/work/Grafana.Plugin.CostManagement/Grafana.Plugin.CostManagement/latest-cost-plugin
+          unzip -o dfe-azurecostbackend-datasource-1.0.3.zip
           pwd
           ls
-          unzip -o dfe-azurecostbackend-datasource-1.0.3.zip
+          cd /home/runner/work/Grafana.Plugin.CostManagement/Grafana.Plugin.CostManagement
         
 
       # Build and push Docker image with Buildx (don't push on PR)

diff --git a/Dockerfile b/Dockerfile
@@ -7,7 +7,7 @@ FROM grafana/${grafana_image}:${grafana_version}
 USER root
 
 # Copy your plugin files into the Grafana plugins directory
-COPY dfe-azurecostbackend-datasource /var/lib/grafana/plugins/dfe-azurecostbackend-datasource
+COPY latest-cost-plugin/dfe-azurecostbackend-datasource /var/lib/grafana/plugins/dfe-azurecostbackend-datasource
 
 # Set permissions for the plugin directory
 RUN chown -R 472:472 /var/lib/grafana/plugins/dfe-azurecostbackend-datasource