1
0
mirror of https://github.com/rancher/os.git synced 2025-07-31 06:32:09 +00:00
Commit Graph

125 Commits

Author SHA1 Message Date
Darren Shepherd
66432c6454 Merge pull request #629 from imikushin/separate-system-docker
Always use bundled docker for system-docker.
2015-11-05 16:07:15 -07:00
Ivan Mikushin
2db254865e Use a constant instead of a magic value. 2015-11-05 13:51:05 +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
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
44b705c525 Merge pull request #597 from imikushin/usr-dev
remove boot behaviour dependency on version string
2015-10-13 11:13:31 +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
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
Ivan Mikushin
5934852e80 rename rancher.user_docker to rancher.docker in cloud-config 2015-09-14 11:50:39 +05:00
Darren Shepherd
72be1d11e6 Revert "Revert "Storage""
This reverts commit 7b2bf93271.
2015-08-27 12:24:26 -07:00
Ivan Mikushin
7b2bf93271 Revert "Storage" 2015-08-27 18:33:26 +05:00
Darren Shepherd
ab6eb58167 Run user docker with a configurable storage context 2015-08-27 02:52:12 -07:00
Ivan Mikushin
0de6eb94a5 rm users from our cloud-config
at least, for now
2015-08-22 00:16:15 +05:00
Ivan Mikushin
4d6530be73 slices union and intersection
useful for merging and splitting configs
2015-08-21 17:07:45 +05:00
Ivan Mikushin
642c557c73 do not save/use bad cloud-config 2015-08-20 19:20:51 +05:00
Ivan Mikushin
aa1af05d46 do not panic 2015-08-20 18:06:48 +05:00
Darren Shepherd
cc5613c64c Fix os-config.yml location 2015-08-06 00:30:20 -07:00
Darren Shepherd
9d76b79ac3 Refactor to use libcompose 2015-08-06 00:05:25 -07:00
Darren Shepherd
19f9a1b281 Rebase on docker-from-scratch 2015-08-06 00:05:25 -07:00
Darren Shepherd
889c80b682 Rebase on rancher/netconf 2015-08-06 00:05:24 -07:00
Ivan Mikushin
7ad60c07bd make cloud-config the configuration mechanism for RancherOS 2015-08-05 19:48:25 +05:00
Ivan Mikushin
d33698d17b move auto-formatter drive selection logic to os-autoformat container
and get rid of:
- machine-rancheros.iso,
- special case in build-images,
- some bootstrap.go code
2015-07-22 17:47:24 +05:00
Ivan Mikushin
ad832471a1 isolate and mark platform dependent code
now unit tests compile on OS X and (some of them) work
2015-07-17 16:43:09 +05:00
Ivan Mikushin
3223dad3b0 get services from os-services branch v0.3.2 2015-06-30 10:36:19 +05:00
Ivan Mikushin
dff70f8362 latest rancher-compose, default.go -> os-config.yml
also, gofmt
2015-06-29 12:00:41 +05:00
Ivan Mikushin
c85f9b03cd make /var/lib/rancher persistent
by making it a system volume
2015-06-09 11:59:49 +05:00
Ivan Mikushin
e69f954cf4 fix #50 2015-05-26 11:55:13 +05:00
Ivan Mikushin
95434c27de build v0.3.1 2015-05-23 20:08:48 +05:00
Ivan Mikushin
2dff031552 preload images: service dependencies
also, log implicitly added service dependencies and remove unnecessary linking to dockerwait
2015-05-22 13:29:24 +05:00
Ivan Mikushin
9a91accae9 preload images 2015-05-19 19:38:25 +05:00
Darren Shepherd
cbc9839259 Merge pull request #303 from ibuildthecloud/compose2
Update to newer compose
2015-05-11 18:01:23 -07:00
Darren Shepherd
7f4c339034 Update to newer compose 2015-05-11 01:18:42 -07:00
Ivan Mikushin
5b9ef6ae16 rename rancherctl to ros
shorter, easier to use (and just plain cooler) name
2015-05-10 18:17:04 +05:00
Darren Shepherd
f60bb0afa4 Merge pull request #293 from wlan0/bugfix2
Fix #283: Check type while setting config via rancherctl
2015-05-06 14:50:30 -07:00
Darren Shepherd
2bae134b35 Only bind mount /var/lib/rancher/conf 2015-05-05 13:37:51 -07:00
Darren Shepherd
6b929abdea Updates for refactored rancher-compose 2015-05-05 13:36:52 -07:00
wlan0
d708b7f2c1 Fix #283: Check type while setting config via rancherctl 2015-05-04 11:17:42 -07:00
Darren Shepherd
45d9c54b9a Rename userdocker to docker to be more consistent with other distros 2015-05-02 23:06:20 -07:00
Darren Shepherd
afa3c3e94a Switch to new labels syntax. Also launch acpid earlier 2015-04-30 22:16:27 -07:00
deniseschannon
0e4f0fe292 Changes required due to labels type change in ServiceConfig 2015-04-29 20:48:57 -07:00
Darren Shepherd
0d7d56e56d Merge pull request #242 from imikushin/restart-always
system services restart=always
2015-04-29 15:25:11 -07:00
wlan0
1626247f48 machine support for rancherOS 2015-04-28 10:22:13 -07:00
Ivan Mikushin
0c8896178c system services restart=always 2015-04-28 15:20:42 +05:00
Darren Shepherd
0a299fcd50 Remove trailing / 2015-04-16 07:26:42 -07:00
Darren Shepherd
0b5eb352ba Services in compose format 2015-04-15 23:17:01 -07:00
Darren Shepherd
be8fa8e5b7 Services as compose format 2015-04-15 23:17:00 -07:00
Darren Shepherd
2a69c5f38e Bump version to v0.3.0-rc2 2015-04-10 07:32:32 -07:00
Darren Shepherd
894f785ac3 Don't make CA certs readonly 2015-04-10 07:28:28 -07:00
Darren Shepherd
7495f5e77f Trim whitespace for lists from rancherctl config set 2015-04-10 07:28:28 -07:00
Darren Shepherd
2fdfd56a2c Switch network container to privileged and don't use ARP 2015-04-06 15:41:48 -07:00