rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-17 22:38:22 +00:00
Code Issues Releases Wiki Activity
1,745 Commits 23 Branches 183 Tags 80 MiB
1e6d38cbf0
Commit Graph

1745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Mikushin
63bc914462 Merge pull request #625 from datawolf/add-double-quotation-marks 
config/types.go: add "" to field tag
 2015-11-03 18:41:10 +05:00
Ivan Mikushin
283299f84e add a test 2015-11-03 18:32:59 +05:00
Ivan Mikushin
97807a52c1 Always use bundled docker for system-docker. 
Fixes system-docker CLI breaking after a newer custom docker has been installed into the console container (e.g. into debian-console).
 2015-11-02 14:49:29 +05:00
Wang Long
474246aa70 Delete the unused ContainerConfig type 
Signed-off-by: Wang Long <long.wanglong@huawei.com>
 2015-11-01 20:32:11 +08:00
Darren Shepherd
a52919e0f0 Merge pull request #626 from imikushin/occ 
tiny os-config.yml cleanup
 2015-10-31 21:50:19 -07:00
Wang Long
dc33d84a48 config/types.go: add "" to field tag 
The field tag format accepted is[1]:
    `(...) yaml:"[<key>][,<flag1>[,<flag2>]]" (...)`
so we should add double quotation marks for the
filed tag format.

[1]: https://godoc.org/gopkg.in/yaml.v2

Signed-off-by: Wang Long <long.wanglong@huawei.com>
 2015-10-31 23:54:56 +08:00
Ivan Mikushin
776865c18a tiny os-config.yml cleanup 2015-10-31 19:16:43 +05:00
Ivan Mikushin
60ef1d4a60 Merge pull request #621 from datawolf/delete-unused-variable 
Delete the unused const variable in docker/client.go
 2015-10-30 13:22:14 +05:00
Wang Long
bd81c9dea8 Delete the unused const variable in docker/client.go 
The commit 9d76b79ac3 refactor code for function
"NewClient", and we should delete the unused const
variable.

Signed-off-by: Wang Long <long.wanglong@huawei.com>
 2015-10-29 22:54:49 +08:00
Denise
0f2c092911 Update README.md 2015-10-25 16:27:37 -07:00
Ivan Mikushin
cb9ad8769c bump releases.yml to v0.4.0, VERSION and images to v0.4.1-dev 2015-10-23 23:53:23 +05:00
Ivan Mikushin
6120f2e7cc Merge pull request #613 from imikushin/no-rm-usr-in-tests 
Do not remove usr in test runs
 2015-10-15 17:47:43 +05:00
Ivan Mikushin
c9093a9cab Merge pull request #610 from imikushin/bump-kernel 
update kernel to Ubuntu-4.2.0-16.19
 2015-10-15 17:13:37 +05:00
Ivan Mikushin
c0c29631fd Do not remove usr in test runs 2015-10-15 17:02:33 +05:00
Ivan Mikushin
4971a73b87 update kernel to Ubuntu-4.2.0-16.19 2015-10-15 16:28:04 +05:00
Ivan Mikushin
99eda031e3 Merge pull request #609 from imikushin/nested-cgroups-patches 
update to docker-1.8.3 with nested cgroups libcontainer patches
 2015-10-15 16:23:24 +05:00
Ivan Mikushin
5cf793f6ec Merge pull request #611 from imikushin/go-1.4.3 
bump to go-1.4.3
 2015-10-15 13:57:54 +05:00
Ivan Mikushin
c80621aefe bump to go-1.4.3 2015-10-14 19:56:42 +05:00
Ivan Mikushin
2c827c2474 use docker-1.8.3 with nested cgroups libcontainer patches 2015-10-14 18:52:29 +05:00
Ivan Mikushin
44b705c525 Merge pull request #597 from imikushin/usr-dev 
remove boot behaviour dependency on version string
 2015-10-13 11:13:31 +05:00
Ivan Mikushin
f2166030bc Merge pull request #605 from datawolf/fix-address-of-repo 
Replace rancherio with rancher
 2015-10-13 11:13:00 +05:00
Ivan Mikushin
c73393df40 bump releases.yml 2015-10-12 19:21:01 +05:00
Wang Long
9e15059789 Replace rancherio with rancher 
Signed-off-by: Wang Long <long.wanglong@huawei.com>
 2015-10-12 19:50:57 +08:00
Ivan Mikushin
c79a64e42e remove dependency on version string 
using rancher.rm_usr kernel param instead
 2015-10-07 14:02:17 +05:00
Darren Shepherd
4899ccd89c Merge pull request #596 from ibuildthecloud/rkt 
Setup paths for rkt
 2015-10-03 23:11:05 -07:00
Darren Shepherd
7f15ca4829 Setup paths for rkt 2015-10-03 23:07:56 -07:00
Ivan Mikushin
385565d315 Merge pull request #595 from ibuildthecloud/kernel-tar-helper 
Add helper script to convert Ubuntu deb to kernel tgz
 2015-10-02 22:46:52 +05:00
Ivan Mikushin
1241c5c3ac Merge pull request #594 from ibuildthecloud/load-network 
Fix loading network files from `ros service` compose commands
 2015-10-02 15:15:07 +05:00
Ivan Mikushin
9ec819040d Merge pull request #593 from ibuildthecloud/shm-mqueue 
Bump docker-from-scratch to fix /dev/shm and /dev/mqueue
 2015-10-02 14:44:11 +05:00
Darren Shepherd
febd78f1dd Add helper script to convert Ubuntu deb to kernel tgz 2015-10-02 01:02:44 -07:00
Darren Shepherd
2966ef8e5d Fix loading network files from ros service compose commands 2015-10-02 00:57:13 -07:00
Darren Shepherd
a504885311 Bump docker-from-scratch to fix /dev/shm and /dev/mqueue 2015-10-02 00:55:06 -07:00
Darren Shepherd
13d0241b7e Merge pull request #592 from ibuildthecloud/really-move-compose 
Move ros compose to ros service sub commands
 2015-10-02 00:50:31 -07:00
Darren Shepherd
d9fdbe542f Merge pull request #591 from ibuildthecloud/faster-dev 
Even faster dev build :)
 2015-10-02 00:50:11 -07:00
Darren Shepherd
d5964622eb Merge pull request #590 from ibuildthecloud/move-compose 
Support kernels from local directories, but just remote URLs
 2015-10-02 00:49:48 -07:00
Darren Shepherd
397b2a9822 Move ros compose to ros service sub commands 2015-10-01 15:48:19 -07:00
Darren Shepherd
4cd78f1047 Even faster dev build :) 2015-10-01 15:45:48 -07:00
Darren Shepherd
87d24618e5 Merge pull request #589 from imikushin/kernel-bump 
bump kernel to Ubuntu-4.2.0-14.16
 2015-10-01 15:39:40 -07:00
Darren Shepherd
ab8236bdac Support kernels from local directories, but just remote URLs 2015-10-01 15:39:20 -07:00
Ivan Mikushin
2058b47fa1 bump kernel to Ubuntu-4.2.0-14.16 2015-10-02 00:27:35 +05:00
Darren Shepherd
af1ee1c5f3 Merge pull request #587 from imikushin/fix-135 
installer: copy 1M zeroes to the target device before running fdisk
 2015-10-01 10:58:00 -07:00
Ivan Mikushin
43795fe283 add integration test 2015-10-01 16:55:34 +05:00
Ivan Mikushin
21453e38a9 installer: copy 1M zeroes to the target device before running fdisk 
otherwise grub-install chokes, even after the new partition table has been created
 2015-10-01 13:53:48 +05:00
Ivan Mikushin
60399d5fe1 bump releases.yml 2015-10-01 01:06:20 +05:00
Ivan Mikushin
510a07cd62 Merge pull request #580 from imikushin/revamp-config 
reshuffle cloud-config
 2015-10-01 00:09:00 +05:00
Ivan Mikushin
338abb758f Reshuffle cloud-config 
Read files cloud-config.d in alphanumeric order, then cloud-config.yml
`ros config` writes to cloud-config.yml (and cloud-config.d/private.yml - only private keys)

Add (c *CloudConfig) Save() method, use it to save the changed config

Read and apply metadata as part of LoadConfig()

Simplify ros config export logic
 2015-09-30 23:59:22 +05:00
Darren Shepherd
0ac4c783f9 Merge pull request #582 from ibuildthecloud/fix-symlink 
Fix symlinking docker.dist in custom consoles
 2015-09-25 00:01:47 -07:00
Darren Shepherd
427aa1f61a Fix symlinking docker.dist in custom consoles 2015-09-24 23:21:37 -07:00
Darren Shepherd
c6b5c56f75 Merge pull request #577 from ibuildthecloud/ros-compose 
Ros compose
 2015-09-24 23:19:30 -07:00
Darren Shepherd
9be3f1ef78 Make godep executable configurable in Makefile.docker 2015-09-24 23:16:48 -07:00