1
0
mirror of https://github.com/rancher/os.git synced 2025-07-06 11:36:15 +00:00
Commit Graph

2371 Commits

Author SHA1 Message Date
Ivan Mikushin
1b327e8d7f fix user-docker 2015-08-07 00:01:57 +05:00
Ivan Mikushin
f072cff37c cleanup after docker create 2015-08-06 15:03:29 +05:00
Darren Shepherd
13106ed63f Fix sbin symlink and bootstrap services 2015-08-06 00:49:00 -07:00
Darren Shepherd
cc5613c64c Fix os-config.yml location 2015-08-06 00:30:20 -07:00
Darren Shepherd
598f47b68d Update build for docker-from-scratch 2015-08-06 00:05:25 -07:00
Darren Shepherd
d56b6ae2a5 Update godeps 2015-08-06 00:05:25 -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
Darren Shepherd
0f6668be43 Merge pull request #463 from imikushin/simpler-make
simpler make
2015-08-05 23:45:48 -07:00
Ivan Mikushin
1ef95f1db5 fix scripts/ci 2015-08-06 11:36:11 +05:00
Darren Shepherd
b6a87cb1c8 Merge pull request #465 from janeczku/fix-ros-env
Return gracefully when `ros env` is called without argument(s)
2015-08-05 20:50:40 -07:00
Jan Broer
2b1bf67c86 Fixes runtime error when ros env is called without argument(s) 2015-08-06 01:11:22 +02:00
Ivan Mikushin
e0e51a9f37 move chunks of shell from Makefile into scripts 2015-08-06 01:58:32 +05:00
Ivan Mikushin
9436b0da9a split makefile into local and in-docker 2015-08-06 01:07:35 +05:00
Darren Shepherd
8c9fa7ba2f Merge pull request #460 from imikushin/cloud-config
make cloud-config the configuration mechanism for RancherOS
2015-08-05 11:19:04 -07:00
Ivan Mikushin
7ad60c07bd make cloud-config the configuration mechanism for RancherOS 2015-08-05 19:48:25 +05:00
Darren Shepherd
5d93d51fc5 Merge pull request #458 from imikushin/xhyve-state
persistent state disk on xhyve
2015-07-29 01:26:08 -07:00
Ivan Mikushin
de3bfed810 scripts/run: create an empty raw disk image if not present
use autoformat with formatzero=true to format the disk
2015-07-29 13:13:28 +05:00
Ivan Mikushin
5c84f36d79 enable ACPI in xhyve 2015-07-29 11:58:12 +05:00
Ivan Mikushin
7b957d8fc6 scripts/run: minor cleanup 2015-07-28 18:58:25 +05:00
Darren Shepherd
4d3e3140ce Merge pull request #456 from imikushin/dont-pull-if-exists
do not pull os-images by default if they exist
2015-07-28 01:41:53 -07:00
Ivan Mikushin
55ca88ed82 do not pull os-images by default if they exist
also, cleanup os-initrdbase container on exit in ./scripts/copy-images
(as trap can apparently only run one command)
2015-07-28 13:22:47 +05:00
Ivan Mikushin
e812e7960a Merge pull request #455 from ibuildthecloud/fix-linux-run
Fix script/run on Linux
2015-07-28 09:37:13 +05:00
Darren Shepherd
cd616a383e Fix script/run on Linux 2015-07-27 15:55:45 -07:00
Darren Shepherd
dbb53215ce Merge pull request #450 from imikushin/build
dind-less, make-based build system
2015-07-27 08:41:11 -07:00
Ivan Mikushin
6022f78edd dind-less, make-based build system 2015-07-27 11:21:46 +05:00
Ivan Mikushin
7f1016059f Merge pull request #452 from imikushin/kernel-lib
move kernel lib from initrd-base to kernel
2015-07-24 14:27:17 +05:00
Ivan Mikushin
70c9ce46ec move kernel lib from initrd-base to kernel 2015-07-24 14:20:50 +05:00
Darren Shepherd
abed85ba27 Merge pull request #448 from imikushin/rm-machine-iso
move auto-formatter decision logic to os-autoformat container
2015-07-23 00:06:35 -07:00
Ivan Mikushin
ca54b617a0 try mount state
run bootstrap if failed (and autoformat if we can), then try again
2015-07-22 21:14:39 +05:00
Ivan Mikushin
890052273e log bootstrap and autoformat services 2015-07-22 19:18:43 +05:00
Ivan Mikushin
a636157882 only run bootstrap (including auto-formatter) if we can not resolve state drive 2015-07-22 18:44:56 +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
Darren Shepherd
dbae0a6012 Merge pull request #445 from imikushin/xhyve
xhyve: cloud-config support
2015-07-21 09:14:23 -07:00
Ivan Mikushin
47d658cf4a ./scripts/ssh: support OS X 2015-07-21 17:27:12 +05:00
Ivan Mikushin
229e4e0fbd ./scripts/run: support OS X 2015-07-21 17:26:48 +05:00
Ivan Mikushin
b7b52c65a1 ros dev spec
find device using blkid spec
2015-07-21 13:34:55 +05:00
Ivan Mikushin
2efba7cca5 WIP: supply cloud-config via openstack config-2 CD 2015-07-21 13:34:55 +05:00
Ivan Mikushin
e906e1ced7 WIP: xhyve: add some memory to the VM
do not use persistent disk yet
2015-07-21 13:34:55 +05:00
Ivan Mikushin
5b50756d62 bump version to v0.4.0-dev 2015-07-21 13:02:50 +05:00
Darren Shepherd
5956de914f Merge pull request #444 from imikushin/platform-dep-code
isolate and mark platform dependent code
2015-07-17 10:46:31 -07:00
Darren Shepherd
1862b8f29a Merge pull request #443 from imikushin/docker-1.7.1
update to docker v1.7.1
2015-07-17 10:45:47 -07: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
26daed2bbf update to docker v1.7.1 2015-07-16 16:34:43 +05:00
Ivan Mikushin
9f935fc83d Merge pull request #441 from imikushin/dind5
really fix the rancher/dind:v0.5.0 regression
2015-07-15 12:12:37 +05:00
Ivan Mikushin
95c0bb2d8e really fix the rancher/dind:v0.5.0 regression
not just avoid it
2015-07-14 23:50:22 +05:00
Darren Shepherd
0606524fdc Merge pull request #428 from Hellslicer/disable_userland_proxy
Disable userland proxy for user-docker and system-docker
2015-07-14 07:32:15 -07:00
Ivan Mikushin
6f5cb77045 Merge pull request #439 from imikushin/cleanup
scripts cleanup
2015-07-14 18:43:33 +05:00
Ivan Mikushin
51d2dddfa8 scripts cleanup 2015-07-14 18:37:39 +05:00