Skip to content

Commit 5095296

Browse files
committed
Fix GCP Marketplace image requirements
- Use DOCKER_BUILDKIT=0 to produce Docker manifest v2 format instead of OCI - Add parca-agent Dockerfile with GCP Marketplace annotation - Fix image path in schema and manifest template to use named image reference
1 parent 3e16152 commit 5095296

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

deploy/Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,11 @@ manifests: vendor $(shell find . -name 'vendor' -prune -o -name '*.libsonnet' -p
1515
fmt:
1616
find . -name 'vendor' -prune -o -name '*.libsonnet' -print -o -name '*.jsonnet' -print | \
1717
xargs -n 1 -- $(JSONNET_FMT) -i
18+
19+
.PHONY: deployer
20+
deployer:
21+
DOCKER_BUILDKIT=0 docker build -t us-docker.pkg.dev/polar-signals-public/parca-agent/deployer:0.44.0 -t us-docker.pkg.dev/polar-signals-public/parca-agent/deployer:0.44 -f gcp/deployer/Dockerfile gcp
22+
23+
.PHONY: parca-agent
24+
parca-agent:
25+
DOCKER_BUILDKIT=0 docker build -t us-docker.pkg.dev/polar-signals-public/parca-agent/parca-agent:v0.44.0 -f gcp/parca-agent/Dockerfile gcp/parca-agent

deploy/gcp/deployer/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
FROM gcr.io/cloud-marketplace-tools/k8s/deployer_envsubst/onbuild
22

3-
#COPY /tmp/$CHART_NAME.tar.gz /data/chart/
4-
#COPY /tmp/test/$CHART_NAME.tar.gz /data-test/chart/
5-
#COPY /tmp/apptest/schema.yaml /data-test/
6-
COPY schema.yaml /data/

deploy/gcp/manifest/manifest.yaml.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ spec:
124124
valueFrom:
125125
fieldRef:
126126
fieldPath: spec.nodeName
127-
image: $imageRepo:$imageTag
127+
image: $imageRepo/parca-agent:$imageTag
128128
name: parca-agent
129129
ports:
130130
- containerPort: 7071

deploy/gcp/parca-agent/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM ghcr.io/parca-dev/parca-agent:v0.44.0
2+
3+
LABEL com.googleapis.cloudmarketplace.product.service.name="services/parca-agent"

deploy/gcp/schema.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ x-google-marketplace:
1313
- Feature
1414
recommended: true
1515
images:
16-
'':
16+
'parca-agent':
1717
properties:
1818
imageRepo:
1919
type: REPO_WITH_REGISTRY

0 commit comments

Comments
 (0)