Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .tekton/glo-grafana-globalhub-1-6-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ spec:
value: "true"
- name: prefetch-input
value: '[ {"type": "gomod", "path": "."} ]'
taskRunSpecs:
- pipelineTaskName: build-source-image
computeResources:
limits:
memory: 4Gi
pipelineRef:
resolver: git
params:
Expand Down
5 changes: 5 additions & 0 deletions .tekton/glo-grafana-globalhub-1-6-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ spec:
# Will mention the user in the slack message when the pipeline run failed; this is not required.
# Please make sure replace the value with component owner's slack member id.
value: "S09JCE3DF9N"
taskRunSpecs:
- pipelineTaskName: build-source-image
computeResources:
limits:
memory: 4Gi
pipelineRef:
resolver: git
params:
Expand Down
2 changes: 1 addition & 1 deletion Containerfile.konflux
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Golang build container
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23 AS builder
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25 AS builder

WORKDIR $GOPATH/src/github.com/grafana/grafana

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ocp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Golang build container
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23 AS builder
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25 AS builder

WORKDIR $GOPATH/src/github.com/grafana/grafana

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/grafana/grafana

go 1.23.2
go 1.25.3

// Override docker/docker to avoid:
// go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires
Expand Down
2 changes: 1 addition & 1 deletion go.work
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.23.2
go 1.25.3

use (
.
Expand Down