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

1186 Commits

Author SHA1 Message Date
Josh Curl
cdff94c07f
Remove trash.yml 2016-06-17 16:49:46 -07:00
Darren Shepherd
50f334281f Merge pull request #1028 from ibuildthecloud/new-kernel
Ubuntu-4.4.0-23.41-rancher2-2
2016-06-17 14:29:33 -07:00
Darren Shepherd
9922786748 Merge pull request #1022 from joshwget/update-selinux-files
Update SELinux config files in installer
2016-06-17 13:24:37 -07:00
Darren Shepherd
a164f385ba Ubuntu-4.4.0-23.41-rancher2-2 2016-06-17 13:24:14 -07:00
Darren Shepherd
3cdbf2ef0c Merge pull request #1029 from joshwget/debug-flag-changes
Make rancher.debug control bootstrap Docker and turn on log
2016-06-17 10:51:57 -07:00
Darren Shepherd
0392f124cf Merge pull request #1030 from joshwget/remove-second-exec-start
Remove second exec start in User Docker
2016-06-17 10:51:21 -07:00
Josh Curl
65bff509e0
Remove second exec start in User Docker 2016-06-17 09:50:36 -07:00
Josh Curl
07cc5a430a
Make rancher.debug control bootstrap Docker and turn on log 2016-06-17 09:41:33 -07:00
Darren Shepherd
e058c82515 Merge pull request #1027 from ibuildthecloud/foo4
Make /run shared, also don't rshare in initrd
2016-06-17 09:37:01 -07:00
Josh Curl
45712bef22
Update SELinux files in installer 2016-06-17 09:13:40 -07:00
Darren Shepherd
b514eb9e12 Merge pull request #1025 from ibuildthecloud/foo2
Build script updates
2016-06-17 08:34:27 -07:00
Darren Shepherd
17bb7cf6ee Merge pull request #1024 from ibuildthecloud/foo
Remove errors around IP forwarding not enabled
2016-06-17 08:18:08 -07:00
Darren Shepherd
ecc8482666 Make /run shared, also don't rshare in initrd 2016-06-17 08:04:35 -07:00
Darren Shepherd
2a60981b09 Build script updates
Always compress with gzip unless we are doing a release.  Also download
rootfs.tar to ${DOWNLOAD} so `dapper -m bind` works better.
2016-06-17 08:00:33 -07:00
Darren Shepherd
34198b8674 Merge pull request #1023 from joshwget/fix-image-preloading
Move preload directories and call wait-for-docker
2016-06-17 07:58:09 -07:00
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