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

2371 Commits

Author SHA1 Message Date
Darren Shepherd
3728a328ea Merge pull request #985 from ibuildthecloud/scripts-2
Various changes
2016-06-07 12:08:19 -07:00
Darren Shepherd
90224d5fcd Append to /var/log/docker.log and /var/log/system-docker.log 2016-06-07 11:21:54 -07:00
Darren Shepherd
c8fd1bc665 Pick vmlinuz then vmlinux 2016-06-07 11:21:28 -07:00
Darren Shepherd
751b71564e Add /usr/local/bin or /opt/bin to PATH for docker-init 2016-06-07 11:21:27 -07:00
Darren Shepherd
57a2f99484 Optimize scripts for slow disks 2016-06-07 11:21:27 -07:00
Darren Shepherd
e1d29fbab7 Bring back installer 2016-06-07 11:21:27 -07:00
Darren Shepherd
ac0f317bf8 Build script updates 2016-06-07 11:21:27 -07:00
Darren Shepherd
29c6aac571 Merge pull request #986 from joshwget/bump-netconf
Bump netconf
2016-06-07 11:21:02 -07:00
Josh Curl
09b4b202b2
Bump netconf 2016-06-07 11:14:06 -07:00
Darren Shepherd
7ec73416c8 Merge pull request #976 from joshwget/cloud-config-resize
Replace resize system service with cloud config option
2016-06-07 11:00:32 -07:00
Josh Curl
9658d3bffd
Replace resize system service with cloud config option 2016-06-07 09:53:41 -07:00
Darren Shepherd
4d5e77f0d6 Merge pull request #981 from joshwget/fix-rancher-log
Fix 'rancher.log'
2016-06-06 17:48:40 -07:00
Darren Shepherd
80f10b6580 Merge pull request #983 from ibuildthecloud/kernel
Kernel Ubuntu-4.4.0-23.41-rancher2
2016-06-06 17:48:34 -07:00
Josh Curl
4cb1d26cf9
Fix 'rancher.log' 2016-06-06 15:31:34 -07:00
Darren Shepherd
355095d41f Kernel Ubuntu-4.4.0-23.41-rancher2 2016-06-06 15:27:55 -07:00
Darren Shepherd
cd76d85aea Merge pull request #980 from joshwget/first-class-consoles
First class consoles
2016-06-06 15:27:23 -07:00
Josh Curl
719d255636
First class consoles 2016-06-06 15:13:15 -07:00
Darren Shepherd
f22c692529 Merge pull request #975 from imikushin/tls
Disable docker server TLS cert auto-generation
2016-06-06 12:43:19 -07:00
Darren Shepherd
b83f0ec092 Merge pull request #971 from ibuildthecloud/1.11.1
1.11.2
2016-06-06 11:04:29 -07:00
Ivan Mikushin
41f333d0ff Disable docker server TLS cert auto-generation
Because users should be explicit about their docker TLS certs.
Also, re-generate the key and cert files when `ros tls gen` is run (used to be cached).
2016-06-06 10:27:03 -07:00
Darren Shepherd
82666d779e Fix tests 2016-06-06 10:17:21 -07:00
Darren Shepherd
c9c095f202 Build script 2016-06-06 08:08:04 -07:00
Darren Shepherd
03db5d1058 Update vendor/ 2016-06-06 08:08:00 -07:00
Darren Shepherd
8ab32c820f Docker 1.11.1 2016-06-03 11:38:25 -07:00
Darren Shepherd
43f90b8e61 Merge pull request #978 from imikushin/gce-cloud-config
Use GCE metadata service
2016-06-02 20:55:12 -06:00
Ivan Mikushin
c5fb496a5d use gce metadata service to get user-data and other metadata 2016-06-02 19:49:21 -07:00
Ivan Mikushin
bb89c44b99 vendor coreos-cloudinit v1.11 (patched) 2016-06-02 19:49:21 -07:00
Darren Shepherd
7c0b5ea1c4 Merge pull request #977 from imikushin/console-tweaks
Bump ubuntu-console to 16.04, add man
2016-06-02 20:47:27 -06:00
Darren Shepherd
8bb4517b9c Merge pull request #953 from joshwget/registry-credentials
Support registry credentials in cloud config
2016-06-02 20:45:53 -06:00
Ivan Mikushin
5c7482e5fd Bump ubuntu-console to 16.04
Also, minor image cleanups (use cached layers to build faster).
2016-06-02 19:38:09 -07:00
Darren Shepherd
7c6fa3f0b6 Merge pull request #955 from imikushin/upgrade-flow
ros os upgrade: ask for confirmation first, then download and upgrade
2016-06-02 20:15:37 -06:00
Josh Curl
adb5635186
Support registry credentials in cloud config 2016-06-02 19:00:42 -07:00
Darren Shepherd
4ab3162ed8 Merge pull request #973 from joshwget/remove-unneeded-code
Remove unneeded service processing code
2016-06-02 19:28:17 -06:00
Darren Shepherd
71c8f40ffe Merge pull request #972 from joshwget/boot-with-invalid-config
Fix boot issues due to invalid configs
2016-06-02 19:27:23 -06:00
Darren Shepherd
5659173628 Merge pull request #962 from joshwget/atomic-writes
Atomic writes
2016-06-02 19:26:44 -06:00
Darren Shepherd
6e2f8e5940 Merge pull request #921 from joshwget/default-key
Move default hostname and network under common key
2016-06-02 19:22:00 -06:00
Josh Curl
4f48569cb2
Atomic writes 2016-06-02 14:32:26 -07:00
Josh Curl
55d629b980
Remove unneeded service processing code 2016-06-02 09:01:00 -07:00
Josh Curl
08f40ad3e7
Fix boot issues due to invalid configs 2016-06-01 18:41:55 -07:00
Josh Curl
e51c5409aa
Move default hostname and network under common key 2016-05-31 22:27:04 -07:00
Darren Shepherd
97344cc535 Merge pull request #970 from joshwget/bump-libcompose
Bump libcompose and sync dependencies
2016-05-31 22:23:01 -07:00
Darren Shepherd
6fd0beda35 Merge pull request #969 from ibuildthecloud/scripts
More build script changes
2016-05-31 22:11:02 -07:00
Josh Curl
7ea6dfbe07
Bump libcompose and sync dependencies 2016-05-31 22:01:53 -07:00
Darren Shepherd
5bf4d2c117 More build script changes 2016-05-31 21:11:03 -07:00
Darren Shepherd
742c9a9401 Merge pull request #967 from ibuildthecloud/madness
Update vendor
2016-05-31 19:06:14 -07:00
Darren Shepherd
e5ae33b4ed Merge pull request #968 from joshwget/fix-private-export
Fix --private flag for 'ros config export'
2016-05-31 18:34:40 -07:00
Darren Shepherd
a14846152b Update vendor 2016-05-31 18:14:32 -07:00
Josh Curl
a59ec33787
Fix --private flag for 'ros config export' 2016-05-31 18:10:56 -07:00
Darren Shepherd
410dfbe0fd Merge pull request #922 from joshwget/simplify-configuration
Simplify configuration
2016-05-31 15:56:14 -07:00
Josh Curl
95d8ebe146
Simplify configuration 2016-05-31 14:34:04 -07:00