1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Update opensuseleap Dockerfile.

- Do not update base image packages unnecessarily.
- Fix incorrect package names.
- Remove commented out RUN statements.
- Sort list of packages to install.
This commit is contained in:
Matt Clay 2016-06-21 17:44:41 -07:00
parent 4c1601e9f2
commit 7de23a1c5b

View file

@ -1,11 +1,8 @@
FROM opensuse:leap FROM opensuse:leap
RUN zypper --gpg-auto-import-keys --non-interactive ref && \ RUN zypper --non-interactive --gpg-auto-import-keys refresh && \
zypper --gpg-auto-import-keys --non-interactive up zypper --non-interactive install --force systemd-sysvinit && \
zypper --non-interactive install --auto-agree-with-licenses --no-recommends \
#RUN yum -y update; yum clean all; yum -y swap fakesystemd systemd
RUN zypper --non-interactive install --auto-agree-with-licenses \
acl \ acl \
asciidoc \ asciidoc \
bzip2 \ bzip2 \
@ -13,15 +10,26 @@ RUN zypper --non-interactive install --auto-agree-with-licenses \
dbus-1-python \ dbus-1-python \
gcc \ gcc \
git \ git \
glibc-locale \
glibc-i18ndata \ glibc-i18ndata \
iproute \ glibc-locale \
iproute2 \
lsb-release \ lsb-release \
make \ make \
mercurial \
mariadb \ mariadb \
python-mysql \ mercurial \
openssh \ openssh \
python-coverage \
python-httplib2 \
python-jinja2 \
python-keyczar \
python-mock \
python-MySQL-python \
python-nose \
python-paramiko \
python-pip \
python-PyYAML \
python-setuptools \
python-virtualenv \
rpm-build \ rpm-build \
ruby \ ruby \
subversion \ subversion \
@ -30,17 +38,8 @@ RUN zypper --non-interactive install --auto-agree-with-licenses \
unzip \ unzip \
which \ which \
zip \ zip \
python-PyYAML \ && \
python-coverage \ zypper clean
python-httplib2 \
python-jinja2 \
python-keyczar \
python-mock \
python-nose \
python-paramiko \
python-pip \
python-setuptools \
python-virtualenv
# systemd path differs from rhel # systemd path differs from rhel
ENV LIBSYSTEMD=/usr/lib/systemd/system ENV LIBSYSTEMD=/usr/lib/systemd/system
@ -55,7 +54,6 @@ rm -f ${LIBSYSTEMD}/basic.target.wants/*;
# don't create systemd-session for ssh connections # don't create systemd-session for ssh connections
RUN sed -i /pam_systemd/d /etc/pam.d/common-session-pc RUN sed -i /pam_systemd/d /etc/pam.d/common-session-pc
#RUN localedef --quiet -c -i en_US -f UTF-8 en_US.UTF-8
RUN mkdir /etc/ansible/ RUN mkdir /etc/ansible/
RUN /usr/bin/echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts RUN /usr/bin/echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
VOLUME /sys/fs/cgroup /run /tmp VOLUME /sys/fs/cgroup /run /tmp