From 31488e8929d9a24358bebc30bb208e4969a454a5 Mon Sep 17 00:00:00 2001 From: mudler Date: Sun, 7 Jun 2015 13:54:37 +0200 Subject: [PATCH] [Dockerfile] removing a step, moving into the post-upgrade script --- Dockerfile | 3 --- script/post-upgrade.sh | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 99b5193..bf09d53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,9 +33,6 @@ ADD ./conf/spinbase-licenses /etc/entropy/packages/license.accept # Upgrading packages RUN equo u && echo -5 | equo conf update -# We ensure to have those packages from the beginning -RUN equo i sys-boot/grub:2 linux-sabayon sabayon-artwork-core sabayon-version sabayon-artwork-grub sabayon-live - # Perform post-upgrade tasks (mirror sorting, updating repository db) ADD ./script/post-upgrade.sh /post-upgrade.sh RUN /bin/bash /post-upgrade.sh && rm -rf /post-upgrade.sh diff --git a/script/post-upgrade.sh b/script/post-upgrade.sh index 87f4004..9c67449 100644 --- a/script/post-upgrade.sh +++ b/script/post-upgrade.sh @@ -80,6 +80,12 @@ PACKAGES_TO_ADD=( "app-text/pastebunz" "app-admin/perl-cleaner" "sys-apps/grep" + "app-misc/sabayon-live" + "sys-boot/grub:2" + "sys-kernel/linux-sabayon" + "x11-themes/sabayon-artwork-core" + "app-misc/sabayon-version" + "x11-themes/sabayon-artwork-grub" ) # Handling install/removal of packages specified in env