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
70bf02df1f Various fixes for ARM build 2016-06-29 23:03:28 -07:00
Darren Shepherd
e03dbe77e8 Merge pull request #1071 from imikushin/restore-justice
Copyright comment cleanup
2016-06-29 23:02:05 -07:00
Darren Shepherd
475cc88cea Merge pull request #1070 from joshwget/dhcpcd-clientid
Switch dhcpcd to use clientid rather than duid
2016-06-29 22:58:43 -07:00
Ivan Mikushin
2264aa8230 Copyright comment cleanup
Add back the copyright notice
2016-06-29 22:50:22 -07:00
Josh Curl
68aaa20d3c
Switch dhcpcd to use clientid rather than duid 2016-06-29 22:45:07 -07:00
Darren Shepherd
0b4e99e1e6 Merge pull request #1068 from imikushin/gce-fix
Fix fetching SSH authorized keys from GCE
2016-06-29 22:22:49 -07:00
Ivan Mikushin
e6a550d786 Fix fetching SSH authorized keys from GCE 2016-06-29 20:35:49 -07:00
Darren Shepherd
93b4949cce Merge pull request #1067 from joshwget/fix-invalid-auth-panic
Pass non-nil PrivilegeFunc to ImagePull
2016-06-29 20:09:31 -07:00
Josh Curl
b9eba9d290
Pass non-nil PrivilegeFunc to ImagePull 2016-06-29 20:05:23 -07:00
Darren Shepherd
e4e07ec278 Merge pull request #1063 from joshwget/fix-console-warning-message
Console switch warning based on running console and not enabled console
2016-06-29 20:03:16 -07:00
Darren Shepherd
e24cad0a5e Merge pull request #1066 from joshwget/suffix-version-environment
Add SUFFIX and VERSION to rancher.environment
2016-06-29 20:03:05 -07:00
Josh Curl
ac1269a222
Add SUFFIX and VERSION to rancher.environment 2016-06-29 18:39:12 -07:00
Josh Curl
92b24d9790
Console switch warning based on running console and not enabled console 2016-06-29 00:52:38 -07:00
Darren Shepherd
6b47d33df2 Merge pull request #1059 from ibuildthecloud/release
Release
2016-06-28 21:42:27 -07:00
Darren Shepherd
dd4f348592 Skip integration tests in release 2016-06-28 21:41:40 -07:00
Darren Shepherd
ddff0d3e6f rancher/docker:v1.11.2-1 2016-06-28 21:41:13 -07:00
Darren Shepherd
afb8806cb6 Merge pull request #1057 from ibuildthecloud/cni
Add CNI networking to system-docker
2016-06-28 16:05:11 -07:00
Darren Shepherd
e360f6cd6a Merge pull request #1058 from ibuildthecloud/installer-size
Shrink installer a tiny bit
2016-06-28 15:58:21 -07:00
Darren Shepherd
b0c6ad709c Merge pull request #1056 from joshwget/respect-customization
Fix two instances where customization isn't respected
2016-06-28 15:44:08 -07:00
Darren Shepherd
9abb58641d Merge pull request #1055 from joshwget/ros-console-list-details
Add details to 'ros console list'
2016-06-28 15:36:44 -07:00
Darren Shepherd
0323844ca6 Add CNI networking to system-docker 2016-06-28 15:34:26 -07:00
Darren Shepherd
327aa0964c Shrink installer a tiny bit 2016-06-28 15:28:51 -07:00
Josh Curl
b09c09edf4
Fix two instances where customization isn't respected 2016-06-28 14:35:51 -07:00
Josh Curl
8f8dec51ea
Add details to 'ros console list' 2016-06-28 11:18:26 -07:00
Darren Shepherd
d8fc2a7401 Merge pull request #1051 from joshwget/dns-patch-build-tag
Go DNS patch based on build tag
2016-06-27 20:38:14 -07:00
Josh Curl
d0607ee68f
Go DNS patch based on build tag 2016-06-27 20:05:44 -07:00
Darren Shepherd
38bc8ac90d Merge pull request #1047 from datawolf/fix-multi-arch-releases
Fix multi-arch support for releases
2016-06-27 14:52:00 -07:00
Wang Long
f2187f1bf8 Fix multi-arch support for releases
Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-06-27 20:47:28 +08:00
Darren Shepherd
116c147620 Merge pull request #1042 from joshwget/swap
Add swap support in cloud config mounts
2016-06-22 22:31:22 -07:00
Josh Curl
128c228ff5
Add swap support in cloud config mounts 2016-06-22 21:50:29 -07:00
Darren Shepherd
b22c075b95 Merge pull request #1033 from joshwget/sysctl-cloud-config
Add sysctl support in cloud config
2016-06-18 21:31:42 -07:00
Josh Curl
921c00c8ea
Add sysctl support in cloud config 2016-06-17 23:05:45 -07:00
Darren Shepherd
eb0c262ef7 Merge pull request #1031 from joshwget/remove-rkt-support
Remove rkt support
2016-06-17 20:12:11 -07:00
Darren Shepherd
fc2acacab5 Merge pull request #1032 from joshwget/remove-old-trash-config
Remove trash.yml
2016-06-17 20:11:35 -07:00
Josh Curl
cdff94c07f
Remove trash.yml 2016-06-17 16:49:46 -07:00
Josh Curl
73ea4c9bcd
Remove rkt support 2016-06-17 16:49:12 -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