1
0
mirror of https://github.com/rancher/os.git synced 2025-08-02 07:24:28 +00:00
Commit Graph

1046 Commits

Author SHA1 Message Date
Darren Shepherd
c09b807991 Merge pull request #860 from imikushin/rootfs-build-fix
Fix building rootfs for arm on amd64
2016-05-16 18:51:22 -07:00
Denise
a50d2e4c90 Update README.md 2016-05-13 14:39:35 -07:00
Denise
f5ae8d9dab Update README.md 2016-05-13 14:39:16 -07:00
Darren Shepherd
053f1db6be Merge pull request #932 from imikushin/fix-ci
fix ./scripts/run: create a unique loopback device for each run
2016-05-11 19:36:12 -07:00
Ivan Mikushin
d664c96001 fix ./scripts/run: create a unique loopback device for each run 2016-05-11 15:36:56 -07:00
Darren Shepherd
de7930d820 Merge pull request #927 from rancher/revert-847-bind-mount-var-lib-system-docker
Revert "Bind mount /var/lib/system-docker"
2016-05-09 15:20:38 -07:00
Josh Curl
8b75535eb5 Revert "Bind mount /var/lib/system-docker" 2016-05-09 15:13:14 -07:00
Darren Shepherd
8eefaeb5ed Merge pull request #925 from imikushin/go-1.6.2
use go-1.6.2
2016-05-08 20:40:11 -07:00
Ivan Mikushin
696478ad9b use go-1.6.2 2016-05-08 20:28:52 -07:00
Darren Shepherd
c3fd028395 Merge pull request #919 from rancher/revert-910-share-mount
Revert "/media and /mnt mounted as shared for console"
2016-05-07 15:09:25 -07:00
Josh Curl
2968bed32e Revert "/media and /mnt mounted as shared for console" 2016-05-07 15:08:39 -07:00
Darren Shepherd
bd2971aada Merge pull request #918 from joshwget/bump-netconf
Bump netconf
2016-05-07 14:56:11 -07:00
Josh Curl
0e82ddadfc Bump netconf 2016-05-07 13:41:57 -07:00
Darren Shepherd
a9ca80d47d Merge pull request #917 from joshwget/proxy-settings
HTTP proxy settings can be set in cloud config
2016-05-07 12:56:52 -07:00
Josh Curl
ae543ab167 HTTP proxy settings can be set in cloud config 2016-05-06 16:25:07 -07:00
Darren Shepherd
3c8559a576 Merge pull request #910 from joshwget/share-mount
/media and /mnt mounted as shared for console
2016-05-06 15:12:28 -07:00
Denise
acc2ee297a Update ISSUE_TEMPLATE.md 2016-05-05 22:12:07 -07:00
Denise
409ed945d1 Merge pull request #915 from deniseschannon/issuetemplate
Adding issue template
2016-05-05 22:11:18 -07:00
deniseschannon
0af0a517ca Adding issue template 2016-05-05 20:32:30 -07:00
Josh Curl
7241390042 /media and /mnt mounted as shared for console 2016-05-04 16:18:24 -07:00
Darren Shepherd
a888a57cd9 Merge pull request #892 from datawolf/fix-test-to-work-with-multi-arch
Modify the test_11_environment to work with multiple architectures
2016-05-02 13:25:06 -07:00
Darren Shepherd
cd84bd8cf6 Merge pull request #896 from joshwget/ros-config-set-default-value
Fix setting default values with 'ros config set'
2016-05-02 13:24:54 -07:00
Darren Shepherd
c94f2451d4 Merge pull request #897 from datawolf/fix-set-rancher.debug-error
Remove `-D` when we set rancher.debug=false
2016-05-02 13:24:32 -07:00
Darren Shepherd
d1957b834b Merge pull request #903 from joshwget/update-policy
Update policy
2016-04-30 10:50:51 -07:00
Josh Curl
b68447daaf Update policy 2016-04-30 10:04:22 -07:00
Wang Long
fa98165862 Remove -D when we set rancher.debug=false
when we set rancher.debug to true, the current code also set `-D` flag
to system-docker and user-docker daemon.
and then we change rancher.debug to false, the `-D` flag is also exist
by using command `sudo ros config get rancher.docker`.

this patch fix it.

Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-04-29 09:55:42 +08:00
Darren Shepherd
1f49d44fdb Merge pull request #901 from joshwget/unconfined-console
Processes in console container run as unconfined_t
2016-04-28 17:52:50 -07:00
Josh Curl
3fa11f963d Processes in console container run as unconfined_t 2016-04-27 15:33:02 -07:00
Darren Shepherd
862344bfc3 Merge pull request #891 from joshwget/switch-console-dependency
Console service should depend on wait-for-network
2016-04-25 10:59:26 -07:00
Darren Shepherd
f15967a7a3 Merge pull request #890 from joshwget/add-upgrade-console-flag
Add upgrade flag to upgrade persistent console
2016-04-25 10:50:37 -07:00
Josh Curl
6ab32ae19c Fix setting default values with 'ros config set' 2016-04-22 16:11:54 -07:00
Wang Long
4439cdde41 Modify the test_11_environment to work with multiple architectures
Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-04-19 11:36:41 +08:00
Josh Curl
ee73337f49 Add upgrade flag to upgrade persistent console 2016-04-18 17:00:18 -07:00
Josh Curl
35ee0b5982 Console service should depend on wait-for-network 2016-04-18 16:35:24 -07:00
Denise
eeea325e54 Update README.md 2016-04-15 11:23:33 -07:00
Denise
f878b31407 Merge pull request #885 from joshwget/update-readme
Update README.md
2016-04-15 11:13:07 -07:00
Darren Shepherd
d657155723 Merge pull request #884 from joshwget/remove-dns-override
Remove DHCP override flag
2016-04-15 10:58:19 -07:00
Josh Curl
8862878337 Remove DHCP override flag 2016-04-15 10:38:31 -07:00
Josh Curl
ad1098a730 Update README.md 2016-04-14 23:02:56 -07:00
Darren Shepherd
8b4e6cc502 Merge pull request #881 from joshwget/fix-dhcp-hostname
Fix DHCP hostname being overwritten
2016-04-14 21:59:38 -07:00
Josh Curl
a0ae6222c9 Fix DHCP hostname being overwritten 2016-04-14 21:58:07 -07:00
Darren Shepherd
5d15d3aa2c Merge pull request #882 from joshwget/unmarshal-args-as-yaml
Use yaml.Unmarshal to handle config arguments
2016-04-14 21:47:07 -07:00
Darren Shepherd
f7cd87e2fb Merge pull request #873 from joshwget/dns-integration-tests
Integration tests for DNS configuration in cloud config
2016-04-14 21:46:39 -07:00
Josh Curl
53acef17cd Use yaml.Unmarshal to handle config arguments 2016-04-14 17:04:00 -07:00
Ivan Mikushin
1df1582459 Fix building rootfs for arm on amd64 2016-04-13 14:40:28 -07:00
Darren Shepherd
447a96a5f8 Merge pull request #880 from joshwget/add-unit-tests-to-ci
Add unit tests to CI
2016-04-13 11:53:19 -07:00
Josh Curl
3c78335edf Integration tests for DNS configuration in cloud config 2016-04-13 11:24:00 -07:00
Josh Curl
adb8ad3e3a Add unit tests to CI 2016-04-13 11:23:21 -07:00
Josh Curl
b52663ee5f Fix config/config_test.go 2016-04-13 10:26:41 -07:00
Darren Shepherd
778b6c9b85 Merge pull request #878 from joshwget/fix-system-service-environment-variables
Fix environment variables set for system services
2016-04-13 09:50:15 -07:00