Skip to content
This repository was archived by the owner on Jul 19, 2023. It is now read-only.

Commit 0850dce

Browse files
authored
Merge pull request #363 from grafana/20221025_depend-image-build-on-go-build
Depend on go/bin when building the docker image
2 parents b9491b7 + 27b765e commit 0850dce

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

.github/workflows/test.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,6 @@ jobs:
123123
uses: actions/setup-go@v2
124124
with:
125125
go-version: 1.18.7
126-
- name: build binaries
127-
run: make go/mod go/bin
128126
- name: Build image Phlare
129127
run: make docker-image/phlare/build "BUILDX_ARGS=--cache-from=type=gha --cache-to=type=gha"
130128

@@ -163,8 +161,6 @@ jobs:
163161
uses: actions/setup-go@v2
164162
with:
165163
go-version: 1.18.7
166-
- name: build binaries
167-
run: make go/mod go/bin
168164
- name: Login to GCR
169165
uses: docker/login-action@v2
170166
with:

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,11 @@ define deploy
156156
endef
157157

158158
.PHONY: docker-image/phlare/build
159-
docker-image/phlare/build:
159+
docker-image/phlare/build: go/bin
160160
$(call docker_buildx,--load)
161161

162162
.PHONY: docker-image/phlare/push
163-
docker-image/phlare/push:
163+
docker-image/phlare/push: go/bin
164164
$(call docker_buildx,--push)
165165

166166
.PHONY: docker-image/grafana/build

0 commit comments

Comments
 (0)