From 65a86ca8ce175c505400116ffe2dc0491966efac Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 26 Feb 2014 11:31:59 -0800 Subject: [PATCH] salt-minion/Dockerfile.template: Bump to Salt v2014.1.0 With 17ca2ae (Merge pull request #9024 from cachedout/#8976, 2013-12-05, saltstack/salt#9024, [1]), Salt gained the ability to report LXC-ness as a grain, which is useful if you're writing Salt states that will run in Docker containers. The series landed before the v2014.1 tag and was released with v2014.1.0. [1]: https://github.com/saltstack/salt/pull/9024 --- salt-minion/Dockerfile.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt-minion/Dockerfile.template b/salt-minion/Dockerfile.template index 7f32d3d..f48a3c9 100644 --- a/salt-minion/Dockerfile.template +++ b/salt-minion/Dockerfile.template @@ -30,7 +30,7 @@ RUN echo 'app-admin/salt git' >> /etc/portage/package.use # required by app-admin/salt (argument) RUN echo '=dev-python/pyyaml-3.10-r1 ~amd64' >> /etc/portage/package.accept_keywords # required by app-admin/salt (argument) -RUN echo '=app-admin/salt-0.17.4-r2 ~amd64' >> /etc/portage/package.accept_keywords +RUN echo '=app-admin/salt-9999 **' >> /etc/portage/package.accept_keywords # required by app-admin/salt-0.17.4-r2 # required by app-admin/salt (argument) RUN echo '=dev-python/pycryptopp-0.6.0 ~amd64' >> /etc/portage/package.accept_keywords @@ -51,7 +51,7 @@ RUN echo '=dev-python/async-0.6.1-r1 ~amd64' >> /etc/portage/package.accept_keyw # required by dev-python/git-python (argument) RUN echo '=dev-python/smmap-0.8.2-r1 ~amd64' >> /etc/portage/package.accept_keywords -RUN emerge -v app-admin/salt dev-python/git-python +RUN salt_LIVE_COMMIT=v2014.1.0 emerge -v =app-admin/salt-9999 dev-python/git-python RUN eselect news read new RUN rc-update add salt-minion default -- 2.26.2