mirror of
https://github.com/drone/drone-kaniko.git
synced 2026-06-16 14:49:02 +08:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c2f00d6d86 | |||
| 467287429a | |||
| 65cd3884f1 |
+45
-19
@@ -37,6 +37,7 @@ var (
|
|||||||
ACRCertPath = "/kaniko/acr-cert.pem"
|
ACRCertPath = "/kaniko/acr-cert.pem"
|
||||||
pluginVersion = "unknown"
|
pluginVersion = "unknown"
|
||||||
username = "00000000-0000-0000-0000-000000000000"
|
username = "00000000-0000-0000-0000-000000000000"
|
||||||
|
maxPageCount = 1000 // maximum count of pages to cycle through before we break out
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
@@ -407,32 +408,56 @@ func getPublicUrl(token, registryUrl, subscriptionId string) (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
registry := strings.Split(registryUrl, ".")[0]
|
registry := strings.Split(registryUrl, ".")[0]
|
||||||
burl := "https://management.azure.com/subscriptions/" +
|
baseURL := "https://management.azure.com/subscriptions/" +
|
||||||
subscriptionId + "/resources?$filter=resourceType%20eq%20'Microsoft.ContainerRegistry/registries'%20and%20name%20eq%20'" +
|
subscriptionId + "/resources?$filter=resourceType%20eq%20'Microsoft.ContainerRegistry/registries'%20and%20name%20eq%20'" +
|
||||||
registry + "'&api-version=2021-04-01&$select=id"
|
registry + "'&api-version=2021-04-01&$select=id"
|
||||||
|
|
||||||
method := "GET"
|
method := "GET"
|
||||||
client := &http.Client{}
|
client := &http.Client{}
|
||||||
req, err := http.NewRequest(method, burl, nil)
|
|
||||||
if err != nil {
|
cnt := 0
|
||||||
fmt.Println(err)
|
|
||||||
return "", errors.Wrap(err, "failed to create request for getting container registry setting")
|
for {
|
||||||
|
// this is just in case we end up cycling through nextLink's infinitely.
|
||||||
|
// this should not happen - added as a precaution.
|
||||||
|
if cnt > maxPageCount {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
cnt++
|
||||||
|
req, err := http.NewRequest(method, baseURL, nil)
|
||||||
|
if err != nil {
|
||||||
|
return "", errors.Wrap(err, "failed to create request for getting container registry setting")
|
||||||
|
}
|
||||||
|
|
||||||
|
req.Header.Add("Authorization", "Bearer "+token)
|
||||||
|
res, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return "", errors.Wrap(err, "failed to send request for getting container registry setting")
|
||||||
|
}
|
||||||
|
defer res.Body.Close()
|
||||||
|
|
||||||
|
var response strct
|
||||||
|
err = json.NewDecoder(res.Body).Decode(&response)
|
||||||
|
if err != nil {
|
||||||
|
return "", errors.Wrap(err, "failed to send request for getting container registry setting")
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(response.Value) > 0 {
|
||||||
|
if response.Value[0].ID == "" { // should not happen
|
||||||
|
return "", errors.New("received empty registry ID from /subscriptions API")
|
||||||
|
}
|
||||||
|
return finalUrl + encodeParam(response.Value[0].ID), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if response.NextLink == "" {
|
||||||
|
// No more pages, break the loop
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
baseURL = response.NextLink
|
||||||
}
|
}
|
||||||
|
|
||||||
req.Header.Add("Authorization", "Bearer "+token)
|
return "", errors.New("did not receive any registry information from /subscriptions API")
|
||||||
res, err := client.Do(req)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println(err)
|
|
||||||
return "", errors.Wrap(err, "failed to send request for getting container registry setting")
|
|
||||||
}
|
|
||||||
defer res.Body.Close()
|
|
||||||
|
|
||||||
var response strct
|
|
||||||
err = json.NewDecoder(res.Body).Decode(&response)
|
|
||||||
if err != nil {
|
|
||||||
return "", errors.Wrap(err, "failed to send request for getting container registry setting")
|
|
||||||
}
|
|
||||||
return finalUrl + encodeParam(response.Value[0].ID), nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func encodeParam(s string) string {
|
func encodeParam(s string) string {
|
||||||
@@ -443,4 +468,5 @@ type strct struct {
|
|||||||
Value []struct {
|
Value []struct {
|
||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
} `json:"value"`
|
} `json:"value"`
|
||||||
|
NextLink string `json:"nextLink"` // for pagination
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.19.2
|
||||||
|
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.19.2
|
||||||
ADD release/linux/amd64/kaniko-acr /kaniko/
|
ADD release/linux/amd64/kaniko-acr /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-acr"]
|
ENTRYPOINT ["/kaniko/kaniko-acr"]
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.19.2
|
||||||
|
|
||||||
ENV HOME /root
|
ENV HOME /root
|
||||||
ENV USER root
|
ENV USER root
|
||||||
|
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.19.2
|
||||||
ADD release/linux/arm64/kaniko-acr /kaniko/
|
ADD release/linux/arm64/kaniko-acr /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-acr"]
|
ENTRYPOINT ["/kaniko/kaniko-acr"]
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.19.2
|
||||||
|
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.19.2
|
||||||
ADD release/linux/amd64/kaniko-docker /kaniko/
|
ADD release/linux/amd64/kaniko-docker /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-docker"]
|
ENTRYPOINT ["/kaniko/kaniko-docker"]
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.19.2
|
||||||
|
|
||||||
ENV HOME /root
|
ENV HOME /root
|
||||||
ENV USER root
|
ENV USER root
|
||||||
|
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.19.2
|
||||||
ADD release/linux/arm64/kaniko-docker /kaniko/
|
ADD release/linux/arm64/kaniko-docker /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-docker"]
|
ENTRYPOINT ["/kaniko/kaniko-docker"]
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.19.2
|
||||||
|
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.19.2
|
||||||
ADD release/linux/amd64/kaniko-ecr /kaniko/
|
ADD release/linux/amd64/kaniko-ecr /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-ecr"]
|
ENTRYPOINT ["/kaniko/kaniko-ecr"]
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.19.2
|
||||||
|
|
||||||
ENV HOME /root
|
ENV HOME /root
|
||||||
ENV USER root
|
ENV USER root
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.19.2
|
||||||
|
|
||||||
ADD release/linux/arm64/kaniko-ecr /kaniko/
|
ADD release/linux/arm64/kaniko-ecr /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-ecr"]
|
ENTRYPOINT ["/kaniko/kaniko-ecr"]
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.19.2
|
||||||
|
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.19.2
|
||||||
ADD release/linux/amd64/kaniko-gar /kaniko/
|
ADD release/linux/amd64/kaniko-gar /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-gar"]
|
ENTRYPOINT ["/kaniko/kaniko-gar"]
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.19.2
|
||||||
|
|
||||||
ENV HOME /root
|
ENV HOME /root
|
||||||
ENV USER root
|
ENV USER root
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.19.2
|
||||||
|
|
||||||
ADD release/linux/arm64/kaniko-gar /kaniko/
|
ADD release/linux/arm64/kaniko-gar /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-gar"]
|
ENTRYPOINT ["/kaniko/kaniko-gar"]
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.19.2
|
||||||
|
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.19.2
|
||||||
ADD release/linux/amd64/kaniko-gcr /kaniko/
|
ADD release/linux/amd64/kaniko-gcr /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-gcr"]
|
ENTRYPOINT ["/kaniko/kaniko-gcr"]
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.19.2
|
||||||
|
|
||||||
ENV HOME /root
|
ENV HOME /root
|
||||||
ENV USER root
|
ENV USER root
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.19.2
|
||||||
|
|
||||||
ADD release/linux/arm64/kaniko-gcr /kaniko/
|
ADD release/linux/arm64/kaniko-gcr /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-gcr"]
|
ENTRYPOINT ["/kaniko/kaniko-gcr"]
|
||||||
|
|||||||
Reference in New Issue
Block a user