Преглед изворни кода

Merge pull request #27652 from overleaf/jpa-latest-to-main

[server-pro] run-e2e-tests: tag local images as "main"

GitOrigin-RevId: b32522bd278a44a551898cab32b8a698b04ab8a6
Brian Gough пре 1 година
родитељ
комит
7ca70eb563
2 измењених фајлова са 4 додато и 3 уклоњено
  1. 2 1
      server-ce/test/Makefile
  2. 2 2
      server-ce/test/docker-compose.yml

+ 2 - 1
server-ce/test/Makefile

@@ -8,7 +8,8 @@ export PWD = $(shell pwd)
 
 
 export TEX_LIVE_DOCKER_IMAGE ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/texlive-full:2023.1
 export TEX_LIVE_DOCKER_IMAGE ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/texlive-full:2023.1
 export ALL_TEX_LIVE_DOCKER_IMAGES ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/texlive-full:2023.1,us-east1-docker.pkg.dev/overleaf-ops/ol-docker/texlive-full:2022.1
 export ALL_TEX_LIVE_DOCKER_IMAGES ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/texlive-full:2023.1,us-east1-docker.pkg.dev/overleaf-ops/ol-docker/texlive-full:2022.1
-export IMAGE_TAG_PRO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/pro:latest
+export IMAGE_TAG_CE ?= sharelatex/sharelatex:main
+export IMAGE_TAG_PRO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/pro:main
 export CYPRESS_SHARD ?=
 export CYPRESS_SHARD ?=
 export COMPOSE_PROJECT_NAME ?= test
 export COMPOSE_PROJECT_NAME ?= test
 export DOCKER_USER := $(shell id -u):$(shell id -g)
 export DOCKER_USER := $(shell id -u):$(shell id -g)

+ 2 - 2
server-ce/test/docker-compose.yml

@@ -108,8 +108,8 @@ services:
       COMPOSE_PROJECT_NAME:
       COMPOSE_PROJECT_NAME:
       TEX_LIVE_DOCKER_IMAGE:
       TEX_LIVE_DOCKER_IMAGE:
       ALL_TEX_LIVE_DOCKER_IMAGES:
       ALL_TEX_LIVE_DOCKER_IMAGES:
-      IMAGE_TAG_CE: ${IMAGE_TAG_CE:-sharelatex/sharelatex:latest}
-      IMAGE_TAG_PRO: ${IMAGE_TAG_PRO:-quay.io/sharelatex/sharelatex-pro:latest}
+      IMAGE_TAG_CE:
+      IMAGE_TAG_PRO:
     healthcheck:
     healthcheck:
       test: curl --fail http://localhost/status
       test: curl --fail http://localhost/status
       interval: 3s
       interval: 3s