Skip to content

enable fetching RPMs from pacakges.microsoft.com for Docker based build #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicogbg merged 1 commit into from
Oct 13, 2020
Merged

enable fetching RPMs from pacakges.microsoft.com for Docker based build #198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions toolkit/tools/internal/packagerepo/repocloner/rpmrepocloner/rpmrepocloner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const (
leaveChrootFilesOnDisk = false
updateRepoID = "mariner-official-update"
fetcherRepoID = "fetcher-cloned-repo"
cacheRepoDir = "/upstream-cached-rpms"
)

var (
Expand Down Expand Up @@ -333,14 +334,31 @@ func (r *RpmRepoCloner) SearchAndClone(cloneDeps bool, singlePackageToClone *pkg

// ConvertDownloadedPackagesIntoRepo initializes the downloaded RPMs into an RPM repository.
func (r *RpmRepoCloner) ConvertDownloadedPackagesIntoRepo() (err error) {
fullRpmDownloadDir := buildpipeline.GetRpmsDir(r.chroot.RootDir(), chrootDownloadDir)
srcDir := filepath.Join(r.chroot.RootDir(), chrootDownloadDir)
repoDir := srcDir

err = rpmrepomanager.OrganizePackagesByArch(fullRpmDownloadDir, fullRpmDownloadDir)
if !buildpipeline.IsRegularBuild() {
// Docker based build don't use overlay so repo folder
// must be explicitely set to the RPMs cache folder
repoDir = filepath.Join(r.chroot.RootDir(), cacheRepoDir)
}

err = rpmrepomanager.OrganizePackagesByArch(srcDir, repoDir)
if err != nil {
return
}

err = r.initializeMountedChrootRepo(chrootDownloadDir)
if err != nil {
return
}

if !buildpipeline.IsRegularBuild() {
// Docker based build don't use overlay so cache repo
// must be explicitely initialized
err = r.initializeMountedChrootRepo(cacheRepoDir)
}

return
}

Expand Down