@@ -92,7 +92,6 @@ func getAPTImageName(manifest *unversioned.UpdateManifest, osVersion string) str
92
92
osType = manifest .Metadata .OS .Type
93
93
}
94
94
95
- // TODO: support qualifying image name with designated repository
96
95
log .Debugf ("Using %s:%s as basis for tooling image" , osType , version )
97
96
return fmt .Sprintf ("%s:%s" , osType , version )
98
97
}
@@ -302,15 +301,8 @@ func GetPackageInfo(file string) (string, string, error) {
302
301
// - sh and apt installed on the image
303
302
// - valid dpkg status on the image
304
303
//
305
- // Images Images with neither (i.e. Google Debian Distroless) should be patched with unpackAndMergeUpdates
306
- //
307
- // TODO: Support Debian images with valid dpkg status but missing tools. No current examples exist in test set
308
- // i.e. extra RunOption to mount a copy of busybox-static or full apt install into the image and invoking that.
304
+ // Images with neither (i.e. Google Debian Distroless) should be patched with unpackAndMergeUpdates.
309
305
func (dm * dpkgManager ) installUpdates (ctx context.Context , updates unversioned.UpdatePackages , ignoreErrors bool ) (* llb.State , []byte , error ) {
310
- // TODO: Add support for custom APT config and gpg key injection
311
- // Since this takes place in the target container, it can interfere with install actions
312
- // such as the installation of the updated debian-archive-keyring package, so it's probably best
313
- // to separate it out to an explicit container edit command or opt-in before patching.
314
306
aptUpdated := dm .config .ImageState .Run (
315
307
llb .Shlex ("apt update" ),
316
308
llb .WithProxy (utils .GetProxy ()),
0 commit comments