mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-14 20:40:17 -05:00
Merge pull request #16734 from overleaf/csh-issue-15655-ce
Move CE build to AR GitOrigin-RevId: 3fe6ca5115547a2f85e8f0ef419eea4b8a8f34aa
This commit is contained in:
parent
12d38a3be9
commit
df06b3562d
1 changed files with 6 additions and 6 deletions
|
@ -1,8 +1,8 @@
|
|||
# Makefile
|
||||
|
||||
export SHARELATEX_BASE_TAG := sharelatex/sharelatex-base
|
||||
export SHARELATEX_TAG := sharelatex/sharelatex
|
||||
export SHARELATEX_BASE_CACHE := $(shell echo $(SHARELATEX_BASE_TAG) | sed -E 's/(.+):.+/\1:latest/')
|
||||
export OVERLEAF_BASE_TAG := sharelatex/sharelatex-base
|
||||
export OVERLEAF_TAG := sharelatex/sharelatex
|
||||
export OVERLEAF_BASE_CACHE := $(shell echo $(OVERLEAF_BASE_TAG) | sed -E 's/(.+):.+/\1:latest/')
|
||||
export MONOREPO_REVISION := $(shell git rev-parse HEAD)
|
||||
MONOREPO_ROOT := ../
|
||||
|
||||
|
@ -10,13 +10,13 @@ all: build-base build-community
|
|||
|
||||
build-base:
|
||||
cp .dockerignore $(MONOREPO_ROOT)
|
||||
docker pull $(SHARELATEX_BASE_CACHE) || echo "nothing cached yet"
|
||||
docker build -f Dockerfile-base --pull --cache-from $(SHARELATEX_BASE_CACHE) -t $(SHARELATEX_BASE_TAG) $(MONOREPO_ROOT)
|
||||
docker pull $(OVERLEAF_BASE_CACHE) || echo "nothing cached yet"
|
||||
docker build -f Dockerfile-base --pull --cache-from $(OVERLEAF_BASE_CACHE) -t $(OVERLEAF_BASE_TAG) $(MONOREPO_ROOT)
|
||||
|
||||
|
||||
build-community:
|
||||
cp .dockerignore $(MONOREPO_ROOT)
|
||||
docker build --build-arg SHARELATEX_BASE_TAG --build-arg MONOREPO_REVISION -f Dockerfile -t $(SHARELATEX_TAG) $(MONOREPO_ROOT)
|
||||
docker build --build-arg OVERLEAF_BASE_TAG --build-arg MONOREPO_REVISION -f Dockerfile -t $(OVERLEAF_TAG) $(MONOREPO_ROOT)
|
||||
|
||||
|
||||
.PHONY: all build-base build-community
|
||||
|
|
Loading…
Reference in a new issue