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

1159 Commits

Author SHA1 Message Date
Ivan Mikushin
0e949dfba4 Merge pull request #748 from datawolf/master
do not print success info when loading images error
2016-02-04 18:34:19 -08:00
Ivan Mikushin
6ee8cdcc24 Merge pull request #750 from imikushin/docker-1.10
docker-1.10
2016-02-04 18:29:06 -08:00
Ivan Mikushin
9a8eb9cc5d docker-1.10 2016-02-04 18:20:52 -08:00
Ivan Mikushin
d5b3f8407e Merge pull request #746 from imikushin/tcmu-kernel
bump the kernel to the latest with Rancher TCMU patches
2016-02-04 17:56:11 -08:00
Ivan Mikushin
c1af41b826 Merge pull request #747 from ibuildthecloud/rancher
Random fixes
2016-02-04 12:15:26 -08:00
Darren Shepherd
28bd8b0ccb Fix ros dev panic 2016-02-04 09:25:36 -07:00
Darren Shepherd
ce915927be Fix issue with depulicate ssh keys after save
The CloudConfig.Save() did not load the metadata resulting in the diff
function always thinking the SSH keys were new.  This would cause them
to be saved over and over again just getting bigger and bigger.
2016-02-04 09:13:20 -07:00
Darren Shepherd
77242012e7 Change OEM log message 2016-02-04 09:06:16 -07:00
Darren Shepherd
8ac9b1137b Set signal channel to a sufficiently large buffer size 2016-02-04 09:06:15 -07:00
Ivan Mikushin
34f3307480 bump the kernel to the latest with Rancher TCMU patches 2016-02-03 15:07:45 -08:00
Wang Long
db49753d1a do not print success info when loading images error
when the client.LoadImage return an error, there should not be print
success info like the following:

    "INFO[0000] Done loading images from /usr/share/ros/images.tar"

This patch fix it by move the log.Infof() after the err check.

Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-02-03 20:24:12 +08:00
Darren Shepherd
2cbde58c30 Revert "Remove unused SshConfig type"
This reverts commit 246791d325.
2016-01-28 08:27:17 -07:00
Darren Shepherd
618cd741d8 Sort SSH keys from metadata so that diff functions will be consistent 2016-01-28 08:11:54 -07:00
Darren Shepherd
b7bbad4072 Enabled userland proxy by default for user Docker 2016-01-28 08:11:54 -07:00
Darren Shepherd
4cd6d99b5e Add packet cloud config support 2016-01-28 08:11:54 -07:00
Darren Shepherd
946d353e0c vendor packngo 2016-01-28 08:11:54 -07:00
Darren Shepherd
9187ed724d Merge pull request #712 from imikushin/trash
Use trash to manage deps
2016-01-26 18:15:05 -07:00
Darren Shepherd
cc566d1f79 Merge pull request #737 from pra85/patch-1
Update license year range to 2016
2016-01-26 18:14:26 -07:00
Prayag Verma
25761aea10 Update license year range to 2016 2016-01-19 11:06:39 +05:30
Ivan Mikushin
90b2e1867e Merge pull request #729 from imikushin/go-1.5.3
Update to Go-1.5.3
2016-01-14 15:09:19 +05:00
Ivan Mikushin
51f68eaf6f Update to Go-1.5.3
Security update: https://groups.google.com/forum/#!topic/golang-announce/MEATuOi_ei4
2016-01-14 13:38:20 +05:00
Ivan Mikushin
296f30764b Merge pull request #715 from imikushin/kernel-bump
bump the kernel to Ubuntu-4.2.0-22.27 (linux-4.2.6)
2015-12-29 18:19:59 +05:00
Ivan Mikushin
e68db135a8 bump the kernel to Ubuntu-4.2.0-22.27 (linux-4.2.6) 2015-12-29 18:15:47 +05:00
Darren Shepherd
c59fb78303 Merge pull request #705 from ibuildthecloud/mdadm
Add mdadm scan flag and state script
2015-12-23 13:07:35 -07:00
Ivan Mikushin
9a5b5d9e62 Use trash to manage deps 2015-12-23 18:09:48 +05:00
Darren Shepherd
e4c2cb2223 Merge pull request #708 from ibuildthecloud/netconf
Bump vendored netconf
2015-12-22 22:05:02 -07:00
Darren Shepherd
6cf84c7dc6 Bump vendored netconf 2015-12-22 21:55:36 -07:00
Darren Shepherd
af0bd7d36b Add mdadm scan flag and state script 2015-12-22 18:14:07 -07:00
Darren Shepherd
7e4f8fe87d Merge pull request #704 from ibuildthecloud/one
Remove unneeded code
2015-12-22 17:12:19 -07:00
Darren Shepherd
439173a175 Merge pull request #703 from ibuildthecloud/oem
Support OEM partition and oem-conifg.yml
2015-12-22 17:11:50 -07:00
Darren Shepherd
ee257f944e Remove unneeded code 2015-12-22 17:11:25 -07:00
Darren Shepherd
bad2aca5b1 Merge pull request #702 from ibuildthecloud/one
Farewell PID one
2015-12-22 17:04:17 -07:00
Darren Shepherd
1a95080522 Support OEM partition and oem-config.yml 2015-12-22 17:03:50 -07:00
Darren Shepherd
cd2829d220 Farewell PID one
This change no longer runs Docker as PID 1.  Instead PID 1 is a very
simple zombie reaper and Docker is moved as a child of that PID.
2015-12-22 15:38:32 -07:00
Darren Shepherd
6df9841283 Merge pull request #701 from ibuildthecloud/subdir
Use a subdirectory of the state partition
2015-12-22 15:25:21 -07:00
Darren Shepherd
808fbdbe1f Use a subdirectory of the state partition 2015-12-22 15:16:22 -07:00
Darren Shepherd
7252a543f2 Merge pull request #700 from ibuildthecloud/close
Close file in wait for network
2015-12-22 14:53:34 -07:00
Darren Shepherd
3ee82333db Close file in wait for network 2015-12-22 08:59:35 -07:00
Denise
9c6b16928a Update README.md 2015-12-21 12:05:14 -08:00
Darren Shepherd
40c861d0d1 Merge pull request #696 from ibuildthecloud/ssh
Remove unused SshConfig type
2015-12-21 10:09:58 -07:00
Darren Shepherd
b208987ee7 Merge pull request #691 from imikushin/services-include-names
Fix naming of external services (e.g. specified by rancher.services_include)
2015-12-21 00:01:46 -07:00
Ivan Mikushin
f4f59e97cc Fix naming of external services (e.g. specified by rancher.services_include)
Add container_name key to service configuration.
2015-12-21 11:49:43 +05:00
Darren Shepherd
246791d325 Remove unused SshConfig type 2015-12-20 23:33:15 -07:00
Darren Shepherd
0fc5fcca09 Merge pull request #694 from imikushin/fix-cc-merge
Fix CloudConfig.Merge()
2015-12-19 22:09:12 -07:00
Darren Shepherd
7068935d3c Merge pull request #684 from imikushin/dapper
Use drone-0.4 for CI and migrate build to dapper
2015-12-19 21:27:32 -07:00
Ivan Mikushin
15ac925c50 fix CloudConfig.Merge() 2015-12-18 20:28:19 +05:00
Ivan Mikushin
349df9adc7 Bump libcompose
Replace empty slices with nils in unmarshaled libcompose datatypes.
2015-12-18 20:21:40 +05:00
Ivan Mikushin
99bec55a2f Use drone-0.4 for CI and migrate build to dapper 2015-12-18 19:24:24 +05:00
Ivan Mikushin
d18ec0d34b Merge pull request #692 from ibuildthecloud/godep
Newer version of coreos-cloudinit
2015-12-18 15:11:02 +05:00
Darren Shepherd
5751e0dba9 Newer version of coreos-cloudinit 2015-12-17 22:43:56 -07:00