Explorar el Código

Merge pull request #733 from overleaf/csh-issue-2578-add-base-tag-arg

Try making the base image tag specifiable
Christopher Hoskin hace 6 años
padre
commit
4faadc77f2
Se han modificado 2 ficheros con 3 adiciones y 2 borrados
  1. 2 1
      Dockerfile
  2. 1 1
      Makefile

+ 2 - 1
Dockerfile

@@ -2,7 +2,8 @@
 # Overleaf Community Edition (overleaf/overleaf)
 # Overleaf Community Edition (overleaf/overleaf)
 # ---------------------------------------------
 # ---------------------------------------------
 
 
-FROM sharelatex/sharelatex-base:latest
+ARG SHARELATEX_BASE_TAG=sharelatex/sharelatex-base:latest
+FROM $SHARELATEX_BASE_TAG
 
 
 ENV SHARELATEX_CONFIG /etc/sharelatex/settings.coffee
 ENV SHARELATEX_CONFIG /etc/sharelatex/settings.coffee
 
 

+ 1 - 1
Makefile

@@ -8,7 +8,7 @@ build-base:
 
 
 
 
 build-community:
 build-community:
-	docker build -f Dockerfile -t $(SHARELATEX_TAG) .
+	docker build --build-arg SHARELATEX_BASE_TAG=$(SHARELATEX_BASE_TAG) -f Dockerfile -t $(SHARELATEX_TAG) .
 
 
 
 
 PHONY: build-base build-community
 PHONY: build-base build-community