Skip to content

GitLab

Commit aa6b048c authored by James T. Lee's avatar James T. Lee
Browse files

Set locale after it is generated by Puppet

parent e969bd68
Pipeline #304 failed with stage
in 267 minutes
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
Containerfile
View file @ aa6b048c
...@@ -7,15 +7,15 @@ ARG FACTER_makeopts ...@@ -7,15 +7,15 @@ ARG FACTER_makeopts
ARG FEATURES ARG FEATURES
ARG PROFILE ARG PROFILE
RUN eix-sync -q
# Configure locales and set up some conveniences
RUN puppet agent --test --certname ci --environment main --tags nest::base::distcc,nest::base::locale,nest::base::portage,nest::base::puppet --logdir /var/log/puppet --rundir /var/run/puppet --vardir /var/lib/puppet --runtimeout 0; [ $? -eq 2 ]
# Locale is managed by Puppet, but # Locale is managed by Puppet, but
# it also needs to be persisted in the image. # it also needs to be persisted in the image.
ENV LANG=en_US.UTF-8 ENV LANG=en_US.UTF-8
RUN eix-sync -q
# Set up some conveniences
RUN puppet agent --test --certname ci --environment main --tags nest::base::distcc,nest::base::portage,nest::base::puppet --logdir /var/log/puppet --rundir /var/run/puppet --vardir /var/lib/puppet --runtimeout 0; [ $? -eq 2 ]
# Switch to desired profile and make the base system consistent with it, # Switch to desired profile and make the base system consistent with it,
# breaking out of a possible circular dependency between mesa and libva. # breaking out of a possible circular dependency between mesa and libva.
RUN eselect profile set "nest:${PROFILE}" RUN eselect profile set "nest:${PROFILE}"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment