diff --git a/.github/workflows/dockerpublish.yml b/.github/workflows/dockerpublish.yml index bec2a7d..e79a089 100644 --- a/.github/workflows/dockerpublish.yml +++ b/.github/workflows/dockerpublish.yml @@ -16,7 +16,7 @@ env: # github.repository as / IMAGE_NAME: ${{ github.repository }} RELEASE_TAG: ${{ github.event.release.tag_name }} - PLUGIN_VERSION: 1.0.11 + PLUGIN_VERSION: 1.0.12 jobs: build: @@ -82,12 +82,14 @@ jobs: cd /home/runner/work/Grafana.Plugin.CostManagement/Grafana.Plugin.CostManagement/latest-cost-plugin wget "https://github.com/DFE-Digital/Grafana.Plugin.CostManagement/releases/download/main/dfe-azurecostbackend-datasource-${{ env.PLUGIN_VERSION }}.zip" wget "https://grafana.com/api/plugins/blackcowmoo-googleanalytics-datasource/versions/0.2.3/download" -O blackcowmoo-googleanalytics-datasource-0.2.3.zip + wget "https://grafana.com/api/plugins/netsage-sankey-panel/versions/1.1.1/download" -O netsage-sankey-panel-1.1.1.zip - name: Unzip Plugin run: | cd /home/runner/work/Grafana.Plugin.CostManagement/Grafana.Plugin.CostManagement/latest-cost-plugin unzip -o dfe-azurecostbackend-datasource-${{ env.PLUGIN_VERSION }}.zip unzip -o blackcowmoo-googleanalytics-datasource-0.2.3.zip + unzip -o netsage-sankey-panel-1.1.1.zip cp /home/runner/work/childrens-social-care-cpd-grafana/childrens-social-care-cpd-grafana/grafana-files/grafana.ini . cd /home/runner/work/Grafana.Plugin.CostManagement/Grafana.Plugin.CostManagement/latest-cost-plugin/dfe-azurecostbackend-datasource pwd diff --git a/.github/workflows/publish-ghcr.yml b/.github/workflows/publish-ghcr.yml index 4df45f6..072aee1 100644 --- a/.github/workflows/publish-ghcr.yml +++ b/.github/workflows/publish-ghcr.yml @@ -11,7 +11,7 @@ env: # github.repository as / IMAGE_NAME: ${{ github.repository }} RELEASE_TAG: ${{ github.event.release.tag_name }} - PLUGIN_VERSION: 1.0.11 + PLUGIN_VERSION: 1.0.12 jobs: build-and-push: @@ -30,9 +30,11 @@ jobs: cd latest-cost-plugin wget "https://github.com/DFE-Digital/Grafana.Plugin.CostManagement/releases/download/main/dfe-azurecostbackend-datasource-${{ env.PLUGIN_VERSION }}.zip" wget "https://grafana.com/api/plugins/blackcowmoo-googleanalytics-datasource/versions/0.2.3/download" -O blackcowmoo-googleanalytics-datasource-0.2.3.zip + wget "https://grafana.com/api/plugins/netsage-sankey-panel/versions/1.1.1/download" -O netsage-sankey-panel-1.1.1.zip ls unzip -o dfe-azurecostbackend-datasource-${{ env.PLUGIN_VERSION }}.zip unzip -o blackcowmoo-googleanalytics-datasource-0.2.3.zip + unzip -o netsage-sankey-panel-1.1.1.zip cp /home/runner/work/childrens-social-care-cpd-grafana/childrens-social-care-cpd-grafana/grafana-files/grafana.ini . cd .. diff --git a/Dockerfile b/Dockerfile index 37c11c1..b2094b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,9 @@ COPY latest-cost-plugin/grafana.ini /etc/grafana/grafana.ini # Copy your plugin files into the Grafana plugins directory COPY latest-cost-plugin/dfe-azurecostbackend-datasource /var/lib/grafana/plugins/dfe-azurecostbackend-datasource COPY latest-cost-plugin/blackcowmoo-googleanalytics-datasource /var/lib/grafana/plugins/blackcowmoo-googleanalytics-datasource +COPY latest-cost-plugin/netsage-sankey-panel /var/lib/grafana/plugins/netsage-sankey-panel # Set permissions for the plugin directory RUN chown -R 472:472 /var/lib/grafana/plugins/dfe-azurecostbackend-datasource -RUN chown -R 472:472 /var/lib/grafana/plugins/blackcowmoo-googleanalytics-datasource \ No newline at end of file +RUN chown -R 472:472 /var/lib/grafana/plugins/blackcowmoo-googleanalytics-datasource +RUN chown -R 472:472 /var/lib/grafana/plugins/netsage-sankey-panel \ No newline at end of file