Skip to content
This repository was archived by the owner on Aug 1, 2024. It is now read-only.

Commit e00537d

Browse files
fix: import devstack env vars when provisioning ida's (#1061)
Change provision-ida.sh so that on provision it imports environmental variables like: - DEVSTACK_WORKSPACE - COMPOSE_PROJECT_NAME - COMPOSE_PATH_SEPARATOR - COMPOSE_FILE that are defined in Makefile and options.mk. Before this change, provision would re-create a devstack container that was not mapped to the user's local machine using COMPOSE_FILE here: https://github.com/openedx/devstack/blob/fac68ae85b49cc6186d4872c0f3e2bfbc64f98db/provision-ida.sh#L12 Then fail on requirements gathering for course-discovery here: https://github.com/openedx/devstack/blob/fac68ae85b49cc6186d4872c0f3e2bfbc64f98db/provision-ida.sh#L15 Due to: - Outdated BASIC authentication credentials provided by the configuration repository by default in our devstack images, and - Not having the user's .git/config file for the repo mapped into the container. Co-authored-by: Alexander Sheehan <asheehan@edx.org>
1 parent fac68ae commit e00537d

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

provision-ida.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ client_name=$2 # The name of the Oauth client stored in the edxapp DB.
99
client_port=$3 # The port corresponding to this IDA service in devstack.
1010
container_name=${4:-$1} # (Optional) The name of the container. If missing, will use app_name.
1111

12-
docker-compose up -d $app_name
12+
make dev.up.$app_name
1313

1414
echo -e "${GREEN}Installing requirements for ${app_name}...${NC}"
1515
docker-compose exec -T ${container_name} bash -e -c 'source /edx/app/$1/$1_env && cd /edx/app/$1/$1/ && make requirements' -- "$app_name"

0 commit comments

Comments
 (0)