Skip to content

Commit b63ab82

Browse files
committed
dnf: Remove explicit makecache and --refresh
This prevents extra round trips to the repository that are almost certainly uneccessary. It also gives the spec author/builder the power to control metadata expiry in the cache. dnf is not like apt (which requires explicit metadata updates), and by default it will refresh metadata after a configured expiry time. This is a backport of 3200f03 which cannot be directly cherry-picked. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
1 parent fcf7ef8 commit b63ab82

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

targets/linux/rpm/distro/dnf_install.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ func TdnfInstall(cfg *dnfInstallConfig, releaseVer string, pkgs []string) llb.Ru
147147
cmdFlags := dnfInstallFlags(cfg)
148148
// tdnf makecache is needed to ensure that the package metadata is up to date if extra repo
149149
// config files have been mounted
150-
cmdArgs := fmt.Sprintf("set -ex; tdnf makecache -y; tdnf install -y --refresh --setopt=varsdir=/etc/dnf/vars --releasever=%s %s %s", releaseVer, cmdFlags, strings.Join(pkgs, " "))
150+
cmdArgs := fmt.Sprintf("tdnf install -y --setopt=varsdir=/etc/dnf/vars --releasever=%s %s %s", releaseVer, cmdFlags, strings.Join(pkgs, " "))
151151

152152
var runOpts []llb.RunOption
153153

@@ -176,7 +176,7 @@ func DnfInstall(cfg *dnfInstallConfig, releaseVer string, pkgs []string) llb.Run
176176
cmdFlags := dnfInstallFlags(cfg)
177177
// tdnf makecache is needed to ensure that the package metadata is up to date if extra repo
178178
// config files have been mounted
179-
cmdArgs := fmt.Sprintf("set -ex; dnf makecache -y; dnf install -y --refresh --releasever=%s --setopt=varsdir=/etc/dnf/vars %s %s", releaseVer, cmdFlags, strings.Join(pkgs, " "))
179+
cmdArgs := fmt.Sprintf("dnf install -y --releasever=%s --setopt=varsdir=/etc/dnf/vars %s %s", releaseVer, cmdFlags, strings.Join(pkgs, " "))
180180

181181
var runOpts []llb.RunOption
182182

0 commit comments

Comments
 (0)