Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Fixed regression for extensions. Updated docs to remove the rootURL … #1463

Merged
merged 1 commit into from
Sep 20, 2017
Merged

Fixed regression for extensions. Updated docs to remove the rootURL … #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions extensions/hello-world-dcos/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ dcos task log hello-marathon
"extensionProfiles": [
{
"name": "hello-world-dcos",
"version": "v1",
"rootURL": "https://bagbyimages.blob.core.windows.net:443/"
"version": "v1"
}
]

Expand Down
1 change: 0 additions & 1 deletion extensions/hello-world/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ ls -l /var/log
{
"name": "hello-world-dcos",
"version": "v1",
"rootURL": "https://bagbyimages.blob.core.windows.net:443/",
"script": "hello.sh"
}
]
Expand Down
7 changes: 6 additions & 1 deletion pkg/acsengine/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1841,7 +1841,12 @@ func internalGetPoolLinkedTemplateText(extTargetVMNamePrefix, orchestratorType,
dta = strings.Replace(dta, "EXTENSION_PARAMETERS_REPLACE", extensionsParameterReference, -1)
dta = strings.Replace(dta, "EXTENSION_URL_REPLACE", extensionProfile.RootURL, -1)
dta = strings.Replace(dta, "EXTENSION_TARGET_VM_NAME_PREFIX", extTargetVMNamePrefix, -1)
dta = strings.Replace(dta, "EXTENSION_LOOP_COUNT", loopCount, -1)
if _, err := strconv.Atoi(loopCount); err == nil {
dta = strings.Replace(dta, "\"EXTENSION_LOOP_COUNT\"", loopCount, -1)
} else {
dta = strings.Replace(dta, "EXTENSION_LOOP_COUNT", loopCount, -1)
}

dta = strings.Replace(dta, "EXTENSION_LOOP_OFFSET", loopOffset, -1)
return dta, nil
}
Expand Down