From 5280cc14e4a39fceef119edabdcf615529f14428 Mon Sep 17 00:00:00 2001 From: mudler Date: Sun, 5 Jul 2015 17:17:08 +0200 Subject: [PATCH 1/2] Using new gentoo stage3 base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c740034..ebcd452 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM plabedan/gentoo +FROM sabayon/gentoo-stage3 # Set locales to en_US.UTF-8 RUN echo "en_US.UTF-8 UTF-8 " >> /etc/locale.gen && locale-gen && eselect locale set en_US.utf8 && env-update && source /etc/profile From 3a3988ae25d5ad83b2a141689ae3df90c10b691f Mon Sep 17 00:00:00 2001 From: mudler Date: Sun, 5 Jul 2015 19:11:23 +0200 Subject: [PATCH 2/2] upgrading packages in this phase --- Dockerfile | 9 ++++++++- ext/base-licenses | 23 +++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 ext/base-licenses diff --git a/Dockerfile b/Dockerfile index ebcd452..6a50698 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN echo "en_US.UTF-8 UTF-8 " >> /etc/locale.gen && locale-gen && eselect loca ENV LC_ALL=en_US.UTF-8 # Upgrading portage -RUN emerge --sync > /dev/null 2>&1 && layman -a sabayon +RUN emerge --sync --quiet && layman -a sabayon # Configure the sabayon box, installing equo setting up locales ADD ./script/sabayon-configuration.sh / @@ -27,6 +27,13 @@ RUN /bin/bash /sabayon-configuration-build.sh && rm -rf /sabayon-configuration-b # Perform before-upgrade tasks (mirror sorting, updating repository db, removing portage and keeping profiles and metadata) RUN mv /etc/entropy/repositories.conf.d/entropy_sabayonlinux.org.example /etc/entropy/repositories.conf.d/entropy_sabayonlinux.org && equo up && equo repo mirrorsort sabayonlinux.org && cd /usr/portage/;ls | grep -v 'profiles' | grep -v 'metadata' | xargs rm -rf +# Accepting licenses needed to continue automatic install/upgrade +ADD ./ext/base-licenses /etc/entropy/packages/license.accept + +# Upgrading packages +RUN equo u &&\ + echo -5 | equo conf update + # Cleanup and applying configs ADD ./script/post-update.sh /post-update.sh RUN /bin/bash /post-update.sh && rm -rf /post-update.sh diff --git a/ext/base-licenses b/ext/base-licenses new file mode 100644 index 0000000..e75e1cc --- /dev/null +++ b/ext/base-licenses @@ -0,0 +1,23 @@ +AGPL-3 +CC-BY-SA-3.0 +CC0-1.0 +GPL-1+ +HPND +IJG +MPL-2.0 +Old-MIT +PCRE +RSA +Ruby-BSD +SMAIL +TermReadKey +UoI-NCSA +inner-net +libmng +libpng +libtiff +rc +tcltk +man-pages +man-pages-posix-2013 +docbook