tools/out-of-tree
1
0
Fork 0
Code Releases Activity

refactor: docker -> container

Browse Source
This commit is contained in:
dump_stack() 2023-05-14 07:00:00 +00:00
parent e231121082
commit 73139e1b91
Signed by: dump_stack
GPG Key ID: BE44DA8C062D87DC
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distro/debian/debian.go
View File

@ -204,12 +204,12 @@ func MatchImagePkg(km config.KernelMask) (pkgs []string, err error) {
return
}
func DockerEnvs(km config.KernelMask) (envs []string) {
func ContainerEnvs(km config.KernelMask) (envs []string) {
envs = append(envs, "DEBIAN_FRONTEND=noninteractive")
return
}
func DockerCommands(km config.KernelMask) (commands []string) {
func ContainerCommands(km config.KernelMask) (commands []string) {
release := releaseFromString(km.DistroRelease)
var snapshot string

4
kernel/kernel.go
View File

@ -290,10 +290,10 @@ func GenerateBaseDockerImage(registry string, commands []config.DockerCommand,
}
d += fmt.Sprintf("RUN yum -y install %s\n", packages)
case config.Debian:
for _, e := range debian.DockerEnvs(sk) {
for _, e := range debian.ContainerEnvs(sk) {
d += "ENV " + e + "\n"
}
for _, c := range debian.DockerCommands(sk) {
for _, c := range debian.ContainerCommands(sk) {
d += "RUN " + c + "\n"
}
default: