using stage3 image

This commit is contained in:
mudler
2015-07-05 19:21:17 +02:00
parent acd4841bca
commit bbeedb9cc5
2 changed files with 6 additions and 7 deletions
+6 -4
View File
@@ -1,11 +1,13 @@
FROM sabayon/base-amd64
FROM sabayon/base-amd64:stage3
# Accepting licenses needed to continue automatic install/upgrade
ADD ./conf/spinbase-licenses /etc/entropy/packages/license.accept
# Upgrading packages and perform post-upgrade tasks (mirror sorting, updating repository db)
ADD ./script/post-upgrade.sh /post-upgrade.sh
RUN equo u &&\
echo -5 | equo conf update && \
/bin/bash /post-upgrade.sh && \
RUN rsync -av "rsync://rsync.at.gentoo.org/gentoo-portage/licenses/" "/usr/portage/licenses/" && ls /usr/portage/licenses -1 | xargs -0 > /etc/entropy/packages/license.accept && \
equo u && \
echo -5 | equo conf update
RUN /bin/bash /post-upgrade.sh && \
rm -rf /post-upgrade.sh
-3
View File
@@ -108,9 +108,6 @@ PACKAGES_TO_ADD=(
equo repo mirrorsort sabayonlinux.org
equo up
rsync -av -H -A -X --delete-during "rsync://rsync.at.gentoo.org/gentoo-portage/licenses/" "/usr/portage/licenses/"
ls /usr/portage/licenses -1 | xargs -0 > /etc/entropy/packages/license.accept
#equo i $(cat /etc/sabayon-pkglist | xargs echo)
equo rm --deep --configfiles --force-system "${PACKAGES_TO_REMOVE[@]}"
equo i "${PACKAGES_TO_ADD[@]}"