projects
/
dockerfile.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5435169
)
salt/Dockerfile.template: After selecting Python 2, make it the default
author
W. Trevor King
<wking@tremily.us>
Sat, 15 Nov 2014 05:20:10 +0000
(21:20 -0800)
committer
W. Trevor King
<wking@tremily.us>
Sat, 15 Nov 2014 05:20:10 +0000
(21:20 -0800)
No sense in having 'python' point at Python 3 if could get depcleaned
later.
salt/Dockerfile.template
patch
|
blob
|
history
diff --git
a/salt/Dockerfile.template
b/salt/Dockerfile.template
index d3620a37c661610396f6a24602fa0d1b1a923186..d9df89e582439c90c98924fbdfcf72fd07dfa146 100644
(file)
--- a/
salt/Dockerfile.template
+++ b/
salt/Dockerfile.template
@@
-31,6
+31,7
@@
RUN sed -i 's/\(PYTHON_TARGETS\)=.*/\1="python2_7"/' /etc/portage/make.conf
RUN sed -i 's/\(PYTHON_SINGLE_TARGET\)=.*/\1="python2_7"/' /etc/portage/make.conf
RUN echo 'USE_PYTHON="2.7"' >> /etc/portage/make.conf
RUN emerge -v --newuse --deep --with-bdeps=y @system @world
+RUN eselect python set $(eselect python show --python2)
RUN mkdir /etc/portage/package.accept_keywords
RUN mkdir /etc/portage/package.use