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

2371 Commits

Author SHA1 Message Date
Darren Shepherd
395b855871 Remove errors around IP forwarding not enabled 2016-06-17 07:55:32 -07:00
Josh Curl
9e82d7d768
Move preload directories and call wait-for-docker 2016-06-16 23:13:17 -07:00
Darren Shepherd
b6ddb4f577 Merge pull request #1021 from joshwget/remove-some-images
Remove a few images
2016-06-16 14:59:06 -07:00
Josh Curl
0d05948fc8
Remove a few images 2016-06-16 14:26:06 -07:00
Darren Shepherd
21fce533b8 Merge pull request #1019 from joshwget/console-switch-warning
Warn when attempting to switch to the same console
2016-06-16 11:11:11 -07:00
Darren Shepherd
9dee6f4d59 Merge pull request #1020 from joshwget/validate-ros-config-set
Validate value for 'ros config set'
2016-06-16 11:10:48 -07:00
Josh Curl
f850e151de
Validate value for 'ros config set' 2016-06-16 10:14:52 -07:00
Josh Curl
a9e34206bc
Warn when attempting to switch to the same console 2016-06-16 09:54:12 -07:00
Darren Shepherd
d797d587ab Merge pull request #1017 from ibuildthecloud/foo
Revert "Revert "/media and /mnt mounted as shared for console""
2016-06-15 17:39:20 -07:00
Darren Shepherd
924e4b8aae /media and /mnt mounted as shared for console 2016-06-15 16:45:05 -07:00
Darren Shepherd
c138ecb54d Merge pull request #1016 from ibuildthecloud/two-containerd
Fix containerds stomping on each other
2016-06-15 16:40:59 -07:00
Darren Shepherd
01c3adc31b Merge pull request #1015 from joshwget/resolve-device
Revolve device before performing cloud config mount
2016-06-15 16:34:19 -07:00
Darren Shepherd
e1a63c80f3 Fix containerds stomping on each other 2016-06-15 16:33:27 -07:00
Josh Curl
445d35e33e
Revolve device before performing cloud config mount 2016-06-15 14:20:06 -07:00
Darren Shepherd
e98fc80d12 Merge pull request #1013 from joshwget/additional-mounts
Additional mounts can be set in cloud config
2016-06-14 15:46:41 -07:00
Darren Shepherd
82ca0def35 Merge pull request #1012 from joshwget/merge-input-flag
Add --input flag to ros config merge
2016-06-14 15:46:14 -07:00
Josh Curl
f24facc06c
Additional mounts can be set in cloud config 2016-06-14 15:25:56 -07:00
Josh Curl
d205af4abf
Add --input flag to ros config merge 2016-06-14 15:05:12 -07:00
Darren Shepherd
a002939a3f Merge pull request #1011 from imikushin/fix-installer
Fix installer build
2016-06-14 11:26:08 -07:00
Ivan Mikushin
a640bdb758 Fix installer build 2016-06-14 10:29:38 -07:00
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