From 7de23a1c5beb95ba569e2f14aff38e70a2e5134b Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Tue, 21 Jun 2016 17:44:41 -0700
Subject: [PATCH] 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.
---
 test/utils/docker/opensuseleap/Dockerfile | 40 +++++++++++------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/test/utils/docker/opensuseleap/Dockerfile b/test/utils/docker/opensuseleap/Dockerfile
index 86905c11af5..2be1a2ad44d 100644
--- a/test/utils/docker/opensuseleap/Dockerfile
+++ b/test/utils/docker/opensuseleap/Dockerfile
@@ -1,11 +1,8 @@
 FROM opensuse:leap
 
-RUN zypper --gpg-auto-import-keys --non-interactive ref && \
-    zypper --gpg-auto-import-keys --non-interactive up
-
-#RUN yum -y update; yum clean all; yum -y swap fakesystemd systemd
-
-RUN zypper --non-interactive install --auto-agree-with-licenses \
+RUN zypper --non-interactive --gpg-auto-import-keys refresh && \
+    zypper --non-interactive install --force systemd-sysvinit && \
+    zypper --non-interactive install --auto-agree-with-licenses --no-recommends \
     acl \
     asciidoc \
     bzip2 \
@@ -13,34 +10,36 @@ RUN zypper --non-interactive install --auto-agree-with-licenses \
     dbus-1-python \
     gcc \
     git \
-    glibc-locale \
     glibc-i18ndata \
-    iproute \
+    glibc-locale \
+    iproute2 \
     lsb-release \
     make \
-    mercurial \
     mariadb \
-    python-mysql \
+    mercurial \
     openssh \
-    rpm-build \
-    ruby \
-    subversion \
-    sudo \
-    tar \
-    unzip \
-    which \
-    zip \
-    python-PyYAML \
     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
+    python-virtualenv \
+    rpm-build \
+    ruby \
+    subversion \
+    sudo \
+    tar \
+    unzip \
+    which \
+    zip \
+    && \
+    zypper clean
 
 # systemd path differs from rhel
 ENV LIBSYSTEMD=/usr/lib/systemd/system
@@ -55,7 +54,6 @@ rm -f ${LIBSYSTEMD}/basic.target.wants/*;
 # don't create systemd-session for ssh connections
 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 /usr/bin/echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
 VOLUME /sys/fs/cgroup /run /tmp