initial

.github/workflows/ci.yaml

@@ -0,0 +1,31 @@
+# Copyright 2024 Iguazio
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: CI
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Build
+      run: make build

.github/workflows/release.yaml

@@ -0,0 +1,39 @@
+# Copyright 2024 Iguazio
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: Release
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Login to GCR
+      uses: docker/login-action@v3
+      with:
+        registry: gcr.io
+        username: _json_key
+        password: ${{ secrets.GCR_IGUAZIO_JSON_KEY }}
+
+    - name: Build and push
+      run: make release
+      env:
+        GRAFANA_VERSION: ${{ github.event.release.tag_name }}

Dockerfile

@@ -1,4 +1,4 @@
-# Copyright 2019 Iguazio
+# Copyright 2024 Iguazio
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
 ARG GRAFANA_VERSION
 FROM grafana/grafana:$GRAFANA_VERSION as plugins_fetcher
 
@@ -38,4 +39,10 @@ RUN grafana-cli plugins install agenty-flowcharting-panel \
     && grafana-cli plugins install tdengine-datasource
 
 FROM grafana/grafana:$GRAFANA_VERSION
+
+# update OS packages
+USER root
+RUN apk upgrade --no-cache
+
+USER grafana
 COPY --from=plugins_fetcher /var/lib/grafana/plugins /opt/plugins

Makefile

@@ -1,4 +1,4 @@
-# Copyright 2019 Iguazio
+# Copyright 2024 Iguazio
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,9 +13,13 @@
 # limitations under the License.
 #
 
-GRAFANA_VERSION ?= 9.2.2
+GRAFANA_VERSION ?= 9.2.20
 IGUAZIO_REPOSITORY ?= gcr.io/iguazio/
 
+# if GRAFANA_VERSION has "-" then take the first part
+# we use the `-` for github releases to add the build number
+GRAFANA_VERSION := $(firstword $(subst -, ,$(GRAFANA_VERSION)))
+
 
 .PHONY: all
 all: build
@@ -25,11 +29,20 @@ all: build
 build: grafana-wplugins
 	@echo Done.
 
+.PHONY: push
+push: 
+	docker push $(IGUAZIO_REPOSITORY)grafana-wplugins:$(GRAFANA_VERSION)
+
+.PHONY: release
+release: build push
+	@echo Done.
+
 .PHONY: grafana-wplugins
 grafana-wplugins:
-	docker build \
+	docker \
+	build \
+	--platform linux/amd64 \
 	--file ./Dockerfile \
 	--tag $(IGUAZIO_REPOSITORY)grafana-wplugins:$(GRAFANA_VERSION) \
 	--build-arg GRAFANA_VERSION=$(GRAFANA_VERSION) \
 	.
-