Skip to content

C
configuration
Commit beb6f4d5 by Calen Pennington
Options

Make sure that commented-out FROM lines don't confuse docker.mk

parent 9ef3583f
Showing with 1 additions and 1 deletions
docker.mk
...@@ -52,7 +52,7 @@ $(docker_push)%: $(docker_pkg)% ...@@ -52,7 +52,7 @@ $(docker_push)%: $(docker_pkg)%
.build/%/Dockerfile.d: docker/build/%/Dockerfile Makefile .build/%/Dockerfile.d: docker/build/%/Dockerfile Makefile
@mkdir -p .build/$* @mkdir -p .build/$*
$(eval FROM=$(shell grep "FROM" $< | sed --regexp-extended "s/FROM //" | sed --regexp-extended "s/:/@/g")) $(eval FROM=$(shell grep "^\s*FROM" $< | sed --regexp-extended "s/FROM //" | sed --regexp-extended "s/:/@/g"))
$(eval EDXOPS_FROM=$(shell echo "$(FROM)" | sed --regexp-extended "s#edxops/([^@]+)(@.*)?#\1#")) $(eval EDXOPS_FROM=$(shell echo "$(FROM)" | sed --regexp-extended "s#edxops/([^@]+)(@.*)?#\1#"))
@echo "$(docker_build)$*: $(docker_pull)$(FROM)" > $@ @echo "$(docker_build)$*: $(docker_pull)$(FROM)" > $@
@if [ "$(EDXOPS_FROM)" != "$(FROM)" ]; then \ @if [ "$(EDXOPS_FROM)" != "$(FROM)" ]; then \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment