1
0
mirror of https://github.com/rancher/os.git synced 2025-07-06 19:38:37 +00:00
Commit Graph

2371 Commits

Author SHA1 Message Date
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
Ivan Mikushin
952ef13128 use docker-1.9.1 for ci too 2015-12-08 08:51:00 +05:00
Ivan Mikushin
66ba159482 Pre-process YAML config data
Stringify libcompose datatypes' leaf values to avoid unmarshaling errors, even on somewhat incorrect input data: like using bools or numerics in labels.
2015-12-07 23:30:16 +05:00
Ivan Mikushin
07fdba4642 Recreate create-only containers and force rename after recreate 2015-12-07 18:17:57 +05:00
Ivan Mikushin
5a363ab97d migrate to upstream libcompose in one and a half go 2015-12-07 18:17:57 +05:00
Ivan Mikushin
1d691cd8d6 move dependencies to vendor 2015-12-04 20:19:31 +05:00
Ivan Mikushin
63d7de67cd specify dependencies in glide.yaml 2015-12-04 20:19:30 +05:00
Ivan Mikushin
b6930f9bb6 Merge pull request #669 from imikushin/dns-no-reboot
Configure DNS nameservers with DHCP or cloud-config
2015-12-02 21:00:11 +05:00
Ivan Mikushin
a323c1bb02 Network: configure nameservers from DHCP and cloud-config
If dns.override is set, use dns.nameservers from cloud-config over the ones set by DHCP. To reconfigure DNS just restart the network service.
2015-12-02 20:59:06 +05:00
Ivan Mikushin
94d4114172 Merge pull request #674 from imikushin/docker-1.9.1
update to docker-1.9.1 and docker-from-scratch-1.9.1
2015-12-02 20:57:48 +05:00
Ivan Mikushin
2c89796274 integration tests: log while we are waiting for ssh and docker 2015-12-02 17:24:35 +05:00
Ivan Mikushin
887af95d8f update to docker-1.9.1 and docker-from-scratch-1.9.1 2015-12-02 15:10:11 +05:00
Robbert Klarenbeek
c42d1b5716 Avoid hardcoded reference to /scripts 2015-11-25 18:33:24 +01:00
Denise
110ccd9f49 Update README.md 2015-11-24 23:02:43 -08:00
Denise
74b306b920 Update README.md 2015-11-24 23:00:25 -08:00
Ivan Mikushin
27c8e1ed15 Merge pull request #653 from imikushin/moar-tests
refactor tests a little bit
2015-11-18 17:54:20 +05:00
Ivan Mikushin
b10a093c62 test dhcpcd running in background after network has initialized 2015-11-18 14:50:56 +05:00
Ivan Mikushin
3395ede89d rename tests package to rostest 2015-11-18 14:37:38 +05:00