Darren Shepherd
|
07d475cecb
|
Merge pull request #1010 from joshwget/merge-v0.5
Merge v0.5 branch
|
2016-06-13 23:39:20 -07:00 |
|
Josh Curl
|
e4019385aa
|
Merge remote-tracking branch 'origin/v0.5' into HEAD
|
2016-06-13 22:00:34 -07:00 |
|
Denise
|
6d3ac8d734
|
Merge pull request #1008 from joshwget/legacy-labels
Support legacy Docker Compose labels
|
2016-06-13 18:36:46 -07:00 |
|
Josh Curl
|
313cdb7e24
|
Support legacy Docker Compose labels
|
2016-06-13 17:53:36 -07:00 |
|
Denise
|
30d988d5b0
|
Merge pull request #996 from joshwget/console-switch-changes
Console switch changes
|
2016-06-13 17:50:50 -07:00 |
|
Darren Shepherd
|
0d3b1edd4d
|
Merge pull request #992 from imikushin/arm64-kernel
use latest arm64 kernel build
|
2016-06-13 17:13:20 -07:00 |
|
Darren Shepherd
|
025e555fde
|
Merge pull request #998 from imikushin/fix-iso-build
Fix building the iso
|
2016-06-13 17:12:57 -07:00 |
|
Ivan Mikushin
|
4f9cc68175
|
use latest arm64 kernel build
for v0.5 branch
|
2016-06-13 16:01:34 -07:00 |
|
Darren Shepherd
|
10a179cbbd
|
Merge pull request #1000 from rancher/revert-987-foo
Revert "/media and /mnt mounted as shared for console"
|
2016-06-13 15:02:45 -07:00 |
|
Josh Curl
|
a5273d922e
|
Revert "/media and /mnt mounted as shared for console"
|
2016-06-13 14:53:47 -07:00 |
|
Ivan Mikushin
|
9afb667cf4
|
Fix building the iso
|
2016-06-13 14:42:10 -07:00 |
|
Darren Shepherd
|
af52052758
|
Merge pull request #987 from ibuildthecloud/foo
/media and /mnt mounted as shared for console
|
2016-06-13 13:58:57 -07:00 |
|
Darren Shepherd
|
42ef7c062a
|
Merge pull request #994 from joshwget/fix-network-caching
Fix network caching
|
2016-06-13 13:30:14 -07:00 |
|
Darren Shepherd
|
3837e789aa
|
Merge pull request #993 from imikushin/dockerignore-tmp
add tmp to .dockerignore
|
2016-06-13 10:48:53 -07:00 |
|
Darren Shepherd
|
9b4bcfea50
|
Merge pull request #995 from joshwget/bump-os-base
Bump os-base
|
2016-06-13 10:48:36 -07:00 |
|
Josh Curl
|
c4c8ec402c
|
Add 'ros console enable' command
|
2016-06-12 22:28:24 -07:00 |
|
Josh Curl
|
3153c28e86
|
Support switching to the default console
|
2016-06-12 12:02:07 -07:00 |
|
Josh Curl
|
7f7d8765ca
|
New console label to handle switching between persistent consoles
|
2016-06-10 10:54:10 -07:00 |
|
Josh Curl
|
abfb45401a
|
Update console switch warning message
|
2016-06-10 10:54:06 -07:00 |
|
Josh Curl
|
9f7e6a19ab
|
Add --force flag to console switch
|
2016-06-10 10:54:02 -07:00 |
|
Josh Curl
|
02cfe37d30
|
Bump os-base
|
2016-06-09 16:46:35 -07:00 |
|
Josh Curl
|
b436cdff4d
|
Fix network caching
|
2016-06-09 16:27:47 -07:00 |
|
Ivan Mikushin
|
a938f4375f
|
add tmp to .dockerignore
let's please add tmp to .dockerignore: it's in .gitignore and I've got a boatload of stuff there, for my local testing
|
2016-06-09 15:59:58 -07:00 |
|
Darren Shepherd
|
77612b87c5
|
Merge pull request #989 from joshwget/more-service-logging
Enable logging in more ros command services
|
2016-06-07 22:01:30 -07:00 |
|
Darren Shepherd
|
9dc25fc411
|
Merge pull request #988 from joshwget/user-docker-improvements
Various User Docker improvements
|
2016-06-07 22:01:19 -07:00 |
|
Josh Curl
|
b279fa85f6
|
Enable logging in more ros command services
|
2016-06-07 19:19:18 -07:00 |
|
Josh Curl
|
3b8b47f103
|
Various User Docker improvements
|
2016-06-07 18:59:45 -07:00 |
|
Darren Shepherd
|
f410c678ba
|
Make shared mount work in an initrd
|
2016-06-07 18:01:49 -07:00 |
|
Darren Shepherd
|
438a437459
|
Cleanup scripts for error handling
|
2016-06-07 17:24:17 -07:00 |
|
Josh Curl
|
9f0074c398
|
/media and /mnt mounted as shared for console
|
2016-06-07 12:09:10 -07:00 |
|
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 |
|