Skip to content

Commit 09c1a34

Browse files
committed
fix: pass in github workspace
1 parent c699367 commit 09c1a34

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/build-on-demand.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ jobs:
4545
id: build-and-push-image
4646
run: |
4747
IMAGE_TIMESTAMP=$(date -u +%Y%m%dT%H%M%SZ)
48-
devbox run -- make publish-trivy-bundled-image -e TRIVY_VERSION=${{ inputs.trivyVersion }} -e TIMESTAMP=$IMAGE_TIMESTAMP
48+
devbox run -- make publish-trivy-bundled-image -e TRIVY_VERSION=${{ inputs.trivyVersion }} -e TIMESTAMP=$IMAGE_TIMESTAMP -e ROOT_DIR=${{ github.WORKSPACE }}
4949
echo "IMAGE_TIMESTAMP=$IMAGE_TIMESTAMP" >> $GITHUB_OUTPUT

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ifeq ($(origin TRIVY_VERSION), undefined)
22
$(error Required env-var TRIVY_VERSION has not been set, please set TRIVY_VERSION to the version matching the NKP/DKP release. See README for details)
33
endif
44

5-
ROOT_DIR := $(shell git rev-parse --show-toplevel)
5+
ROOT_DIR ?= $(shell git rev-parse --show-toplevel)
66
TIMESTAMP ?= $(shell date -u +%Y%m%dT%H%M%SZ )
77

88
REGISTRY ?= docker.io

0 commit comments

Comments
 (0)