From 930c7ce36f91d1b03eadcc604edfb73b14983b4e Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Sun, 9 Jul 2017 14:53:13 +0200 Subject: [PATCH] Revert "Dockerfile: switch to ACCEPT_LICENSE=*" This reverts commit e04bb1c338706f1c005f897f43694dcace048c88. --- Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c3fd46..0f4bd50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,13 +4,15 @@ MAINTAINER mudler # Set locales to en_US.UTF-8 ENV LC_ALL=en_US.UTF-8 -# Accept all licenses -ENV ACCEPT_LICENSE=* + +# 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 up && equo u && \ +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 up && equo u && \ echo -5 | equo conf update RUN /bin/bash /post-upgrade.sh && \