From 3c28c02f26a53f98e80d3e389bdd8a17a96255d2 Mon Sep 17 00:00:00 2001 From: mudler Date: Fri, 13 Nov 2015 10:59:19 +0100 Subject: [PATCH] moving locale settings inside script/sabayon-configuration --- Dockerfile | 3 --- circle.yml | 2 +- script/sabayon-configuration.sh | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index b19492a..c2c5f6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,6 @@ 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 and installing necessary packages @@ -43,5 +42,3 @@ WORKDIR /root # Define default command. CMD ["bash"] - - diff --git a/circle.yml b/circle.yml index 25fe6a7..7d1151f 100644 --- a/circle.yml +++ b/circle.yml @@ -5,7 +5,7 @@ machine: dependencies: override: - docker info - - docker pull sabayon/base-amd64 + - docker build -t sabayon/base-amd64 . - docker export $(docker run -i -t sabayon/base-amd64 true && docker ps -aq | xargs echo | cut -d ' ' -f 1) | docker import - sabayon/base-amd64-squashed test: diff --git a/script/sabayon-configuration.sh b/script/sabayon-configuration.sh index ea8c3b4..a17f816 100644 --- a/script/sabayon-configuration.sh +++ b/script/sabayon-configuration.sh @@ -7,6 +7,8 @@ for f in /etc/env.d/02locale /etc/locale.conf; do echo LC_ALL=en_US.UTF-8 >> "${f}" done +echo "en_US.UTF-8 UTF-8 " >> /etc/locale.gen && locale-gen && eselect locale set en_US.utf8 && env-update && source /etc/profile + # Defyning /usr/local/portage configuration mkdir /usr/local/portage mkdir -p /usr/local/portage/metadata/ @@ -35,12 +37,10 @@ eselect python set python2.7 # Specifying a gentoo profile eselect profile set default/linux/amd64/13.0/desktop -# default to opendns for next stage(s) +# default for next stage(s) echo "nameserver 8.8.8.8" > /etc/resolv.conf # set default shell chsh -s /bin/bash rm -rf /etc/make.profile - -