From 55105cc0692fec14f8a7f6ddb49bbb14b5dbbe63 Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 5 Mar 2024 08:33:10 +0100
Subject: List installed packages on Alpine only

After a container is done installing necessary packages, the list
of all installed packages is collected into packages.txt file
which is then printed out. And this works everywhere but Alpine.
Because there 'apk list' is run which prints ALL available
packages. We need to pass '--installed' to limit listing only to
the installed ones [1].

1: https://man.archlinux.org/man/apk-list.8.en

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 containers/clang-format/Dockerfile                                     | 2 +-
 lcitool/formatters.py                                                  | 2 +-
 tests/data/formatters/out/libvirt-go-xml-module-alpine-edge.Dockerfile | 2 +-
 tests/data/formatters/out/libvirt-go-xml-module-alpine-edge.sh         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/containers/clang-format/Dockerfile b/containers/clang-format/Dockerfile
index 50a614f..6cf3bc2 100644
--- a/containers/clang-format/Dockerfile
+++ b/containers/clang-format/Dockerfile
@@ -3,6 +3,6 @@ FROM docker.io/library/alpine:3
 RUN apk update && \
     apk upgrade && \
     apk add clang git && \
-    apk list | sort > /packages.txt
+    apk list --installed | sort > /packages.txt
 
 COPY clang-format.sh /clang-format
diff --git a/lcitool/formatters.py b/lcitool/formatters.py
index ec4b580..ed8cecd 100644
--- a/lcitool/formatters.py
+++ b/lcitool/formatters.py
@@ -200,7 +200,7 @@ class BuildEnvFormatter(Formatter):
         facts = target.facts
         commands = []
         if facts["packaging"]["format"] == "apk":
-            commands.extend(["apk list | sort > /packages.txt"])
+            commands.extend(["apk list --installed | sort > /packages.txt"])
         elif facts["packaging"]["format"] == "deb":
             commands.extend([
                 "dpkg-query --showformat '${{Package}}_${{Version}}_${{Architecture}}\\n' --show > /packages.txt"
diff --git a/tests/data/formatters/out/libvirt-go-xml-module-alpine-edge.Dockerfile b/tests/data/formatters/out/libvirt-go-xml-module-alpine-edge.Dockerfile
index 99dc005..e45a87e 100644
--- a/tests/data/formatters/out/libvirt-go-xml-module-alpine-edge.Dockerfile
+++ b/tests/data/formatters/out/libvirt-go-xml-module-alpine-edge.Dockerfile
@@ -6,6 +6,6 @@ RUN apk update && \
         ca-certificates \
         git \
         go && \
-    apk list | sort > /packages.txt
+    apk list --installed | sort > /packages.txt
 
 ENV LANG "en_US.UTF-8"
\ No newline at end of file
diff --git a/tests/data/formatters/out/libvirt-go-xml-module-alpine-edge.sh b/tests/data/formatters/out/libvirt-go-xml-module-alpine-edge.sh
index cc90cc5..064dfac 100644
--- a/tests/data/formatters/out/libvirt-go-xml-module-alpine-edge.sh
+++ b/tests/data/formatters/out/libvirt-go-xml-module-alpine-edge.sh
@@ -5,7 +5,7 @@ function install_buildenv() {
         ca-certificates \
         git \
         go
-    apk list | sort > /packages.txt
+    apk list --installed | sort > /packages.txt
 }
 
 export LANG="en_US.UTF-8"
\ No newline at end of file
-- 
cgit v1.1