diff --git a/Dockerfile b/Dockerfile index deb8b71..fb7671c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,8 +74,6 @@ ADD ./conf/spinbase-licenses /etc/entropy/packages/license.accept # Specifying a gentoo profile RUN eselect profile set 3 -RUN equo i app-misc/ca-certificates --relaxed --nodeps - # Portage configurations ADD ./script/sabayon-build.sh /sabayon-build.sh RUN chmod +x /sabayon-build.sh @@ -86,7 +84,7 @@ RUN equo u # Handling install/removal of packages specified in env (and also the basic needed) # XXX: sabayon-artwork-core and linux-sabayon should be moved in molecules file -RUN equo i linux-sabayon sabayon-artwork-core sabayon-version $PACKAGES_TO_ADD +RUN equo i app-misc/ca-certificates linux-sabayon sabayon-artwork-core sabayon-version $PACKAGES_TO_ADD RUN equo rm $PACKAGES_TO_REMOVE # Cleaning accepted licenses diff --git a/script/sabayon-build.sh b/script/sabayon-build.sh index e812f4e..587bd82 100644 --- a/script/sabayon-build.sh +++ b/script/sabayon-build.sh @@ -12,10 +12,10 @@ ln -sf package.env.amd64 package.env git add make.conf package.env git config --global user.name "root" git config --global user.email "root@localhost" -git commit +git commit -m "saving my configurations" # rename the gentoo /etc/make.conf and /etc/portage/: cd /etc/ mv portage portage-gentoo -mv make.conf make.conf-gentoo +#mv make.conf make.conf-gentoo # symlink to sabayon /etc/make.conf /etc/portage/: ln -sf /opt/sabayon-build/conf/intel/portage portage