Skip to content

Fix adds rm in-use container so rmi can succeed #147

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
merged 1 commit into from
Mar 3, 2023
Merged

Fix adds rm in-use container so rmi can succeed #147

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions cmd/index/eus/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ func run(cmd *cobra.Command, args []string) error {
EUSReportColumn = append(EUSReportColumn, channelGrouping)
}
EUSReportTable = append(EUSReportTable, EUSReportColumn)

// must rm container so all rmi succeed
command := exec.Command(flags.ContainerEngine, "rm", actions.CatalogIndex)
_, _ = pkg.RunCommand(command)
// always remove catalog images, so always non-"server-mode" as elsewhere
rmiCmd := exec.Command(flags.ContainerEngine, "rmi", flags.Indexes[index])
_, _ = pkg.RunCommand(rmiCmd)
Expand Down
12 changes: 6 additions & 6 deletions pkg/actions/extract_index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ import (
log "github.com/sirupsen/logrus"
)

const catalogIndex = "audit-catalog-index"
const CatalogIndex = "audit-catalog-index"

func ExtractIndexDBorCatalogs(image string, containerEngine string) error {
log.Info("Extracting database...")
// Remove image if exists already
command := exec.Command(containerEngine, "rm", catalogIndex)
command := exec.Command(containerEngine, "rm", CatalogIndex)
_, _ = pkg.RunCommand(command)

// Download the image
command = exec.Command(containerEngine, "create", "--name", catalogIndex, image, "\"yes\"")
command = exec.Command(containerEngine, "create", "--name", CatalogIndex, image, "\"yes\"")
_, err := pkg.RunCommand(command)
if err != nil {
return fmt.Errorf("unable to create container image %s : %s", image, err)
Expand All @@ -47,21 +47,21 @@ func ExtractIndexDBorCatalogs(image string, containerEngine string) error {
log.Fatal(err)
}
// sqlite db
command = exec.Command(containerEngine, "cp", fmt.Sprintf("%s:/database/index.db", catalogIndex),
command = exec.Command(containerEngine, "cp", fmt.Sprintf("%s:/database/index.db", CatalogIndex),
"./output/"+versionTag+"/")
_, err = pkg.RunCommand(command)
if err != nil {
log.Infof("unable to extract index.db (probably file based config index) %s : %s", image, err)
}
// transitional indexes have a hidden sqlite db, copy it, and change the name to just index.db
command = exec.Command(containerEngine, "cp",
fmt.Sprintf("%s:/var/lib/iib/_hidden/do.not.edit.db", catalogIndex), "./output/"+versionTag+"/index.db")
fmt.Sprintf("%s:/var/lib/iib/_hidden/do.not.edit.db", CatalogIndex), "./output/"+versionTag+"/index.db")
_, err = pkg.RunCommand(command)
if err != nil {
log.Infof("unable to extract the image for index.db (transition or file based config index) %s : %s", image, err)
}
// For FBC extract they are on the image, in /configs/<package_name>/catalog.json
command = exec.Command(containerEngine, "cp", fmt.Sprintf("%s:/configs/", catalogIndex),
command = exec.Command(containerEngine, "cp", fmt.Sprintf("%s:/configs/", CatalogIndex),
"./output/"+versionTag+"/")
_, errFbc := pkg.RunCommand(command)
if errFbc != nil {
Expand Down