1
0
mirror of https://github.com/rancher/os.git synced 2025-07-07 03:48:38 +00:00
Commit Graph

2371 Commits

Author SHA1 Message Date
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
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