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 #15993 from overleaf/csh-issue-15655-migrate-remaining-apps

Browse source 
Migrate remaining apps to AR

GitOrigin-RevId: de9406d42c2bb8ae6ef63c6ded1f796563b86713
This commit is contained in:
Christopher Hoskin 2023-11-29 08:56:02 +00:00 committed by Copybot
parent 0a484bb325
commit 329b2d375a
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/Makefile
View file

@ -495,7 +495,7 @@ format_in_docker:
# #
IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
IMAGE_REPO ?= gcr.io/overleaf-ops/$(PROJECT_NAME) IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME)
IMAGE_REPO_BRANCH ?= $(IMAGE_REPO):$(BRANCH_NAME) IMAGE_REPO_BRANCH ?= $(IMAGE_REPO):$(BRANCH_NAME)
IMAGE_REPO_MAIN ?= $(IMAGE_REPO):main IMAGE_REPO_MAIN ?= $(IMAGE_REPO):main
IMAGE_REPO_FINAL ?= $(IMAGE_REPO_BRANCH)-$(BUILD_NUMBER) IMAGE_REPO_FINAL ?= $(IMAGE_REPO_BRANCH)-$(BUILD_NUMBER)

2
services/web/docker-compose.ci.yml
View file

@ -94,7 +94,7 @@ services:
- 'ulimit -n 1024 && exec bash /run.sh' - 'ulimit -n 1024 && exec bash /run.sh'
saml: saml:
image: gcr.io/overleaf-ops/saml-test image: us-east1-docker.pkg.dev/overleaf-ops/ol-docker/saml-test
environment: environment:
SAML_BASE_URL_PATH: 'http://saml/simplesaml/' SAML_BASE_URL_PATH: 'http://saml/simplesaml/'
SAML_TEST_SP_ENTITY_ID: 'sharelatex-test-saml' SAML_TEST_SP_ENTITY_ID: 'sharelatex-test-saml'

2
services/web/docker-compose.yml
View file

@ -93,7 +93,7 @@ services:
- 'ulimit -n 1024 && exec bash /run.sh' - 'ulimit -n 1024 && exec bash /run.sh'
saml: saml:
image: gcr.io/overleaf-ops/saml-test image: us-east1-docker.pkg.dev/overleaf-ops/ol-docker/saml-test
environment: environment:
SAML_BASE_URL_PATH: 'http://saml/simplesaml/' SAML_BASE_URL_PATH: 'http://saml/simplesaml/'
SAML_TEST_SP_ENTITY_ID: 'sharelatex-test-saml' SAML_TEST_SP_ENTITY_ID: 'sharelatex-test-saml'