Merge branch 'main' into nightly

backend/go-app/docker.go

@@ -403,6 +403,7 @@ func buildImage(tags []string, dockerfileLocation string) error {
 								Image: "gcr.io/kaniko-project/executor:latest",
 								Args: []string{
 									"--verbosity=debug",
+									"--log-format=text",
 									"--dockerfile=Dockerfile",
 									"--context=dir://" + contextDir,
 									"--skip-tls-verify",
@@ -413,6 +414,10 @@ func buildImage(tags []string, dockerfileLocation string) error {
 										Name:      "kaniko-workspace",
 										MountPath: "/app/generated",
 									},
+									{
+										Name: "docker-config",
+										MountPath: "/kaniko/.docker/",
+									},
 								},
 							},
 						},
@@ -427,6 +432,20 @@ func buildImage(tags []string, dockerfileLocation string) error {
 									},
 								},
 							},
+							{
+								Name: "docker-config",
+								VolumeSource: corev1.VolumeSource{
+									Secret: &corev1.SecretVolumeSource{
+										SecretName: os.Getenv("SHUFFLE_REGISTRY_SECRET"),
+										Items: []corev1.KeyToPath{
+											{
+											Key: ".dockerconfigjson",
+											Path: "config.json",
+											},
+										},
+									},
+								},
+							},
 						},
 					},
 				},