Startsida Utforska Hjälp
Registrera dig Logga in
creylopez
/
overleaf
1
0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 0 Wiki
Bläddra i källkod

Merge pull request #33658 from overleaf/em-fix-docker-tag-length

build: truncate branch names to 96 chars for Docker image tags
GitOrigin-RevId: 9db313244e78a6d4e0aa5d8c08d25f1aac83318b
Eric Mc Sween 3 månader sedan
förälder
0c8e93bb33
incheckning
529c332159
12 ändrade filer med 12 tillägg och 12 borttagningar
Unifierad Vy Visa Diff Statistik
  1. 1 1
      services/chat/Makefile
  2. 1 1
      services/clsi/Makefile
  3. 1 1
      services/contacts/Makefile
  4. 1 1
      services/docstore/Makefile
  5. 1 1
      services/document-updater/Makefile
  6. 1 1
      services/filestore/Makefile
  7. 1 1
      services/git-bridge/Makefile
  8. 1 1
      services/history-v1/Makefile
  9. 1 1
      services/notifications/Makefile
  10. 1 1
      services/project-history/Makefile
  11. 1 1
      services/real-time/Makefile
  12. 1 1
      services/web/Makefile

+ 1 - 1
services/chat/Makefile
Visa fil 

@@ -4,7 +4,7 @@
 
 
 
 BUILD_NUMBER ?= local
 
 BUILD_NUMBER ?= local
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
-BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g')
 
+BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g' | cut -c1-96)
 
 PROJECT_NAME = chat
 
 PROJECT_NAME = chat
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 HERE=$(shell pwd)
 
 HERE=$(shell pwd)

+ 1 - 1
services/clsi/Makefile
Visa fil 

@@ -4,7 +4,7 @@
 
 
 
 BUILD_NUMBER ?= local
 
 BUILD_NUMBER ?= local
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
-BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g')
 
+BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g' | cut -c1-96)
 
 PROJECT_NAME = clsi
 
 PROJECT_NAME = clsi
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 HERE=$(shell pwd)
 
 HERE=$(shell pwd)

+ 1 - 1
services/contacts/Makefile
Visa fil 

@@ -4,7 +4,7 @@
 
 
 
 BUILD_NUMBER ?= local
 
 BUILD_NUMBER ?= local
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
-BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g')
 
+BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g' | cut -c1-96)
 
 PROJECT_NAME = contacts
 
 PROJECT_NAME = contacts
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 HERE=$(shell pwd)
 
 HERE=$(shell pwd)

+ 1 - 1
services/docstore/Makefile
Visa fil 

@@ -4,7 +4,7 @@
 
 
 
 BUILD_NUMBER ?= local
 
 BUILD_NUMBER ?= local
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
-BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g')
 
+BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g' | cut -c1-96)
 
 PROJECT_NAME = docstore
 
 PROJECT_NAME = docstore
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 HERE=$(shell pwd)
 
 HERE=$(shell pwd)

+ 1 - 1
services/document-updater/Makefile
Visa fil 

@@ -4,7 +4,7 @@
 
 
 
 BUILD_NUMBER ?= local
 
 BUILD_NUMBER ?= local
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
-BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g')
 
+BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g' | cut -c1-96)
 
 PROJECT_NAME = document-updater
 
 PROJECT_NAME = document-updater
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 HERE=$(shell pwd)
 
 HERE=$(shell pwd)

+ 1 - 1
services/filestore/Makefile
Visa fil 

@@ -4,7 +4,7 @@
 
 
 
 BUILD_NUMBER ?= local
 
 BUILD_NUMBER ?= local
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
-BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g')
 
+BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g' | cut -c1-96)
 
 PROJECT_NAME = filestore
 
 PROJECT_NAME = filestore
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 HERE=$(shell pwd)
 
 HERE=$(shell pwd)

+ 1 - 1
services/git-bridge/Makefile
Visa fil 

@@ -5,7 +5,7 @@ MVN_TARGET := target/writelatex-git-bridge-1.0-SNAPSHOT-jar-with-dependencies.ja
 
 
 
 export BUILD_NUMBER ?= local
 
 export BUILD_NUMBER ?= local
 
 export BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
 export BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
-BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g')
 
+BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g' | cut -c1-96)
 
 export COMMIT_SHA ?= $(shell git rev-parse HEAD)
 
 export COMMIT_SHA ?= $(shell git rev-parse HEAD)
 
 PROJECT_NAME = git-bridge
 
 PROJECT_NAME = git-bridge

+ 1 - 1
services/history-v1/Makefile
Visa fil 

@@ -4,7 +4,7 @@
 
 
 
 BUILD_NUMBER ?= local
 
 BUILD_NUMBER ?= local
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
-BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g')
 
+BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g' | cut -c1-96)
 
 PROJECT_NAME = history-v1
 
 PROJECT_NAME = history-v1
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 HERE=$(shell pwd)
 
 HERE=$(shell pwd)

+ 1 - 1
services/notifications/Makefile
Visa fil 

@@ -4,7 +4,7 @@
 
 
 
 BUILD_NUMBER ?= local
 
 BUILD_NUMBER ?= local
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
-BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g')
 
+BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g' | cut -c1-96)
 
 PROJECT_NAME = notifications
 
 PROJECT_NAME = notifications
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 HERE=$(shell pwd)
 
 HERE=$(shell pwd)

+ 1 - 1
services/project-history/Makefile
Visa fil 

@@ -4,7 +4,7 @@
 
 
 
 BUILD_NUMBER ?= local
 
 BUILD_NUMBER ?= local
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
-BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g')
 
+BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g' | cut -c1-96)
 
 PROJECT_NAME = project-history
 
 PROJECT_NAME = project-history
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 HERE=$(shell pwd)
 
 HERE=$(shell pwd)

+ 1 - 1
services/real-time/Makefile
Visa fil 

@@ -4,7 +4,7 @@
 
 
 
 BUILD_NUMBER ?= local
 
 BUILD_NUMBER ?= local
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 
-BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g')
 
+BRANCH_NAME_TAG_SAFE = $(shell echo $(BRANCH_NAME) | sed 's/\//\-\-/g' | cut -c1-96)
 
 PROJECT_NAME = real-time
 
 PROJECT_NAME = real-time
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]')
 
 HERE=$(shell pwd)
 
 HERE=$(shell pwd)

+ 1 - 1
services/web/Makefile
Visa fil 

@@ -5,7 +5,7 @@ BUILD_NUMBER ?= local
 
 ifeq ($(BRANCH_NAME),)
 
 ifeq ($(BRANCH_NAME),)
 
   export BRANCH_NAME := $(shell git rev-parse --abbrev-ref HEAD)
 
   export BRANCH_NAME := $(shell git rev-parse --abbrev-ref HEAD)
 
 endif
 
 endif
 
-BRANCH_NAME_TAG_SAFE := $(subst /,--,$(BRANCH_NAME))
 
+BRANCH_NAME_TAG_SAFE := $(shell echo "$(BRANCH_NAME)" | sed 's/\//\-\-/g' | cut -c1-96)
 
 ifeq ($(COMMIT_SHA),)
 
 ifeq ($(COMMIT_SHA),)
 
   export COMMIT_SHA := $(shell git rev-parse HEAD)
 
   export COMMIT_SHA := $(shell git rev-parse HEAD)
 
 endif
 
 endif