1
0
mirror of https://github.com/rancher/os.git synced 2025-07-12 14:18:01 +00:00
Commit Graph

838 Commits

Author SHA1 Message Date
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
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
Ivan Mikushin
e64ef7e35c Merge pull request #689 from imikushin/die-qemu-die
Integration tests: make sure qemu exits in fixture finalizer
2015-12-17 16:50:16 +05:00
Ivan Mikushin
ac3d7afca6 Integration tests: make sure qemu exits in fixture finalizer
Also, make sure qemu is alive in wait_for_ssh.
2015-12-17 14:59:52 +05:00
Ivan Mikushin
d57c9ecd81 Merge pull request #688 from imikushin/bump-dev-ver
Bump dev version to v0.4.3-dev
2015-12-17 14:38:03 +05:00
Ivan Mikushin
580dfea665 Bump dev version to v0.4.3-dev 2015-12-17 14:21:15 +05:00
Ivan Mikushin
c8e96e28aa Merge pull request #686 from imikushin/bump-releases
bump releases.yml
2015-12-17 14:07:04 +05:00
Ivan Mikushin
8e686b92ba bump releases.yml 2015-12-17 02:10:57 +05:00
Ivan Mikushin
6698e4f46e Merge pull request #663 from robbertkl/master
Avoid hardcoded reference to /scripts
2015-12-11 18:40:21 +05:00
Ivan Mikushin
ea5a893328 Merge pull request #681 from imikushin/hosts
Resolve localhost and current hostname
2015-12-11 17:43:20 +05:00
Ivan Mikushin
084fb43201 tweak tests 2015-12-11 17:38:00 +05:00
Ivan Mikushin
f03486263b Resolve localhost and current hostname 2015-12-11 16:44:26 +05:00
Ivan Mikushin
6e453ccbcd Merge pull request #682 from imikushin/tls
Fix server TLS key and cert auto-generation
2015-12-11 16:39:47 +05:00
Ivan Mikushin
fde9d035b0 test docker --tlsverify 2015-12-11 13:41:19 +05:00
Ivan Mikushin
3e44413aa9 Default dirs for TLS cert generation
/etc/docker/tls - for server
/home/rancher/.docker - for client
2015-12-11 13:41:19 +05:00
Ivan Mikushin
6b7ddfaff2 Fix server TLS key and cert auto-generation.
To use TLS with docker, just `ros set rancher.docker.tls true` and `system-docker restart docker` (no need to restart if rancher.docker.tls is set in cloud-config on boot).
2015-12-11 13:41:18 +05:00
Darren Shepherd
23c8f5eaec Merge pull request #678 from imikushin/ros-tls-gen
fix `ros tls generate`
2015-12-09 20:40:48 -07:00
Darren Shepherd
0e21008c45 Merge pull request #659 from imikushin/libcompose
Migrate to upstream libcompose
2015-12-09 20:38:15 -07:00
Ivan Mikushin
ea2d8b30e3 Cleanup ./vendor dir 2015-12-09 20:55:32 +05:00
Ivan Mikushin
f3afb076f7 Add ./scripts/vendor-cleanup.sh
And cleanup glide.yaml
2015-12-09 20:55:00 +05:00
Ivan Mikushin
cc6a161df1 bump libcompose (avoid panics on non-string leaf values in certain data types) 2015-12-09 09:55:50 +05:00
Ivan Mikushin
b757709253 fix ros tls generate
`ros tls generate -s` used to leave empty strings in rancher.docker.{ca_cert,ca_key} config keys, so the documented setup workflow would not work.
2015-12-08 18:12:01 +05:00
Ivan Mikushin
0c0cb2aa5f fix a deprecation warning from go build 2015-12-08 10:00:02 +05:00