Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions util/jenkins/ansible-provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -785,9 +785,7 @@ EOF

configuration_secure_json=$(aws secretsmanager get-secret-value --region "${region}" --secret-id "${configuration_secure_secret}" --query SecretString --output text)
app_git_ssh_key=$(echo "$configuration_secure_json" | jq -r '._local_git_identity // empty')
# Required by internal edx-platform-private Dockerfile (BuildKit GIT_AUTH_TOKEN) to fetch
# private repos such as edx-internal and edx-themes over HTTPS.
app_github_token=$(echo "$configuration_secure_json" | jq -r '.GITHUB_TOKEN // .github_access_token // .github_token // empty')
app_git_pat_token=$(echo "$configuration_secure_json" | jq -r '.LOCAL_GIT_PAT_TOKEN // empty')

Comment on lines +788 to 789
# specify variable names
app_hostname="courses"
Expand Down
2 changes: 1 addition & 1 deletion util/jenkins/app-container-provisioner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ if ! $(docker image inspect ${app_image_name} >/dev/null 2>&1 && echo true || ec
curl -fsSL "\$PUBLIC_DOCKERFILE_URL" -o /tmp/edx-platform.Dockerfile

set +x
export GITHUB_TOKEN='${app_github_token}'
export GITHUB_TOKEN='${app_git_pat_token}'
set -x

# Public Dockerfile fetches code from GitHub via EDX_PLATFORM_* build args.
Expand Down
Loading