Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
b799d57e
Commit
b799d57e
authored
Oct 15, 2015
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #15642 from dchen1107/docker
Auto commit by PR queue bot
parents
b8aabbbf
03fb7440
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
init.sls
cluster/saltbase/salt/docker/init.sls
+5
-5
No files found.
cluster/saltbase/salt/docker/init.sls
View file @
b799d57e
...
...
@@ -99,16 +99,16 @@ net.ipv4.ip_forward:
{% set storage_base='https://storage.googleapis.com/kubernetes-release/docker/' %}
# Only upgrade Docker to 1.8.
2
for the containerVM image.
# Only upgrade Docker to 1.8.
3
for the containerVM image.
# TODO(dchen1107): For release 1.1, we want to update the ContainerVM image to
# include Docker 1.8.
2
and comment out the upgrade below.
# include Docker 1.8.
3
and comment out the upgrade below.
{% if grains.get('cloud', '') == 'gce'
and grains.get('os_family', '') == 'Debian'
and grains.get('oscodename', '') == 'wheezy' -%}
{% set docker_pkg_name='docker-engine' %}
{% set override_deb='docker-engine_1.8.
2
-0~wheezy_amd64.deb' %}
{% set override_deb_sha1='
dcff80bffcbde458508da58d2a9fe7bef8eed404
' %}
{% set override_docker_ver='1.8.
2
-0~wheezy' %}
{% set override_deb='docker-engine_1.8.
3
-0~wheezy_amd64.deb' %}
{% set override_deb_sha1='
f812e1134e7375b29886a372a6e24d04e1ee33c9
' %}
{% set override_docker_ver='1.8.
3
-0~wheezy' %}
{% else %}
{% set docker_pkg_name='lxc-docker-1.7.1' %}
{% set override_docker_ver='1.7.1' %}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment