Compare commits

...

4 Commits

Author SHA1 Message Date
Shubham Agrawal 2c637d285e fix docker v2 registry issue 2020-11-26 16:29:05 +05:30
Shubham Agrawal 4be32f2451 Merge pull request #3 from drone/fix_build_script
fix build script
2020-11-26 11:47:54 +05:30
Shubham Agrawal 5ba1a0ead7 fix build script 2020-11-26 11:45:10 +05:30
Shubham Agrawal ef7bb68898 Merge pull request #2 from drone/fix_image
Fix docker file used for kaniko-docker image
2020-11-25 23:44:38 +05:30
4 changed files with 23 additions and 14 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ Build the Docker images with the following commands:
docker build \ docker build \
--label org.label-schema.build-date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ --label org.label-schema.build-date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
--label org.label-schema.vcs-ref=$(git rev-parse --short HEAD) \ --label org.label-schema.vcs-ref=$(git rev-parse --short HEAD) \
--file docker/docker/Dockerfile.linux.amd64 --tag plugins/kaniko-docker . --file docker/docker/Dockerfile.linux.amd64 --tag plugins/kaniko .
docker build \ docker build \
--label org.label-schema.build-date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ --label org.label-schema.build-date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
+10 -1
View File
@@ -18,6 +18,9 @@ const (
// Docker file path // Docker file path
dockerPath string = "/kaniko/.docker" dockerPath string = "/kaniko/.docker"
dockerConfigPath string = "/kaniko/.docker/config.json" dockerConfigPath string = "/kaniko/.docker/config.json"
v1Registry string = "https://index.docker.io/v1/" // Default registry
v2Registry string = "https://index.docker.io/v2/" // v2 registry is not supported
) )
var ( var (
@@ -78,7 +81,7 @@ func main() {
cli.StringFlag{ cli.StringFlag{
Name: "registry", Name: "registry",
Usage: "docker registry", Usage: "docker registry",
Value: "https://index.docker.io/v1/", Value: v1Registry,
EnvVar: "PLUGIN_REGISTRY", EnvVar: "PLUGIN_REGISTRY",
}, },
cli.StringFlag{ cli.StringFlag{
@@ -130,6 +133,12 @@ func createDockerCfgFile(username, password, registry string) error {
return fmt.Errorf("Registry must be specified") return fmt.Errorf("Registry must be specified")
} }
if registry == v2Registry {
fmt.Println("Docker v2 registry is not supported in kaniko. Refer issue: https://github.com/GoogleContainerTools/kaniko/issues/1209")
fmt.Printf("Using v1 registry instead: %s\n", v1Registry)
registry = v1Registry
}
err := os.MkdirAll(dockerPath, 0600) err := os.MkdirAll(dockerPath, 0600)
if err != nil { if err != nil {
return errors.Wrap(err, fmt.Sprintf("failed to create %s directory", dockerPath)) return errors.Wrap(err, fmt.Sprintf("failed to create %s directory", dockerPath))
+9 -9
View File
@@ -10,14 +10,14 @@ set -e
set -x set -x
# linux # linux
GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/kaniko-gcr GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/kaniko-gcr ./cmd/kaniko-gcr
GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/kaniko-ecr GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/kaniko-ecr ./cmd/kaniko-ecr
GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/kaniko-docker GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/kaniko-docker ./cmd/kaniko-docker
GOOS=linux GOARCH=arm64 go build -o release/linux/arm64/kaniko-gcr GOOS=linux GOARCH=arm64 go build -o release/linux/arm64/kaniko-gcr ./cmd/kaniko-gcr
GOOS=linux GOARCH=arm64 go build -o release/linux/arm64/kaniko-ecr GOOS=linux GOARCH=arm64 go build -o release/linux/arm64/kaniko-ecr ./cmd/kaniko-ecr
GOOS=linux GOARCH=arm64 go build -o release/linux/arm64/kaniko-docker GOOS=linux GOARCH=arm64 go build -o release/linux/arm64/kaniko-docker ./cmd/kaniko-docker
GOOS=linux GOARCH=arm go build -o release/linux/arm/kaniko-gcr GOOS=linux GOARCH=arm go build -o release/linux/arm/kaniko-gcr ./cmd/kaniko-gcr
GOOS=linux GOARCH=arm go build -o release/linux/arm/kaniko-ecr GOOS=linux GOARCH=arm go build -o release/linux/arm/kaniko-ecr ./cmd/kaniko-ecr
GOOS=linux GOARCH=arm go build -o release/linux/arm/kaniko-docker GOOS=linux GOARCH=arm go build -o release/linux/arm/kaniko-docker ./cmd/kaniko-docker
+3 -3
View File
@@ -14,9 +14,9 @@ set -e
set -x set -x
# build the binary # build the binary
go build -o release/linux/amd64/kaniko-gcr go build -o release/linux/amd64/kaniko-gcr ./cmd/kaniko-gcr
go build -o release/linux/amd64/kaniko-ecr go build -o release/linux/amd64/kaniko-ecr ./cmd/kaniko-ecr
go build -o release/linux/amd64/kaniko-docker go build -o release/linux/amd64/kaniko-docker ./cmd/kaniko-docker
# build the docker image # build the docker image
docker build -f docker/gcr/Dockerfile.linux.amd64 -t plugins/kaniko-gcr . docker build -f docker/gcr/Dockerfile.linux.amd64 -t plugins/kaniko-gcr .