File tree Expand file tree Collapse file tree 3 files changed +8
-13
lines changed
docs/internal/contributing Expand file tree Collapse file tree 3 files changed +8
-13
lines changed Original file line number Diff line number Diff line change @@ -130,23 +130,18 @@ jobs:
130
130
uses : actions/setup-go@v5
131
131
with :
132
132
go-version : 1.22.11
133
- - uses : actions/setup-node@v3
134
- with :
135
- node-version : lts/hydrogen
136
- cache : yarn
137
- - name : Login to GCR
133
+ - name : Login to Docker Hub
138
134
uses : docker/login-action@v2
139
135
with :
140
- registry : us.gcr.io
141
- username : _json_key
142
- password : ${{ secrets.GCR_JSON_KEY }}
143
- - name : Pyroscope Build & push multi-arch image
136
+ username : ${{ secrets.DOCKERHUB_USERNAME }}
137
+ password : ${{ secrets.DOCKERHUB_TOKEN }}
138
+ - name : Pyroscope Build & push multi-arch image # todo make it multi-arch
144
139
id : build-push
145
140
run : |
146
141
make docker-image/pyroscope/push docker-image/pyroscope/push-debug "BUILDX_ARGS=--cache-from=type=gha --cache-to=type=gha"
147
142
148
143
deploy-dev-001 :
149
- if : github.event_name == 'push' && github.repository == 'grafana/pyroscope'
144
+ if : github.event_name == 'push' && github.repository == 'grafana/pyroscope' && github.ref == 'refs/heads/main'
150
145
runs-on : ubuntu-latest
151
146
needs : [build-push]
152
147
steps :
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ GOPRIVATE=github.com/grafana/frostdb
19
19
20
20
# Boiler plate for building Docker containers.
21
21
# All this must go at top of file I'm afraid.
22
- IMAGE_PREFIX ?= us.gcr.io/kubernetes-dev /
22
+ IMAGE_PREFIX ?= grafana /
23
23
24
24
IMAGE_TAG ?= $(shell ./tools/image-tag)
25
25
GIT_REVISION := $(shell git rev-parse --short HEAD)
@@ -197,7 +197,7 @@ check/go/mod: go/mod
197
197
198
198
199
199
define docker_buildx
200
- docker buildx build $(1 ) --platform $(IMAGE_PLATFORM ) $(BUILDX_ARGS ) --build-arg=revision=$(GIT_REVISION ) -t $(IMAGE_PREFIX )$(shell basename $(@D ) ) :$(2 ) latest -t $( IMAGE_PREFIX )$( shell basename $( @D ) ) : $( 2 ) $(IMAGE_TAG ) -f cmd/$(shell basename $(@D ) ) /$(2 ) Dockerfile .
200
+ docker buildx build $(1 ) --platform $(IMAGE_PLATFORM ) $(BUILDX_ARGS ) --build-arg=revision=$(GIT_REVISION ) -t $(IMAGE_PREFIX )$(shell basename $(@D ) ) :$(2 )$(IMAGE_TAG ) -f cmd/$(shell basename $(@D ) ) /$(2 ) Dockerfile .
201
201
endef
202
202
203
203
define deploy
Original file line number Diff line number Diff line change @@ -81,7 +81,7 @@ replace `image: grafana/pyroscope` with the local tag name you got from docker-i
81
81
82
82
```
83
83
pyroscope:
84
- image: us.gcr.io/kubernetes-dev /pyroscope:main-470125e1-WIP
84
+ image: grafana /pyroscope:main-470125e1-WIP
85
85
ports:
86
86
- '4040:4040'
87
87
```
You can’t perform that action at this time.
0 commit comments