Created Simplified Docker Publish yml file (#30)

* Added simplified docker publish, added Google Analytics plugin

* Increased the version to 1.0.6

---------

Co-authored-by: Martin-Belton-gov <martin.belton@digital.education.gov.uk>

.github/workflows/dockerpublish.yml

@@ -79,12 +79,14 @@ jobs:
         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.5.zip"
+          wget "https://github.com/${{ github.repository }}/releases/download/main/dfe-azurecostbackend-datasource-1.0.6.zip"
+          wget "https://grafana.com/api/plugins/blackcowmoo-googleanalytics-datasource/versions/0.2.3/download"
           
       - name: Unzip Plugin
         run: |
           cd /home/runner/work/Grafana.Plugin.CostManagement/Grafana.Plugin.CostManagement/latest-cost-plugin
-          unzip -o dfe-azurecostbackend-datasource-1.0.5.zip
+          unzip -o dfe-azurecostbackend-datasource-1.0.6.zip
+          unzip -o blackcowmoo-googleanalytics-datasource-0.2.3.zip
           cd /home/runner/work/Grafana.Plugin.CostManagement/Grafana.Plugin.CostManagement/latest-cost-plugin/dfe-azurecostbackend-datasource
           pwd
           ls

.github/workflows/publish-ghcr.yml

@@ -0,0 +1,51 @@
+name: Build and Push Grafana Docker Image
+
+on:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+env:
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
+  RELEASE_TAG: ${{ github.event.release.tag_name }}
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Download Grafana Plugin
+      run: |
+        mkdir -p grafana-cost-plugin
+        cd grafana-cost-plugin
+        wget "https://github.com/DFE-Digital/Grafana.Plugin.CostManagement/releases/download/main/dfe-azurecostbackend-datasource-1.0.6.zip"
+        wget "https://grafana.com/api/plugins/blackcowmoo-googleanalytics-datasource/versions/0.2.3/download"
+        unzip -o dfe-azurecostbackend-datasource-1.0.6.zip
+        unzip -o blackcowmoo-googleanalytics-datasource-0.2.3.zip
+        cd ..
+
+    # Login against a Docker registry except on PR
+    # https://github.com/docker/login-action
+    - name: Log into registry ${{ env.REGISTRY }}
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build Docker Image
+      run: |
+        docker build -t ${{ env.REGISTRY }}/DFE-Digital/Grafana.Plugin.CostManagement-azurecost:latest       
+        docker push ${{ env.REGISTRY }}/DFE-Digital/Grafana.Plugin.CostManagement-azurecost:latest
+
+    env:
+      DOCKER_BUILDKIT: 1
+      DOCKER_CLI_ACI: 1
+

Dockerfile

@@ -8,6 +8,8 @@ USER root
 
 # 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
 
 # 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/dfe-azurecostbackend-datasource
+RUN chown -R 472:472 /var/lib/grafana/plugins/blackcowmoo-googleanalytics-datasource

dfe-azurecostbackend-datasource/package.json

@@ -1,7 +1,7 @@
 {
   "id": "1",
   "name": "azurecost-backend",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Azure cost backend",
   "scripts": {
     "build": "webpack -c ./.config/webpack/webpack.config.ts --env production",