Skip to content

GitLab

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

Break out of circular dependency in workstation build

parent d1ad3052
Pipeline #297 canceled with stage
in 5 minutes and 47 seconds
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 0 deletions
Containerfile
View file @ 31eb7ff2
...@@ -6,12 +6,21 @@ ARG FACTER_makeopts ...@@ -6,12 +6,21 @@ ARG FACTER_makeopts
ARG PROFILE ARG PROFILE
RUN eix-sync -q RUN eix-sync -q
# Set up some conveniences
RUN FACTER_build=stage1 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 ] RUN FACTER_build=stage1 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,
# breaking out of a possible circular dependency between mesa and libva.
RUN eselect profile set "nest:${PROFILE}" RUN eselect profile set "nest:${PROFILE}"
RUN emerge --info RUN emerge --info
RUN USE='-vaapi' emerge -v --update --deep --newuse --with-bdeps=y @world
RUN emerge -v --update --deep --newuse --with-bdeps=y @world RUN emerge -v --update --deep --newuse --with-bdeps=y @world
RUN emerge --depclean RUN emerge --depclean
# Configure the stage
RUN FACTER_build=stage1 puppet agent --test --runtimeout 0; [ $? -eq 2 ] RUN FACTER_build=stage1 puppet agent --test --runtimeout 0; [ $? -eq 2 ]
RUN rm -rf /var/db/repos RUN rm -rf /var/db/repos
CMD ["/bin/zsh"] CMD ["/bin/zsh"]
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