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
00bc7dd0
Commit
00bc7dd0
authored
May 18, 2015
by
Victor Marmol
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8470 from brendandburns/docker
Update docker instructions to 0.17.0
parents
2307350d
cbef26b1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
Makefile
cluster/images/hyperkube/Makefile
+1
-1
docker.md
docs/getting-started-guides/docker.md
+2
-2
No files found.
cluster/images/hyperkube/Makefile
View file @
00bc7dd0
# build the hyperkube image.
# build the hyperkube image.
VERSION
=
v0.1
6.2
VERSION
=
v0.1
7.0
all
:
all
:
cp
../../saltbase/salt/helpers/safe_format_and_mount .
cp
../../saltbase/salt/helpers/safe_format_and_mount .
...
...
docs/getting-started-guides/docker.md
View file @
00bc7dd0
...
@@ -12,7 +12,7 @@ docker run --net=host -d gcr.io/google_containers/etcd:2.0.9 /usr/local/bin/etcd
...
@@ -12,7 +12,7 @@ docker run --net=host -d gcr.io/google_containers/etcd:2.0.9 /usr/local/bin/etcd
### Step Two: Run the master
### Step Two: Run the master
```
sh
```
sh
docker run
--net
=
host
-d
-v
/var/run/docker.sock:/var/run/docker.sock gcr.io/google_containers/hyperkube:v0.1
6.2
/hyperkube kubelet
--api_servers
=
http://localhost:8080
--v
=
2
--address
=
0.0.0.0
--enable_server
--hostname_override
=
127.0.0.1
--config
=
/etc/kubernetes/manifests
docker run
--net
=
host
-d
-v
/var/run/docker.sock:/var/run/docker.sock gcr.io/google_containers/hyperkube:v0.1
7.0
/hyperkube kubelet
--api_servers
=
http://localhost:8080
--v
=
2
--address
=
0.0.0.0
--enable_server
--hostname_override
=
127.0.0.1
--config
=
/etc/kubernetes/manifests
```
```
This actually runs the kubelet, which in turn runs a
[
pod
](
http://docs.k8s.io/pods.md
)
that contains the other master components.
This actually runs the kubelet, which in turn runs a
[
pod
](
http://docs.k8s.io/pods.md
)
that contains the other master components.
...
@@ -20,7 +20,7 @@ This actually runs the kubelet, which in turn runs a [pod](http://docs.k8s.io/po
...
@@ -20,7 +20,7 @@ This actually runs the kubelet, which in turn runs a [pod](http://docs.k8s.io/po
### Step Three: Run the service proxy
### Step Three: Run the service proxy
*Note, this could be combined with master above, but it requires --privileged for iptables manipulation*
*Note, this could be combined with master above, but it requires --privileged for iptables manipulation*
```
sh
```
sh
docker run
-d
--net
=
host
--privileged
gcr.io/google_containers/hyperkube:v0.1
6.2
/hyperkube proxy
--master
=
http://127.0.0.1:8080
--v
=
2
docker run
-d
--net
=
host
--privileged
gcr.io/google_containers/hyperkube:v0.1
7.0
/hyperkube proxy
--master
=
http://127.0.0.1:8080
--v
=
2
```
```
### Test it out
### Test it out
...
...
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