Skip to content

Commit 5d97c29

Browse files
committed
Fix registry URL regexp
Sanity checking was a little too strict. This is better and should allow for default config of gitlab.com, which doesn't include port numbers.
1 parent 837afb4 commit 5d97c29

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

makefile-sanity.include

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ifdef DOCKER_REGISTRY
2-
ifneq ($(DOCKER_REGISTRY), $(shell echo $(DOCKER_REGISTRY) | sed -ne '/^[A-Za-z0-9.\/\-]\+:[0-9]\+\([A-Za-z0-9.\/-]\+\)\?$$/p'))
3-
$(error Bad docker registry URL. Should follow format registry.example.com:1234 or registry.example.com:1234/foo)
2+
ifneq ($(DOCKER_REGISTRY), $(shell echo $(DOCKER_REGISTRY) | sed -ne '/^[A-Za-z0-9.\/\-]\+\(:[0-9]\+\)\?\([A-Za-z0-9.\/-]\+\)\?$$/p'))
3+
$(error Bad docker registry URL. Should follow format registry.example.com/foo, registry.example.com:1234 or registry.example.com:1234/foo)
44
endif
55
REGISTRY=$(DOCKER_REGISTRY)/
66
else

0 commit comments

Comments
 (0)