Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modified Docker tag to be plugin version #34

Merged
merged 2 commits into from
Jan 23, 2024
Merged

Modified Docker tag to be plugin version #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1699d7c
Modified Build tag to plugin version
Jan 19, 2024
e831b37
Update tag on docker build & push action
Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/dockerpublish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ env:
# github.repository as <account>/<repo>
IMAGE_NAME: ${{ github.repository }}
RELEASE_TAG: ${{ github.event.release.tag_name }}
PLUGIN_VERSION: 1.0.7

jobs:
build:
Expand Down Expand Up @@ -79,13 +80,13 @@ 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.7.zip"
wget "https://github.com/${{ github.repository }}/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

- name: Unzip Plugin
run: |
cd /home/runner/work/Grafana.Plugin.CostManagement/Grafana.Plugin.CostManagement/latest-cost-plugin
unzip -o dfe-azurecostbackend-datasource-1.0.7.zip
unzip -o dfe-azurecostbackend-datasource-${{ env.PLUGIN_VERSION }}.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
Expand All @@ -101,7 +102,7 @@ jobs:
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ env.IMAGE_TAGS }}
tags: ghcr.io/dfe-digital/grafana.plugin.costmanagement:${{ env.PLUGIN_VERSION }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
VCSREF=${{ env.sha_short }}
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/publish-ghcr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ env:
# github.repository as <account>/<repo>
IMAGE_NAME: ${{ github.repository }}
RELEASE_TAG: ${{ github.event.release.tag_name }}
PLUGIN_VERSION: 1.0.7

jobs:
build-and-push:
Expand All @@ -24,10 +25,10 @@ jobs:
run: |
mkdir -p latest-cost-plugin
cd latest-cost-plugin
wget "https://github.com/DFE-Digital/Grafana.Plugin.CostManagement/releases/download/main/dfe-azurecostbackend-datasource-1.0.7.zip"
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
ls
unzip -o dfe-azurecostbackend-datasource-1.0.7.zip
unzip -o dfe-azurecostbackend-datasource-${{ env.PLUGIN_VERSION }}.zip
unzip -o blackcowmoo-googleanalytics-datasource-0.2.3.zip
cd ..

Expand All @@ -43,8 +44,8 @@ jobs:

- name: Build Docker Image
run: |
docker build . -t ghcr.io/dfe-digital/grafana-azurecostplugin-grafana:latest
docker push ghcr.io/dfe-digital/grafana-azurecostplugin-grafana:latest
docker build . -t ghcr.io/dfe-digital/grafana-azurecostplugin-grafana:${{ env.PLUGIN_VERSION }}
docker push ghcr.io/dfe-digital/grafana-azurecostplugin-grafana:${{ env.PLUGIN_VERSION }}

env:
DOCKER_BUILDKIT: 1
Expand Down
Loading