Skip to content

Commit 10f2259

Browse files
author
dwc0011
committed
Add optional ghcr.io/ to the version grep
1 parent 01b4d11 commit 10f2259

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

bootstrap/Makefile.bootstrap

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ export PWD = $(shell pwd)
33
export TARDIGRADE_CI_ORG ?= plus3it
44
export TARDIGRADE_CI_PROJECT ?= tardigrade-ci
55
export TARDIGRADE_CI_DOCKERFILE ?= Dockerfile
6-
export TARDIGRADE_CI_BRANCH ?= $(or $(shell grep 'FROM $(TARDIGRADE_CI_ORG)/$(TARDIGRADE_CI_PROJECT)' $(TARDIGRADE_CI_DOCKERFILE) 2> /dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' 2> /dev/null),master)
7-
6+
export TARDIGRADE_CI_BRANCH ?= $(or $(shell grep -E 'FROM (ghcr.io/)?$(TARDIGRADE_CI_ORG)/$(TARDIGRADE_CI_PROJECT)' $(TARDIGRADE_CI_DOCKERFILE) 2> /dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' 2> /dev/null),master)
87
TARDIGRADE_CI_PATH ?= $(shell until [ -d "$(TARDIGRADE_CI_PROJECT)" ] || [ "`pwd`" == '/' ]; do cd ..; done; pwd)/$(TARDIGRADE_CI_PROJECT)
98
TARDIGRADE_CI_PATH_LOCAL := $(PWD)/$(TARDIGRADE_CI_PROJECT)
109
TARDIGRADE_CI_BOOTSTRAP := $(PWD)/.$(TARDIGRADE_CI_PROJECT)

0 commit comments

Comments
 (0)