From 73139e1b918acc0a8c0e4ea03f7bf71272e77657 Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Sun, 14 May 2023 07:00:00 +0000 Subject: [PATCH] refactor: docker -> container --- distro/debian/debian.go | 4 ++-- kernel/kernel.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/distro/debian/debian.go b/distro/debian/debian.go index ae07f12..e298cd2 100644 --- a/distro/debian/debian.go +++ b/distro/debian/debian.go @@ -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 diff --git a/kernel/kernel.go b/kernel/kernel.go index 9dbcd52..1133df0 100644 --- a/kernel/kernel.go +++ b/kernel/kernel.go @@ -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: