|
|
@@ -4,12 +4,13 @@ MONOREPO_ROOT := ../
|
|
|
HERE=$(shell pwd)
|
|
|
export MONOREPO_REVISION := $(shell git rev-parse HEAD)
|
|
|
export BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
|
|
|
-export OVERLEAF_BASE_BRANCH ?= sharelatex/sharelatex-base:$(BRANCH_NAME)
|
|
|
+export BRANCH_NAME_TAG_SAFE ?= $(subst /,--,$(BRANCH_NAME))
|
|
|
+export OVERLEAF_BASE_BRANCH ?= sharelatex/sharelatex-base:$(BRANCH_NAME_TAG_SAFE)
|
|
|
export OVERLEAF_BASE_LATEST ?= sharelatex/sharelatex-base
|
|
|
-export OVERLEAF_BASE_TAG ?= sharelatex/sharelatex-base:$(BRANCH_NAME)-$(MONOREPO_REVISION)
|
|
|
-export OVERLEAF_BRANCH ?= sharelatex/sharelatex:$(BRANCH_NAME)
|
|
|
+export OVERLEAF_BASE_TAG ?= sharelatex/sharelatex-base:$(BRANCH_NAME_TAG_SAFE)-$(MONOREPO_REVISION)
|
|
|
+export OVERLEAF_BRANCH ?= sharelatex/sharelatex:$(BRANCH_NAME_TAG_SAFE)
|
|
|
export OVERLEAF_LATEST ?= sharelatex/sharelatex
|
|
|
-export OVERLEAF_TAG ?= sharelatex/sharelatex:$(BRANCH_NAME)-$(MONOREPO_REVISION)
|
|
|
+export OVERLEAF_TAG ?= sharelatex/sharelatex:$(BRANCH_NAME_TAG_SAFE)-$(MONOREPO_REVISION)
|
|
|
|
|
|
all: build-base build-community
|
|
|
|