agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-05-23 17:19:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28277 from overleaf/gs-jenkins-image-tags

Browse Source 
Make Jenkins web builds follow Cloud Deploy's image tagging scheme

GitOrigin-RevId: 69cfb34f8ca3a0b64f2a55c31939d58aad268d97
This commit is contained in:
Gernot Schulz
2025-09-04 12:52:58 +02:00
committed by Copybot
parent f3907f3931
commit e2726da98d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/web/Jenkinsfile vendored
View File

@@ -37,7 +37,7 @@ pipeline {
AR_REPO_LOCATION = 'us-east1'
AR_URL = 'us-east1-docker.pkg.dev/overleaf-ops/ol-docker'
DOCKER_COMPOSE_FLAGS = '-f docker-compose.ci.yml'
BRANCH_NAME = "${GIT_BRANCH.replace('origin/', '')}"
BRANCH_NAME = "${env.CHANGE_BRANCH ? env.CHANGE_BRANCH : env.BRANCH_NAME}"
COMMIT_SHA = "${GIT_COMMIT}"
SHORT_SHA = "${GIT_COMMIT.take(7)}"
CDN_STAG = "gs://ol-stag-web-assets-1"

2
services/web/Makefile
View File

@@ -510,7 +510,7 @@ IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME)
IMAGE_REPO_BRANCH ?= $(IMAGE_REPO):$(BRANCH_NAME)
IMAGE_REPO_MAIN ?= $(IMAGE_REPO):main
IMAGE_REPO_FINAL ?= $(IMAGE_REPO_BRANCH)-$(BUILD_NUMBER)
IMAGE_REPO_FINAL ?= $(IMAGE_REPO_BRANCH)-$(SHORT_SHA)_$(BUILD_NUMBER)
export SENTRY_RELEASE ?= ${COMMIT_SHA}