Merge 6bc3b0b18a into 236ba5690e
This commit is contained in:
commit
7380280e36
|
|
@ -19,6 +19,7 @@ package buildcontext
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
@ -48,6 +49,8 @@ func (b *AzureBlob) UnpackTarFromBuildContext() (string, error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return parts.Host, err
|
return parts.Host, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
accountUrl := fmt.Sprintf("%s://%s", parts.Scheme, parts.Host)
|
||||||
accountName := strings.Split(parts.Host, ".")[0]
|
accountName := strings.Split(parts.Host, ".")[0]
|
||||||
|
|
||||||
// Generate credential with accountName and accountKey
|
// Generate credential with accountName and accountKey
|
||||||
|
|
@ -65,7 +68,7 @@ func (b *AzureBlob) UnpackTarFromBuildContext() (string, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Downloading context file from Azure Blob Storage
|
// Downloading context file from Azure Blob Storage
|
||||||
client, err := azblob.NewClientWithSharedKeyCredential(b.context, credential, nil)
|
client, err := azblob.NewClientWithSharedKeyCredential(accountUrl, credential, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return parts.Host, err
|
return parts.Host, err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue