From 7f2287bd541225b204eae0759cb5b7d5b664e540 Mon Sep 17 00:00:00 2001 From: mudler Date: Fri, 3 Jul 2015 02:14:11 +0200 Subject: [PATCH 01/13] switching to sabayon gentoo based image as a base layer --- Dockerfile | 10 +++++++--- script/post-update.sh | 3 +++ script/sabayon-configuration.sh | 13 ++++--------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index c740034..afa2a9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,15 @@ -FROM plabedan/gentoo +FROM sabayon/gentoo-stage3-base-amd64 + +MAINTAINER mudler # 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 ENV LC_ALL=en_US.UTF-8 -# Upgrading portage -RUN emerge --sync > /dev/null 2>&1 && layman -a sabayon +# Upgrading portage and installing necessary packages +RUN rm -rf '/usr/portage/metadata/timestamp.chk' && \ + emerge --sync --quiet && \ + layman -S && layman -a sabayon # Configure the sabayon box, installing equo setting up locales ADD ./script/sabayon-configuration.sh / diff --git a/script/post-update.sh b/script/post-update.sh index 46f76b2..1da6530 100644 --- a/script/post-update.sh +++ b/script/post-update.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Remove compilation tools +equo rm --nodeps --force-system autoconf automake bison yacc binutils libtool gcc localepurge + # Remove scripts rm -rf /equo-rescue-generate.exp rm -rf /equo.sql diff --git a/script/sabayon-configuration.sh b/script/sabayon-configuration.sh index 4fbbc16..ea8c3b4 100644 --- a/script/sabayon-configuration.sh +++ b/script/sabayon-configuration.sh @@ -14,8 +14,6 @@ mkdir -p /usr/local/portage/profiles/ echo "masters = gentoo" > /usr/local/portage/metadata/layout.conf echo "user_defined" > /usr/local/portage/profiles/repo_name -emerge -C =dev-python/python-exec-0.3.1 - mkdir -p /etc/portage/package.keywords/ echo "app-admin/equo ~amd64 sys-apps/entropy ~amd64 @@ -28,20 +26,17 @@ sys-apps/file python # emerging equo and expect -emerge -vt equo --autounmask-write || exit 1 -emerge expect || exit 1 +USE="ncurses" emerge -j -vt equo --autounmask-write || exit 1 +emerge -j expect || exit 1 -# Choosing only python2.7 for now, cleaning others +# Enforce choosing only python2.7 for now, cleaning others eselect python set python2.7 -# Removing other versions of python -emerge -C python:3.2 python:3.3 - # Specifying a gentoo profile eselect profile set default/linux/amd64/13.0/desktop # default to opendns for next stage(s) -echo "nameserver 208.67.222.222" > /etc/resolv.conf +echo "nameserver 8.8.8.8" > /etc/resolv.conf # set default shell chsh -s /bin/bash From a0ac9d78865e577d9b5c17bdd82d79bf770b575e Mon Sep 17 00:00:00 2001 From: mudler Date: Fri, 3 Jul 2015 23:51:57 +0200 Subject: [PATCH 02/13] setting gentoo.conf --- script/post-update.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/script/post-update.sh b/script/post-update.sh index 1da6530..9f680d2 100644 --- a/script/post-update.sh +++ b/script/post-update.sh @@ -1,5 +1,15 @@ #!/bin/bash +mkdir -p /etc/portage/repos.conf/ +echo "[DEFAULT] +main-repo = gentoo + +[gentoo] +location = /usr/portage +sync-type = rsync +sync-uri = rsync://rsync.europe.gentoo.org/gentoo-portage +" > /etc/portage/repos.conf/gentoo.conf + # Remove compilation tools equo rm --nodeps --force-system autoconf automake bison yacc binutils libtool gcc localepurge From 769e7d57c87a6288975d600310df28fa79c51c4e Mon Sep 17 00:00:00 2001 From: mudler Date: Sat, 4 Jul 2015 12:31:47 +0200 Subject: [PATCH 03/13] [script/post-update] since we generate the base from snapshot of stage-3, could happen that entropy doesn't still have new versions --- script/post-update.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/script/post-update.sh b/script/post-update.sh index 9f680d2..8b28cf0 100644 --- a/script/post-update.sh +++ b/script/post-update.sh @@ -11,7 +11,7 @@ sync-uri = rsync://rsync.europe.gentoo.org/gentoo-portage " > /etc/portage/repos.conf/gentoo.conf # Remove compilation tools -equo rm --nodeps --force-system autoconf automake bison yacc binutils libtool gcc localepurge +equo rm --nodeps --force-system autoconf automake bison yacc gcc localepurge # Remove scripts rm -rf /equo-rescue-generate.exp @@ -31,5 +31,20 @@ rm -rf /etc/zsh rm -rf /post-update.sh +equo i --nodeps rsync +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 + +# Forcing to reinstall already installed packages +equo i $(equo q list installed -qv | sed 's/-[0-9]\{1,\}.*$//' | xargs echo) +#equo i $(cat /etc/sabayon-pkglist | xargs echo) + +# cleaning licenses accepted +rm -rf /etc/entropy/packages/license.accept +rm -rf /usr/portage/licenses + + # Writing package list file equo q list installed -qv > /etc/sabayon-pkglist + +equo cleanup From 3386c540e5abdc74c173b562256c579236cdf01d Mon Sep 17 00:00:00 2001 From: mudler Date: Sat, 4 Jul 2015 15:08:38 +0200 Subject: [PATCH 04/13] reinstalling basic tools from -base --- script/post-update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/post-update.sh b/script/post-update.sh index 8b28cf0..da2373e 100644 --- a/script/post-update.sh +++ b/script/post-update.sh @@ -39,11 +39,12 @@ ls /usr/portage/licenses -1 | xargs -0 > /etc/entropy/packages/license.accept equo i $(equo q list installed -qv | sed 's/-[0-9]\{1,\}.*$//' | xargs echo) #equo i $(cat /etc/sabayon-pkglist | xargs echo) +equo i --nodeps grep busybox patch + # cleaning licenses accepted rm -rf /etc/entropy/packages/license.accept rm -rf /usr/portage/licenses - # Writing package list file equo q list installed -qv > /etc/sabayon-pkglist From f0a676a5a1db7c711ccefe261ee58a8e783baff8 Mon Sep 17 00:00:00 2001 From: mudler Date: Sat, 4 Jul 2015 19:01:09 +0200 Subject: [PATCH 05/13] reinstalls not needed anymore in this stage --- Dockerfile | 1 + script/post-update.sh | 18 +++++------------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index afa2a9f..f364b99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ FROM sabayon/gentoo-stage3-base-amd64 + MAINTAINER mudler # Set locales to en_US.UTF-8 diff --git a/script/post-update.sh b/script/post-update.sh index da2373e..3e67eef 100644 --- a/script/post-update.sh +++ b/script/post-update.sh @@ -13,6 +13,11 @@ sync-uri = rsync://rsync.europe.gentoo.org/gentoo-portage # Remove compilation tools equo rm --nodeps --force-system autoconf automake bison yacc gcc localepurge +# Writing package list file +equo q list installed -qv > /etc/sabayon-pkglist + +equo cleanup + # Remove scripts rm -rf /equo-rescue-generate.exp rm -rf /equo.sql @@ -31,21 +36,8 @@ rm -rf /etc/zsh rm -rf /post-update.sh -equo i --nodeps rsync -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 - -# Forcing to reinstall already installed packages -equo i $(equo q list installed -qv | sed 's/-[0-9]\{1,\}.*$//' | xargs echo) -#equo i $(cat /etc/sabayon-pkglist | xargs echo) - -equo i --nodeps grep busybox patch - # cleaning licenses accepted rm -rf /etc/entropy/packages/license.accept rm -rf /usr/portage/licenses -# Writing package list file -equo q list installed -qv > /etc/sabayon-pkglist -equo cleanup From 5280cc14e4a39fceef119edabdcf615529f14428 Mon Sep 17 00:00:00 2001 From: mudler Date: Sun, 5 Jul 2015 17:17:08 +0200 Subject: [PATCH 06/13] 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 07/13] 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 From a7ccc52223720338e54d29f2d29ab233e813202e Mon Sep 17 00:00:00 2001 From: mudler Date: Sun, 5 Jul 2015 19:30:42 +0200 Subject: [PATCH 08/13] oops, left from merge --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 55462e9..efcbd63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,6 @@ MAINTAINER mudler RUN echo "en_US.UTF-8 UTF-8 " >> /etc/locale.gen && locale-gen && eselect locale set en_US.utf8 && env-update && source /etc/profile ENV LC_ALL=en_US.UTF-8 -<<<<<<< HEAD # Upgrading portage RUN emerge --sync --quiet && layman -S && layman -a sabayon From 36c4b617f56003eced6c158137824c2274ffcd5d Mon Sep 17 00:00:00 2001 From: mudler Date: Mon, 6 Jul 2015 12:06:56 +0200 Subject: [PATCH 09/13] [script/post-update] cleaning up also in this phase --- script/post-update.sh | 129 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 105 insertions(+), 24 deletions(-) diff --git a/script/post-update.sh b/script/post-update.sh index 3e67eef..baabfb7 100644 --- a/script/post-update.sh +++ b/script/post-update.sh @@ -1,5 +1,106 @@ #!/bin/bash + +PACKAGES_TO_REMOVE=( + "sys-devel/llvm" + "dev-libs/ppl" + "app-admin/sudo" + "x11-libs/gtk+:3" + "x11-libs/gtk+:2" + "dev-db/mariadb" + "sys-fs/ntfs3g" + "app-accessibility/at-spi2-core" + "app-accessibility/at-spi2-atk" + "sys-devel/base-gcc:4.7" + "sys-devel/gcc:4.7" + "net-print/cups" + "dev-util/gtk-update-icon-cache" + "dev-qt/qtscript" + "dev-qt/qtchooser" + "dev-qt/qtcore" + "app-shells/zsh" + "app-shells/zsh-pol-config" + "dev-db/mysql-init-scripts" + "dev-lang/ruby" + "app-editors/vim" + "dev-util/gtk-doc-am" + "media-gfx/graphite2" + "x11-apps/xset" + "x11-themes/hicolor-icon-theme" + "media-libs/tiff" + "app-eselect/eselect-lcdfilter" + "app-eselect/eselect-mesa" + "app-eselect/eselect-opengl" + "app-eselect/eselect-qtgraphicssystem" + "x11-libs/pixman" + "x11-libs/libvdpau" + "x11-libs/libxshmfence" + "x11-libs/libXxf86vm" + "x11-libs/libXinerama" + "x11-libs/libXdamage" + "x11-libs/libXcursor" + "x11-libs/libXfixes" + "x11-libs/libXv" + "x11-libs/libXcomposite" + "x11-libs/libXrandr" + "media-libs/jbig2dec" + "dev-libs/libcroco" + "app-text/qpdf" + "media-fonts/urw-fonts" + "app-text/libpaper" + "dev-python/snakeoil" + "dev-libs/atk" + "dev-perl/DBI" + "perl-core/Digest-MD5" + "perl-core/MIME-Base64" + "perl-core/File-Temp" + "perl-core/ExtUtils-MakeMaker" + "perl-core/Params-Check" + "perl-core/Module-CoreList" + "perl-core/Digest" + "dev-perl/TermReadKey" + "dev-perl/Test-Deep" + "virtual/perl-IO-Zlib" + "virtual/perl-Package-Constants" + "virtual/perl-Term-ANSIColor" + "virtual/perl-Time-HiRes" + "app-text/asciidoc" + "app-text/sgml-common" + "virtual/python-argparse" + "sys-power/upower" + "dev-python/py" + "dev-vcs/git" + "dev-tcltk/expect" + "app-admin/python-updater" + "app-portage/eix" + "app-portage/gentoolkit" + "app-portage/gentoopm" +) + +FILES_TO_REMOVE=( + "/.viminfo" + "/.history" + "/.zcompdump" + "/var/log/emerge.log" + "/var/log/emerge-fetch.log" + "/equo-rescue-generate.exp" + "/equo.sql" + "/generate-equo-db.sh" + "/post-upgrade.sh" + "/sabayon-configuration-build.sh" + "/sabayon-configuration.sh" + "/post-upgrade.sh" + "/usr/portage/metadata/md5-cache/*" + "/var/log/emerge/*" + "/var/log/entropy/*" + "/root/*" + "/root/.*" + "/etc/zsh" + "/post-update.sh" + "/etc/entropy/packages/license.accept" + "/usr/portage/licenses" +) + mkdir -p /etc/portage/repos.conf/ echo "[DEFAULT] main-repo = gentoo @@ -12,32 +113,12 @@ sync-uri = rsync://rsync.europe.gentoo.org/gentoo-portage # Remove compilation tools equo rm --nodeps --force-system autoconf automake bison yacc gcc localepurge +# Remove packages +equo rm --deep --configfiles --force-system "${PACKAGES_TO_REMOVE[@]}" # Writing package list file equo q list installed -qv > /etc/sabayon-pkglist +# Cleanup equo cleanup - -# Remove scripts -rm -rf /equo-rescue-generate.exp -rm -rf /equo.sql -rm -rf /generate-equo-db.sh -rm -rf /post-upgrade.sh -rm -rf /sabayon-configuration-build.sh -rm -rf /sabayon-configuration.sh -rm -rf /post-upgrade.sh - -# Cleaning portage metadata cache -rm -rf /usr/portage/metadata/md5-cache/* -rm -rf /var/log/emerge/* -rm -rf /var/log/entropy/* -rm -rf /root/* /root/.* -rm -rf /etc/zsh - -rm -rf /post-update.sh - -# cleaning licenses accepted -rm -rf /etc/entropy/packages/license.accept -rm -rf /usr/portage/licenses - - +rm -rf "${FILES_TO_REMOVE[@]}" From 62e06879076793238457e1aef9065a14d8f0ca38 Mon Sep 17 00:00:00 2001 From: mudler Date: Mon, 6 Jul 2015 13:34:49 +0200 Subject: [PATCH 10/13] Revert "[script/post-update] cleaning up also in this phase" This reverts commit 36c4b617f56003eced6c158137824c2274ffcd5d. --- script/post-update.sh | 129 ++++++++---------------------------------- 1 file changed, 24 insertions(+), 105 deletions(-) diff --git a/script/post-update.sh b/script/post-update.sh index baabfb7..3e67eef 100644 --- a/script/post-update.sh +++ b/script/post-update.sh @@ -1,106 +1,5 @@ #!/bin/bash - -PACKAGES_TO_REMOVE=( - "sys-devel/llvm" - "dev-libs/ppl" - "app-admin/sudo" - "x11-libs/gtk+:3" - "x11-libs/gtk+:2" - "dev-db/mariadb" - "sys-fs/ntfs3g" - "app-accessibility/at-spi2-core" - "app-accessibility/at-spi2-atk" - "sys-devel/base-gcc:4.7" - "sys-devel/gcc:4.7" - "net-print/cups" - "dev-util/gtk-update-icon-cache" - "dev-qt/qtscript" - "dev-qt/qtchooser" - "dev-qt/qtcore" - "app-shells/zsh" - "app-shells/zsh-pol-config" - "dev-db/mysql-init-scripts" - "dev-lang/ruby" - "app-editors/vim" - "dev-util/gtk-doc-am" - "media-gfx/graphite2" - "x11-apps/xset" - "x11-themes/hicolor-icon-theme" - "media-libs/tiff" - "app-eselect/eselect-lcdfilter" - "app-eselect/eselect-mesa" - "app-eselect/eselect-opengl" - "app-eselect/eselect-qtgraphicssystem" - "x11-libs/pixman" - "x11-libs/libvdpau" - "x11-libs/libxshmfence" - "x11-libs/libXxf86vm" - "x11-libs/libXinerama" - "x11-libs/libXdamage" - "x11-libs/libXcursor" - "x11-libs/libXfixes" - "x11-libs/libXv" - "x11-libs/libXcomposite" - "x11-libs/libXrandr" - "media-libs/jbig2dec" - "dev-libs/libcroco" - "app-text/qpdf" - "media-fonts/urw-fonts" - "app-text/libpaper" - "dev-python/snakeoil" - "dev-libs/atk" - "dev-perl/DBI" - "perl-core/Digest-MD5" - "perl-core/MIME-Base64" - "perl-core/File-Temp" - "perl-core/ExtUtils-MakeMaker" - "perl-core/Params-Check" - "perl-core/Module-CoreList" - "perl-core/Digest" - "dev-perl/TermReadKey" - "dev-perl/Test-Deep" - "virtual/perl-IO-Zlib" - "virtual/perl-Package-Constants" - "virtual/perl-Term-ANSIColor" - "virtual/perl-Time-HiRes" - "app-text/asciidoc" - "app-text/sgml-common" - "virtual/python-argparse" - "sys-power/upower" - "dev-python/py" - "dev-vcs/git" - "dev-tcltk/expect" - "app-admin/python-updater" - "app-portage/eix" - "app-portage/gentoolkit" - "app-portage/gentoopm" -) - -FILES_TO_REMOVE=( - "/.viminfo" - "/.history" - "/.zcompdump" - "/var/log/emerge.log" - "/var/log/emerge-fetch.log" - "/equo-rescue-generate.exp" - "/equo.sql" - "/generate-equo-db.sh" - "/post-upgrade.sh" - "/sabayon-configuration-build.sh" - "/sabayon-configuration.sh" - "/post-upgrade.sh" - "/usr/portage/metadata/md5-cache/*" - "/var/log/emerge/*" - "/var/log/entropy/*" - "/root/*" - "/root/.*" - "/etc/zsh" - "/post-update.sh" - "/etc/entropy/packages/license.accept" - "/usr/portage/licenses" -) - mkdir -p /etc/portage/repos.conf/ echo "[DEFAULT] main-repo = gentoo @@ -113,12 +12,32 @@ sync-uri = rsync://rsync.europe.gentoo.org/gentoo-portage # Remove compilation tools equo rm --nodeps --force-system autoconf automake bison yacc gcc localepurge -# Remove packages -equo rm --deep --configfiles --force-system "${PACKAGES_TO_REMOVE[@]}" # Writing package list file equo q list installed -qv > /etc/sabayon-pkglist -# Cleanup equo cleanup -rm -rf "${FILES_TO_REMOVE[@]}" + +# Remove scripts +rm -rf /equo-rescue-generate.exp +rm -rf /equo.sql +rm -rf /generate-equo-db.sh +rm -rf /post-upgrade.sh +rm -rf /sabayon-configuration-build.sh +rm -rf /sabayon-configuration.sh +rm -rf /post-upgrade.sh + +# Cleaning portage metadata cache +rm -rf /usr/portage/metadata/md5-cache/* +rm -rf /var/log/emerge/* +rm -rf /var/log/entropy/* +rm -rf /root/* /root/.* +rm -rf /etc/zsh + +rm -rf /post-update.sh + +# cleaning licenses accepted +rm -rf /etc/entropy/packages/license.accept +rm -rf /usr/portage/licenses + + From 815a3b0c3991f90a2bd257d49ce15b7b9f494e95 Mon Sep 17 00:00:00 2001 From: mudler Date: Mon, 6 Jul 2015 13:34:50 +0200 Subject: [PATCH 11/13] Revert "oops, left from merge" This reverts commit a7ccc52223720338e54d29f2d29ab233e813202e. --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index efcbd63..55462e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ MAINTAINER mudler RUN echo "en_US.UTF-8 UTF-8 " >> /etc/locale.gen && locale-gen && eselect locale set en_US.utf8 && env-update && source /etc/profile ENV LC_ALL=en_US.UTF-8 +<<<<<<< HEAD # Upgrading portage RUN emerge --sync --quiet && layman -S && layman -a sabayon From 01e0a4b3ffb6637775605655555e56a52d14ae7f Mon Sep 17 00:00:00 2001 From: mudler Date: Mon, 6 Jul 2015 13:34:53 +0200 Subject: [PATCH 12/13] Revert "solving merge conflicts" This reverts commit 3aef8d6b22e674bdc06215000df918b89cf1a39a, reversing changes made to f0a676a5a1db7c711ccefe261ee58a8e783baff8. --- Dockerfile | 14 +++++--------- ext/base-licenses | 23 ----------------------- 2 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 ext/base-licenses diff --git a/Dockerfile b/Dockerfile index 55462e9..f364b99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,16 @@ FROM sabayon/gentoo-stage3-base-amd64 + MAINTAINER mudler # 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 ENV LC_ALL=en_US.UTF-8 -<<<<<<< HEAD -# Upgrading portage -RUN emerge --sync --quiet && layman -S && layman -a sabayon +# Upgrading portage and installing necessary packages +RUN rm -rf '/usr/portage/metadata/timestamp.chk' && \ + emerge --sync --quiet && \ + layman -S && layman -a sabayon # Configure the sabayon box, installing equo setting up locales ADD ./script/sabayon-configuration.sh / @@ -30,12 +32,6 @@ 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 upgrade -RUN rsync -a "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 - # 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 deleted file mode 100644 index e75e1cc..0000000 --- a/ext/base-licenses +++ /dev/null @@ -1,23 +0,0 @@ -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 From ff53b00c5dfa10f6f1f6bd176aaae9c02907d16d Mon Sep 17 00:00:00 2001 From: mudler Date: Mon, 6 Jul 2015 13:36:31 +0200 Subject: [PATCH 13/13] [Dockerfile] Reverting, in this phase it's better to not upgrade packages, images will bloat --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f364b99..afa2a9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ FROM sabayon/gentoo-stage3-base-amd64 - MAINTAINER mudler # Set locales to en_US.UTF-8