From b62f0599e4ee91e1ea0406077fb691d9a1da328c Mon Sep 17 00:00:00 2001
From: Manfred Touron <m@42.am>
Date: Fri, 30 Jan 2015 15:29:08 +0000
Subject: [PATCH] Fixed cleanup and install order

---
 Dockerfile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e973033..1c8a885 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,23 +68,25 @@ RUN systemctl disable getty@tty1.service \
  && systemctl enable ntpdate
 
 
+# packages upgrade
+RUN pacman --noconfirm -Suy
+
+
 # Patch rootfs
 RUN wget -qO - http://j.mp/ocs-scripts | bash
 ADD ./patches/etc/ /etc/
 ADD ./patches/usr/ /usr/
 
 
+# Enable Online-Labs services
 RUN systemctl enable oc-ssh-keys \
  && systemctl enable oc-add-extra-volumes \
  && systemctl enable oc-sync-kernel-modules
 
 
-# packages upgrade
-RUN pacman --noconfirm -Suy
-
-
 # Cleanup
-RUN pacman -Rns linux-armv7 --noconfirm \
+RUN pacman-db-upgrade \
+ && pacman -Rns linux-armv7 --noconfirm \
  && pacman -Sc --noconfirm \
  && rm -rf /var/cache/pacman/pkg \
  && localepurge-config && localepurge