From a6f0d6ec82c10736573d7de94628b87ca9861c6e Mon Sep 17 00:00:00 2001 From: Rebecca Graber Date: Tue, 9 Jan 2024 12:53:31 -0500 Subject: [PATCH 1/2] fix: remove periods from project name when release version is present --- options.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/options.mk b/options.mk index 86b7eec5f7..ffee32c787 100644 --- a/options.mk +++ b/options.mk @@ -30,10 +30,10 @@ DEVSTACK_WORKSPACE ?= $(shell pwd)/.. # so changing it will give you a separate set of databases. # See https://docs.docker.com/compose/reference/envvars/#compose_project_name # If OPENEDX_RELAESE is defined, defaults to `devstack-${OPENEDX_RELEASE}`; -# otherwise, it defaults to `devstack`. +# otherwise, it defaults to `devstack`. Any periods will be replaced with hyphens to comply with docker project naming rules. # Be sure to bring down services before changing the value of `COMPOSE_PROJECT_NAME`. ifdef OPENEDX_RELEASE - COMPOSE_PROJECT_NAME ?= devstack-${OPENEDX_RELEASE} + COMPOSE_PROJECT_NAME ?= devstack-$(echo ${OPENEDX_RELEASE} | tr . -) else COMPOSE_PROJECT_NAME ?= devstack endif From 9490ec381adfed1ed81be56a9322bf0d1f8137b4 Mon Sep 17 00:00:00 2001 From: Rebecca Graber Date: Tue, 9 Jan 2024 13:16:13 -0500 Subject: [PATCH 2/2] fixup!: update comment --- options.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options.mk b/options.mk index ffee32c787..7e3eea76cc 100644 --- a/options.mk +++ b/options.mk @@ -30,7 +30,7 @@ DEVSTACK_WORKSPACE ?= $(shell pwd)/.. # so changing it will give you a separate set of databases. # See https://docs.docker.com/compose/reference/envvars/#compose_project_name # If OPENEDX_RELAESE is defined, defaults to `devstack-${OPENEDX_RELEASE}`; -# otherwise, it defaults to `devstack`. Any periods will be replaced with hyphens to comply with docker project naming rules. +# otherwise, it defaults to `devstack`. Any periods will be replaced with hyphens to comply with docker project naming rules (eg `devstack-quince.master` will become `devstack-quince-master`). # Be sure to bring down services before changing the value of `COMPOSE_PROJECT_NAME`. ifdef OPENEDX_RELEASE COMPOSE_PROJECT_NAME ?= devstack-$(echo ${OPENEDX_RELEASE} | tr . -)