1
0
mirror of https://github.com/rancher/os.git synced 2025-08-18 14:58:32 +00:00
Commit Graph

1745 Commits

Author SHA1 Message Date
Ivan Mikushin
a60d9059d4 Merge pull request #776 from imikushin/docker-1.10.2
bump to docker-1.10.2
2016-02-23 17:01:59 -08:00
Ivan Mikushin
967ff31e00 bump to docker-1.10.2 2016-02-23 16:56:27 -08:00
Darren Shepherd
c95515efb7 Merge pull request #774 from joshwget/rename-selinux-tools-image
Rename SELinux tools image
2016-02-23 12:26:11 -07:00
Josh Curl
99450ccdd4 Rename SELinux tools image 2016-02-23 08:59:58 -08:00
Darren Shepherd
42a0c45245 Merge pull request #772 from joshwget/selinux-tools-command
SELinux tools command
2016-02-22 22:41:14 -07:00
Josh Curl
d1abe590dd SELinux tools command 2016-02-22 21:35:15 -08:00
Darren Shepherd
e2dffb0561 Merge pull request #770 from joshwget/selinux
Enable SELinux
2016-02-22 11:26:01 -07:00
Josh Curl
f28d463504 Enable SELinux 2016-02-19 16:11:32 -08:00
Josh Curl
90c8de9c0a Update rancher/docker-from-scratch 2016-02-18 16:35:53 -08:00
Darren Shepherd
cd8ab49579 Merge pull request #769 from ibuildthecloud/os
Scripts to build OpenStack/KVM image
2016-02-18 10:11:44 -07:00
Darren Shepherd
01252fc044 Scripts to build OpenStack/KVM image 2016-02-18 10:10:56 -07:00
Darren Shepherd
9b2339fcd0 Merge pull request #768 from ibuildthecloud/rpi
RPI building scripts
2016-02-18 09:59:29 -07:00
Darren Shepherd
b2db201af9 RPI building scripts 2016-02-18 09:58:39 -07:00
Ivan Mikushin
ba5e4471b7 Merge pull request #765 from imikushin/bump-dev-version
v0.4.4-dev
2016-02-16 14:43:25 -08:00
Ivan Mikushin
bb62a71a93 v0.4.4-dev 2016-02-16 14:31:11 -08:00
Ivan Mikushin
96b52c6cad Merge pull request #763 from imikushin/bump-docker
bump to docker-1.10.1
2016-02-15 14:29:18 -08:00
Ivan Mikushin
2f0a918ba4 bump to docker-1.10.1 2016-02-15 14:08:23 -08:00
Ivan Mikushin
0acd347554 Merge pull request #757 from ibuildthecloud/fix-set-list
Fix ros config set for list values
2016-02-11 10:22:21 -08:00
Ivan Mikushin
b952c686cb Merge pull request #759 from ibuildthecloud/respawn
Respawn
2016-02-11 10:22:04 -08:00
Darren Shepherd
6f98e06d97 Fix ros config set for list values 2016-02-11 09:25:48 -07:00
Darren Shepherd
b0b06558d4 Minor cleanup to not use the setsid binary 2016-02-11 09:04:35 -07:00
Darren Shepherd
da7abd871e Merge pull request #756 from ibuildthecloud/networking
Networking
2016-02-09 14:34:30 -07:00
Darren Shepherd
59292bbcf6 Bump DFS to rancher/docker:v1.10.0-1 2016-02-09 14:04:59 -07:00
Darren Shepherd
f12a7c3508 Fix packet support 2016-02-09 14:04:58 -07:00
Darren Shepherd
0d6c78ce28 Update networking
Add support for VLANs, bridging, and bonding.
2016-02-09 14:04:52 -07:00
Darren Shepherd
00b7dfea1f Create directory if missing when writing network.yml 2016-02-08 21:46:17 -07:00
Darren Shepherd
1e0125c508 Merge pull request #735 from imikushin/multiarch
Multi-arch build: amd64, arm
2016-02-08 18:57:24 -07:00
Ivan Mikushin
2f27271a2c Multi-arch build
Currently, for amd64 (the default) and arm.
Run `dapper make ARCH=arm rootfs` to build rootfs.tar.gz for arm.
2016-02-08 16:49:49 -08:00
Darren Shepherd
b8545ea2e0 Merge pull request #754 from oillio/patch-1
Fix bug in install script
2016-02-08 16:55:46 -07:00
Dan Jasek
9adfdf6ef9 Fix bug in install script
lsblk -o label will list the labels of the block devices. Using name only returns /dev/sda, etc.
In some cases, labels may be repeated (eg - RAID configurations).  It is safer to use greater than 0.
2016-02-06 19:23:29 -07:00
Darren Shepherd
0a75d86374 Merge pull request #753 from imikushin/bump-stuff
Bump a few libs to latest tagged versions
2016-02-05 21:24:29 -07:00
Ivan Mikushin
caeacfa6ed Bump a few libs to latest tagged versions 2016-02-04 22:53:59 -08:00
Ivan Mikushin
3a0aebe738 Merge pull request #752 from imikushin/bump-docker-binary
docker-1.10: bump downloadable docker binary
2016-02-04 22:52:03 -08:00
Ivan Mikushin
083af791b7 docker-1.10: bump downloadable docker binary 2016-02-04 22:41:36 -08:00
Ivan Mikushin
ab530c99fa Merge pull request #751 from imikushin/bump-dfs
vendor dfs-1.10.0 go code
2016-02-04 19:29:14 -08:00
Ivan Mikushin
e2bab3b1f6 vendor dfs-1.10.0 go code 2016-02-04 19:23:51 -08:00
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