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

images: ubuntu: Remove APT ESM hook

Browse source 
This was recently introduced with `ubuntu-advantage-tools` and it tries
to poke at some system services introducing annoying delay and messages.

Even if the services are present (on Ubuntu host) and systemd is
accessible (rootful container) - that wouldn't be appropriate still.

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:15:39 +03:00 committed by Debarshi Ray
parent 947bb612e1
commit 10b39a6a12
5 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
images/ubuntu/16.04/Containerfile
View file

@ -35,3 +35,6 @@ RUN sed -i '/^auth.*pam_unix.so/s/nullok_secure/try_first_pass nullok/' /etc/pam
# Fix empty bind-mount to clear selinuxfs (see #337) # Fix empty bind-mount to clear selinuxfs (see #337)
RUN mkdir /usr/share/empty RUN mkdir /usr/share/empty
# Disable APT ESM hook which tries to enable some systemd services on each apt invocation
RUN rm /etc/apt/apt.conf.d/20apt-esm-hook.conf

3
images/ubuntu/18.04/Containerfile
View file

@ -35,3 +35,6 @@ RUN sed -i '/^auth.*pam_unix.so/s/nullok_secure/try_first_pass nullok/' /etc/pam
# Fix empty bind-mount to clear selinuxfs (see #337) # Fix empty bind-mount to clear selinuxfs (see #337)
RUN mkdir /usr/share/empty RUN mkdir /usr/share/empty
# Disable APT ESM hook which tries to enable some systemd services on each apt invocation
RUN rm /etc/apt/apt.conf.d/20apt-esm-hook.conf

3
images/ubuntu/20.04/Containerfile
View file

@ -40,3 +40,6 @@ RUN mkdir /usr/share/empty
# Add flatpak-spawn to /usr/bin # Add flatpak-spawn to /usr/bin
RUN ln -s /usr/libexec/flatpak-xdg-utils/flatpak-spawn /usr/bin/ RUN ln -s /usr/libexec/flatpak-xdg-utils/flatpak-spawn /usr/bin/
# Disable APT ESM hook which tries to enable some systemd services on each apt invocation
RUN rm /etc/apt/apt.conf.d/20apt-esm-hook.conf

3
images/ubuntu/22.04/Containerfile
View file

@ -37,3 +37,6 @@ RUN mkdir /usr/share/empty
# Add flatpak-spawn to /usr/bin # Add flatpak-spawn to /usr/bin
RUN ln -s /usr/libexec/flatpak-xdg-utils/flatpak-spawn /usr/bin/ RUN ln -s /usr/libexec/flatpak-xdg-utils/flatpak-spawn /usr/bin/
# Disable APT ESM hook which tries to enable some systemd services on each apt invocation
RUN rm /etc/apt/apt.conf.d/20apt-esm-hook.conf

3
images/ubuntu/22.10/Containerfile
View file

@ -37,3 +37,6 @@ RUN mkdir /usr/share/empty
# Add flatpak-spawn to /usr/bin # Add flatpak-spawn to /usr/bin
RUN ln -s /usr/libexec/flatpak-xdg-utils/flatpak-spawn /usr/bin/ RUN ln -s /usr/libexec/flatpak-xdg-utils/flatpak-spawn /usr/bin/
# Disable APT ESM hook which tries to enable some systemd services on each apt invocation
RUN rm /etc/apt/apt.conf.d/20apt-esm-hook.conf