github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #16734 from overleaf/csh-issue-15655-ce

Browse source 
Move CE build to AR

GitOrigin-RevId: 3fe6ca5115547a2f85e8f0ef419eea4b8a8f34aa
This commit is contained in:
Christopher Hoskin 2024-01-26 09:47:02 +00:00 committed by Copybot
parent 12d38a3be9
commit df06b3562d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server-ce/Makefile
View file

@ -1,8 +1,8 @@
# Makefile # Makefile
export SHARELATEX_BASE_TAG := sharelatex/sharelatex-base export OVERLEAF_BASE_TAG := sharelatex/sharelatex-base
export SHARELATEX_TAG := sharelatex/sharelatex export OVERLEAF_TAG := sharelatex/sharelatex
export SHARELATEX_BASE_CACHE := $(shell echo $(SHARELATEX_BASE_TAG) | sed -E 's/(.+):.+/\1:latest/') export OVERLEAF_BASE_CACHE := $(shell echo $(OVERLEAF_BASE_TAG) | sed -E 's/(.+):.+/\1:latest/')
export MONOREPO_REVISION := $(shell git rev-parse HEAD) export MONOREPO_REVISION := $(shell git rev-parse HEAD)
MONOREPO_ROOT := ../ MONOREPO_ROOT := ../
@ -10,13 +10,13 @@ all: build-base build-community
build-base: build-base:
cp .dockerignore $(MONOREPO_ROOT) cp .dockerignore $(MONOREPO_ROOT)
docker pull $(SHARELATEX_BASE_CACHE) || echo "nothing cached yet" docker pull $(OVERLEAF_BASE_CACHE) || echo "nothing cached yet"
docker build -f Dockerfile-base --pull --cache-from $(SHARELATEX_BASE_CACHE) -t $(SHARELATEX_BASE_TAG) $(MONOREPO_ROOT) docker build -f Dockerfile-base --pull --cache-from $(OVERLEAF_BASE_CACHE) -t $(OVERLEAF_BASE_TAG) $(MONOREPO_ROOT)
build-community: build-community:
cp .dockerignore $(MONOREPO_ROOT) 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 .PHONY: all build-base build-community