wbrawner/toolbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

images: ubuntu: Move flatpak-xdg-utils installation to Containerfile

Browse source 
Since `flatpak-xdg-utils` is essential to the images, not 'extra'.

https://github.com/containers/toolbox/pull/1291

Signed-off-by: Ievgen Popovych <jmennius@gmail.com>
This commit is contained in:
Ievgen Popovych 2023-04-15 22:11:48 +03:00 committed by Debarshi Ray
parent 1b3e557e20
commit 947bb612e1
6 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
images/ubuntu/20.04/Containerfile
View file

@ -27,6 +27,7 @@ RUN sed -Ei '/apt-get (update|upgrade)/s/^/#/' /usr/local/sbin/unminimize && \
DEBIAN_FRONTEND=noninteractive apt-get -y install \
ubuntu-minimal ubuntu-standard \
libnss-myhostname \
flatpak-xdg-utils \
$(cat extra-packages | xargs) && \
rm -rd /var/lib/apt/lists/*
RUN rm /extra-packages

1
images/ubuntu/20.04/extra-packages
View file

@ -1,5 +1,4 @@
curl
flatpak-xdg-utils
git
gnupg2
keyutils

1
images/ubuntu/22.04/Containerfile
View file

@ -27,6 +27,7 @@ RUN sed -Ei '/apt-get (update|upgrade)/s/^/#/' /usr/local/sbin/unminimize && \
DEBIAN_FRONTEND=noninteractive apt-get -y install \
ubuntu-minimal ubuntu-standard \
libnss-myhostname \
flatpak-xdg-utils \
$(cat extra-packages | xargs) && \
rm -rd /var/lib/apt/lists/*
RUN rm /extra-packages

1
images/ubuntu/22.04/extra-packages
View file

@ -1,5 +1,4 @@
curl
flatpak-xdg-utils
git
gnupg2
keyutils

1
images/ubuntu/22.10/Containerfile
View file

@ -27,6 +27,7 @@ RUN sed -Ei '/apt-get (update|upgrade)/s/^/#/' /usr/local/sbin/unminimize && \
DEBIAN_FRONTEND=noninteractive apt-get -y install \
ubuntu-minimal ubuntu-standard \
libnss-myhostname \
flatpak-xdg-utils \
$(cat extra-packages | xargs) && \
rm -rd /var/lib/apt/lists/*
RUN rm /extra-packages

1
images/ubuntu/22.10/extra-packages
View file

@ -1,5 +1,4 @@
curl
flatpak-xdg-utils
git
gnupg2
keyutils