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

751 Commits

Author SHA1 Message Date
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
Ivan Mikushin
cbf8aac002 Merge pull request #578 from imikushin/qind
fix: `scripts/run --qind` runs plain qemu (instead of qind)
2015-09-23 11:58:06 +05:00
Ivan Mikushin
e313091bde fix: scripts/run --qind runs plain qemu (instead of qind) 2015-09-23 11:57:16 +05:00
Ivan Mikushin
e3e3564029 Merge pull request #568 from imikushin/qind
use qind in run and ssh scripts
2015-09-23 11:28:38 +05:00
Ivan Mikushin
39e2e6c3b3 speed up the full build by swapping lzma with gzip if run with --dev flag 2015-09-23 10:22:55 +05:00
Ivan Mikushin
25fa1b769d add --qind to scripts/run and scripts/ssh
also add `--fresh` to `scripts/run` to run with a clean state HDD,
make `--qemu` the default in `scripts/run` and `scripts/ssh`
2015-09-23 10:20:28 +05:00
Ivan Mikushin
88cf8be580 cleanup Dockerfile.build-base 2015-09-23 10:20:14 +05:00
Ivan Mikushin
b0ed418333 Merge pull request #576 from imikushin/new-kernel
Bump kernel to Ubuntu-4.2.0-10.12
2015-09-23 10:05:59 +05:00
Darren Shepherd
e25c59f1ab Create ros compose command 2015-09-22 11:17:15 -07:00
Darren Shepherd
a13e2957e7 Be less agressive on waiting for docker storage context container 2015-09-22 11:16:55 -07:00
Darren Shepherd
acc86814a9 Remove println 2015-09-22 11:16:32 -07:00
Ivan Mikushin
545c00241e Bump kernel to Ubuntu-4.2.0-10.12 2015-09-22 23:15:14 +05:00
Darren Shepherd
d25a282ef9 Bump godep for libcompose 2015-09-22 11:13:53 -07:00
Darren Shepherd
2caa8f95ac Merge pull request #570 from ibuildthecloud/systemd
Fix systemd emulation
2015-09-22 11:04:34 -07:00
Darren Shepherd
3a3270f2c6 Fix systemd emulation 2015-09-18 22:27:53 -07:00
Darren Shepherd
e451abd532 Merge pull request #559 from luxas/32bit
Fixed 32-bit issue in power.go
2015-09-18 15:56:14 -07:00
Ivan Mikushin
64310a84df Merge pull request #504 from imikushin/readme-installer
readme from os-installer
2015-09-14 19:39:32 +05:00
Ivan Mikushin
abf1203499 readme from os-installer 2015-09-14 19:38:16 +05:00
Ivan Mikushin
4e14c175da Merge pull request #561 from imikushin/cc-docker
Configure docker via `rancher.docker` in cloud-config
2015-09-14 17:05:23 +05:00
Ivan Mikushin
f08f996bca test rebooting instance with a container running in user docker 2015-09-14 15:06:50 +05:00
Ivan Mikushin
fd90dcffe0 test docker config 2015-09-14 11:50:39 +05:00
Ivan Mikushin
5934852e80 rename rancher.user_docker to rancher.docker in cloud-config 2015-09-14 11:50:39 +05:00
Ivan Mikushin
f19de93e09 Merge pull request #565 from imikushin/cgroup-fix
docker-v1.8.2-ros1 with cgroup fix
2015-09-14 11:48:24 +05:00
Ivan Mikushin
a1ffbc962c docker-v1.8.2-ros1 with cgroup fix 2015-09-14 11:28:04 +05:00
Ivan Mikushin
16d7ce0202 Merge pull request #562 from imikushin/docker-1.8.2
update to docker-v1.8.2
2015-09-11 17:37:00 +05:00
Ivan Mikushin
a80ce5edcf update to docker-v1.8.2 2015-09-11 16:23:38 +05:00
Ivan Mikushin
4746e362b9 Merge pull request #558 from imikushin/test-custom-kernel
Test building with custom kernel and docker
2015-09-11 09:14:56 +05:00
Ivan Mikushin
c22af3f0ca Merge pull request #556 from imikushin/run-no-format
./scripts/run --no-format
2015-09-11 09:01:41 +05:00
Lucas Käldström
32f71c05bf Fixed 32-bit issue. Now it is possible to build bin/rancheros on a Raspberry Pi or any 32-bit machine 2015-09-10 10:33:15 +03:00
Ivan Mikushin
135949d894 rename KERNEL_URL to COMPILED_KERNEL_URL
to avoid confusion with KERNEL_URL in rancher/os-kernel
2015-09-10 11:47:30 +05:00
Ivan Mikushin
168d340b76 test custom kernel and docker build and boot 2015-09-09 23:35:15 +05:00
Ivan Mikushin
0c196f557b use --device=/dev/kvm:/dev/kvm instead of --privileged to enable KVM in docker 2015-09-09 14:31:58 +05:00
Ivan Mikushin
9031e27174 cleanup build a little 2015-09-09 13:25:25 +05:00
Ivan Mikushin
94c7eca88e tests cleanup 2015-09-09 12:29:47 +05:00
Ivan Mikushin
69970ed8ed refactor docker-run.sh 2015-09-08 22:18:46 +05:00
Ivan Mikushin
65d99e6e8a ./scripts/run --no-format 2015-09-08 13:56:04 +05:00
Ivan Mikushin
bce7845dc5 factor out build configuration to build.conf 2015-09-08 12:14:06 +05:00
Ivan Mikushin
e525091ab5 cleanup installer Dockerfile a bit 2015-09-08 12:09:43 +05:00
Darren Shepherd
bf6b22c961 Merge pull request #547 from imikushin/tests
Revive integration tests
2015-09-04 10:49:12 -07:00
Ivan Mikushin
9a75fc101c detect /dev/kvm or optionally force --privileged
using PRIVILEGED=1 in ./scripts/docker-run.sh
2015-09-04 19:48:46 +05:00
Ivan Mikushin
950158823c run integration tests as part of the build 2015-09-04 19:30:16 +05:00
Ivan Mikushin
57444246ba cleanup python tox setup 2015-09-04 13:34:29 +05:00
Ivan Mikushin
bde6b8bb7a make tox happy 2015-09-03 20:07:57 +05:00
Ivan Mikushin
74e589039b make run and ssh scripts more robust
Detect if KVM is available.
Enable QEMU to run w/o KVM (in the cloud or on OS X). Use --xhyve flag to run with xhyve on OS X.
2015-09-03 20:01:32 +05:00
Ivan Mikushin
e94f8d8a1f revive integration tests 2015-09-03 17:44:16 +05:00