chore: bump imagecustomizer container version (#498)

Also includes compensating changes to work with latest imagecustomizer containers.

Author: George Mileka

defaultconfigs/content/defaults.toml

@@ -1,2 +1,2 @@
 [tools.imageCustomizer]
-containerTag = "mcr.microsoft.com/azurelinux/imagecustomizer:0.18.0"
+containerTag = "mcr.microsoft.com/azurelinux/imagecustomizer:1"

internal/app/azldev/cmds/image/imageutils.go

@@ -25,9 +25,6 @@ const (
 	// of the log level set for azldev.
 	// The log level set for azldev controls what is shown on the console.
 	defaultLogLevel = "debug"
-
-	entryPointSwitch               = "--entrypoint"
-	downloadAndCustomizeScriptPath = "/usr/local/bin/run.sh"
 )
 
 type imageCustomizerOptions struct {
@@ -81,12 +78,6 @@ func buildDockerArgs(
 	if options.imageFile != "" {
 		inputImageDir := path.Dir(options.imageFile)
 		args = append(args, "-v", inputImageDir+":"+inputImageDir+docker.MountROOption)
-	} else if options.imageTag != "" {
-		// To be able to use the image tag, we need to set the entry point to
-		// the script that will download the image first and then run the
-		// Image Customizer after that. This overrides the default entry point
-		// which calls the Image Customizer directly.
-		args = append(args, entryPointSwitch, downloadAndCustomizeScriptPath)
 	}
 
 	return args
@@ -127,16 +118,13 @@ func buildImageCustomizerArgs(
 ) []string {
 	args := []string{}
 
-	if options.imageTag != "" {
-		// /usr/local/bin/run.sh expects the first argument to be the image tag.
-		// It then passes the rest to the image customizer binary as before.
-		args = append(args, options.imageTag)
-	}
-
 	args = append(args, imageCustomizerCommand)
 
 	if options.imageFile != "" {
 		args = append(args, "--image-file", options.imageFile)
+	} else if options.imageTag != "" {
+		args = append(args, "--image", "azurelinux:minimal-os:"+options.imageTag)
+		args = append(args, "--image-cache-dir", "/azldev/image-cache")
 	}
 
 	args = append(args, []string{

scenario/image_customize_test.go

@@ -18,7 +18,7 @@ import (
 )
 
 const (
-	minimalOS30ImageTag = "3.0.latest"
+	minimalOS30ImageTag = "3.0"
 	commonTestDataDir   = "scenario/testdata/imagecustomizer"
 )
 

scenario/testdata/imagecustomizer/e2e/azldev-config/azldev.toml

@@ -7,4 +7,4 @@ work-dir = '/build/work'
 output-dir = 'out'
 
 [tools.imageCustomizer]
-containerTag = "mcr.microsoft.com/azurelinux/imagecustomizer:0.18.0"
+containerTag = "mcr.microsoft.com/azurelinux/imagecustomizer:1"

scenario/testdata/imagecustomizer/e2e/image-config.yaml

@@ -1,3 +1,6 @@
+previewFeatures:
+- input-image-oci
+
 os:
   packages:
     install: