cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improve zypper refresh/clean for opensuse images.

Browse source
This commit is contained in:
Matt Clay 2017-11-17 12:50:42 -08:00
parent b3e4a88b90
commit 2ef438c962
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/utils/docker/opensuse42.2/Dockerfile
View file

@ -1,6 +1,6 @@
FROM opensuse:42.2 FROM opensuse:42.2
RUN zypper --non-interactive --gpg-auto-import-keys refresh && \ RUN zypper --non-interactive --gpg-auto-import-keys refresh --services --force && \
zypper --non-interactive install --force systemd-sysvinit && \ zypper --non-interactive install --force systemd-sysvinit && \
zypper --non-interactive install --auto-agree-with-licenses --no-recommends \ zypper --non-interactive install --auto-agree-with-licenses --no-recommends \
acl \ acl \
@ -47,7 +47,7 @@ RUN zypper --non-interactive --gpg-auto-import-keys refresh && \
which \ which \
zip \ zip \
&& \ && \
zypper clean zypper clean --all
# systemd path differs from rhel # systemd path differs from rhel
ENV LIBSYSTEMD=/usr/lib/systemd/system ENV LIBSYSTEMD=/usr/lib/systemd/system

4
test/utils/docker/opensuse42.3/Dockerfile
View file

@ -1,6 +1,6 @@
FROM opensuse:42.3 FROM opensuse:42.3
RUN zypper --non-interactive --gpg-auto-import-keys refresh && \ RUN zypper --non-interactive --gpg-auto-import-keys refresh --services --force && \
zypper --non-interactive install --force systemd-sysvinit && \ zypper --non-interactive install --force systemd-sysvinit && \
zypper --non-interactive install --auto-agree-with-licenses --no-recommends \ zypper --non-interactive install --auto-agree-with-licenses --no-recommends \
acl \ acl \
@ -47,7 +47,7 @@ RUN zypper --non-interactive --gpg-auto-import-keys refresh && \
which \ which \
zip \ zip \
&& \ && \
zypper clean zypper clean --all
# systemd path differs from rhel # systemd path differs from rhel
ENV LIBSYSTEMD=/usr/lib/systemd/system ENV LIBSYSTEMD=/usr/lib/systemd/system