").append( jQuery.parseHTML( responseText ) ).find( selector ) :
+
+ // Otherwise use the full result
+ responseText );
+
+ }).complete( callback && function( jqXHR, status ) {
+ self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
+ });
+ }
+
+ return this;
+};
+
+
+
+
+jQuery.expr.filters.animated = function( elem ) {
+ return jQuery.grep(jQuery.timers, function( fn ) {
+ return elem === fn.elem;
+ }).length;
+};
+
+
+
+
+
+var docElem = window.document.documentElement;
+
+/**
+ * Gets a window from an element
+ */
+function getWindow( elem ) {
+ return jQuery.isWindow( elem ) ?
+ elem :
+ elem.nodeType === 9 ?
+ elem.defaultView || elem.parentWindow :
+ false;
+}
+
+jQuery.offset = {
+ setOffset: function( elem, options, i ) {
+ var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
+ position = jQuery.css( elem, "position" ),
+ curElem = jQuery( elem ),
+ props = {};
+
+ // set position first, in-case top/left are set even on static elem
+ if ( position === "static" ) {
+ elem.style.position = "relative";
+ }
+
+ curOffset = curElem.offset();
+ curCSSTop = jQuery.css( elem, "top" );
+ curCSSLeft = jQuery.css( elem, "left" );
+ calculatePosition = ( position === "absolute" || position === "fixed" ) &&
+ jQuery.inArray("auto", [ curCSSTop, curCSSLeft ] ) > -1;
+
+ // need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+ if ( calculatePosition ) {
+ curPosition = curElem.position();
+ curTop = curPosition.top;
+ curLeft = curPosition.left;
+ } else {
+ curTop = parseFloat( curCSSTop ) || 0;
+ curLeft = parseFloat( curCSSLeft ) || 0;
+ }
+
+ if ( jQuery.isFunction( options ) ) {
+ options = options.call( elem, i, curOffset );
+ }
+
+ if ( options.top != null ) {
+ props.top = ( options.top - curOffset.top ) + curTop;
+ }
+ if ( options.left != null ) {
+ props.left = ( options.left - curOffset.left ) + curLeft;
+ }
+
+ if ( "using" in options ) {
+ options.using.call( elem, props );
+ } else {
+ curElem.css( props );
+ }
+ }
+};
+
+jQuery.fn.extend({
+ offset: function( options ) {
+ if ( arguments.length ) {
+ return options === undefined ?
+ this :
+ this.each(function( i ) {
+ jQuery.offset.setOffset( this, options, i );
+ });
+ }
+
+ var docElem, win,
+ box = { top: 0, left: 0 },
+ elem = this[ 0 ],
+ doc = elem && elem.ownerDocument;
+
+ if ( !doc ) {
+ return;
+ }
+
+ docElem = doc.documentElement;
+
+ // Make sure it's not a disconnected DOM node
+ if ( !jQuery.contains( docElem, elem ) ) {
+ return box;
+ }
+
+ // If we don't have gBCR, just use 0,0 rather than error
+ // BlackBerry 5, iOS 3 (original iPhone)
+ if ( typeof elem.getBoundingClientRect !== strundefined ) {
+ box = elem.getBoundingClientRect();
+ }
+ win = getWindow( doc );
+ return {
+ top: box.top + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ),
+ left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
+ };
+ },
+
+ position: function() {
+ if ( !this[ 0 ] ) {
+ return;
+ }
+
+ var offsetParent, offset,
+ parentOffset = { top: 0, left: 0 },
+ elem = this[ 0 ];
+
+ // fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is its only offset parent
+ if ( jQuery.css( elem, "position" ) === "fixed" ) {
+ // we assume that getBoundingClientRect is available when computed position is fixed
+ offset = elem.getBoundingClientRect();
+ } else {
+ // Get *real* offsetParent
+ offsetParent = this.offsetParent();
+
+ // Get correct offsets
+ offset = this.offset();
+ if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
+ parentOffset = offsetParent.offset();
+ }
+
+ // Add offsetParent borders
+ parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
+ parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
+ }
+
+ // Subtract parent offsets and element margins
+ // note: when an element has margin: auto the offsetLeft and marginLeft
+ // are the same in Safari causing offset.left to incorrectly be 0
+ return {
+ top: offset.top - parentOffset.top - jQuery.css( elem, "marginTop", true ),
+ left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true)
+ };
+ },
+
+ offsetParent: function() {
+ return this.map(function() {
+ var offsetParent = this.offsetParent || docElem;
+
+ while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position" ) === "static" ) ) {
+ offsetParent = offsetParent.offsetParent;
+ }
+ return offsetParent || docElem;
+ });
+ }
+});
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
+ var top = /Y/.test( prop );
+
+ jQuery.fn[ method ] = function( val ) {
+ return access( this, function( elem, method, val ) {
+ var win = getWindow( elem );
+
+ if ( val === undefined ) {
+ return win ? (prop in win) ? win[ prop ] :
+ win.document.documentElement[ method ] :
+ elem[ method ];
+ }
+
+ if ( win ) {
+ win.scrollTo(
+ !top ? val : jQuery( win ).scrollLeft(),
+ top ? val : jQuery( win ).scrollTop()
+ );
+
+ } else {
+ elem[ method ] = val;
+ }
+ }, method, val, arguments.length, null );
+ };
+});
+
+// Add the top/left cssHooks using jQuery.fn.position
+// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
+// getComputedStyle returns percent when specified for top/left/bottom/right
+// rather than make the css module depend on the offset module, we just check for it here
+jQuery.each( [ "top", "left" ], function( i, prop ) {
+ jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
+ function( elem, computed ) {
+ if ( computed ) {
+ computed = curCSS( elem, prop );
+ // if curCSS returns percentage, fallback to offset
+ return rnumnonpx.test( computed ) ?
+ jQuery( elem ).position()[ prop ] + "px" :
+ computed;
+ }
+ }
+ );
+});
+
+
+// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
+jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
+ jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
+ // margin is only for outerHeight, outerWidth
+ jQuery.fn[ funcName ] = function( margin, value ) {
+ var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
+ extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
+
+ return access( this, function( elem, type, value ) {
+ var doc;
+
+ if ( jQuery.isWindow( elem ) ) {
+ // As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
+ // isn't a whole lot we can do. See pull request at this URL for discussion:
+ // https://github.com/jquery/jquery/pull/764
+ return elem.document.documentElement[ "client" + name ];
+ }
+
+ // Get document width or height
+ if ( elem.nodeType === 9 ) {
+ doc = elem.documentElement;
+
+ // Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
+ // unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
+ return Math.max(
+ elem.body[ "scroll" + name ], doc[ "scroll" + name ],
+ elem.body[ "offset" + name ], doc[ "offset" + name ],
+ doc[ "client" + name ]
+ );
+ }
+
+ return value === undefined ?
+ // Get width or height on the element, requesting but not forcing parseFloat
+ jQuery.css( elem, type, extra ) :
+
+ // Set width or height on the element
+ jQuery.style( elem, type, value, extra );
+ }, type, chainable ? margin : undefined, chainable, null );
+ };
+ });
+});
+
+
+// The number of elements contained in the matched element set
+jQuery.fn.size = function() {
+ return this.length;
+};
+
+jQuery.fn.andSelf = jQuery.fn.addBack;
+
+
+
+
+// Register as a named AMD module, since jQuery can be concatenated with other
+// files that may use define, but not via a proper concatenation script that
+// understands anonymous AMD modules. A named AMD is safest and most robust
+// way to register. Lowercase jquery is used because AMD module names are
+// derived from file names, and jQuery is normally delivered in a lowercase
+// file name. Do this after creating the global so that if an AMD module wants
+// to call noConflict to hide this version of jQuery, it will work.
+
+// Note that for maximum portability, libraries that are not jQuery should
+// declare themselves as anonymous modules, and avoid setting a global if an
+// AMD loader is present. jQuery is a special case. For more information, see
+// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
+
+if ( typeof define === "function" && define.amd ) {
+ define( "jquery", [], function() {
+ return jQuery;
+ });
+}
+
+
+
+
+var
+ // Map over jQuery in case of overwrite
+ _jQuery = window.jQuery,
+
+ // Map over the $ in case of overwrite
+ _$ = window.$;
+
+jQuery.noConflict = function( deep ) {
+ if ( window.$ === jQuery ) {
+ window.$ = _$;
+ }
+
+ if ( deep && window.jQuery === jQuery ) {
+ window.jQuery = _jQuery;
+ }
+
+ return jQuery;
+};
+
+// Expose jQuery and $ identifiers, even in
+// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
+// and CommonJS for browser emulators (#13566)
+if ( typeof noGlobal === strundefined ) {
+ window.jQuery = window.$ = jQuery;
+}
+
+
+
+
+return jQuery;
+
+}));
diff --git a/docs/vendor/lato/lato-v11-latin-300.eot b/docs/vendor/lato/lato-v11-latin-300.eot
new file mode 100644
index 00000000..4c77b134
Binary files /dev/null and b/docs/vendor/lato/lato-v11-latin-300.eot differ
diff --git a/docs/vendor/lato/lato-v11-latin-300.svg b/docs/vendor/lato/lato-v11-latin-300.svg
new file mode 100644
index 00000000..ebe36baa
--- /dev/null
+++ b/docs/vendor/lato/lato-v11-latin-300.svg
@@ -0,0 +1,4148 @@
+
+
+
+
+
+
diff --git a/docs/vendor/lato/lato-v11-latin-300.ttf b/docs/vendor/lato/lato-v11-latin-300.ttf
new file mode 100644
index 00000000..3be3b622
Binary files /dev/null and b/docs/vendor/lato/lato-v11-latin-300.ttf differ
diff --git a/docs/vendor/lato/lato-v11-latin-300.woff b/docs/vendor/lato/lato-v11-latin-300.woff
new file mode 100644
index 00000000..5e6f22fa
Binary files /dev/null and b/docs/vendor/lato/lato-v11-latin-300.woff differ
diff --git a/docs/vendor/lato/lato-v11-latin-300.woff2 b/docs/vendor/lato/lato-v11-latin-300.woff2
new file mode 100644
index 00000000..2b00ae0b
Binary files /dev/null and b/docs/vendor/lato/lato-v11-latin-300.woff2 differ
diff --git a/docs/vendor/lato/lato-v11-latin-900.eot b/docs/vendor/lato/lato-v11-latin-900.eot
new file mode 100644
index 00000000..17469e0e
Binary files /dev/null and b/docs/vendor/lato/lato-v11-latin-900.eot differ
diff --git a/docs/vendor/lato/lato-v11-latin-900.svg b/docs/vendor/lato/lato-v11-latin-900.svg
new file mode 100644
index 00000000..0574aeb9
--- /dev/null
+++ b/docs/vendor/lato/lato-v11-latin-900.svg
@@ -0,0 +1,4152 @@
+
+
+
+
+
+
diff --git a/docs/vendor/lato/lato-v11-latin-900.ttf b/docs/vendor/lato/lato-v11-latin-900.ttf
new file mode 100644
index 00000000..c2ba188b
Binary files /dev/null and b/docs/vendor/lato/lato-v11-latin-900.ttf differ
diff --git a/docs/vendor/lato/lato-v11-latin-900.woff b/docs/vendor/lato/lato-v11-latin-900.woff
new file mode 100644
index 00000000..d3893f73
Binary files /dev/null and b/docs/vendor/lato/lato-v11-latin-900.woff differ
diff --git a/docs/vendor/lato/lato-v11-latin-900.woff2 b/docs/vendor/lato/lato-v11-latin-900.woff2
new file mode 100644
index 00000000..6a937447
Binary files /dev/null and b/docs/vendor/lato/lato-v11-latin-900.woff2 differ
diff --git a/docs/vendor/lato/lato-v11-latin-regular.eot b/docs/vendor/lato/lato-v11-latin-regular.eot
new file mode 100644
index 00000000..28343da0
Binary files /dev/null and b/docs/vendor/lato/lato-v11-latin-regular.eot differ
diff --git a/docs/vendor/lato/lato-v11-latin-regular.svg b/docs/vendor/lato/lato-v11-latin-regular.svg
new file mode 100644
index 00000000..f7678d37
--- /dev/null
+++ b/docs/vendor/lato/lato-v11-latin-regular.svg
@@ -0,0 +1,4148 @@
+
+
+
+
+
+
diff --git a/docs/vendor/lato/lato-v11-latin-regular.ttf b/docs/vendor/lato/lato-v11-latin-regular.ttf
new file mode 100644
index 00000000..7608bc3e
Binary files /dev/null and b/docs/vendor/lato/lato-v11-latin-regular.ttf differ
diff --git a/docs/vendor/lato/lato-v11-latin-regular.woff b/docs/vendor/lato/lato-v11-latin-regular.woff
new file mode 100644
index 00000000..49e60447
Binary files /dev/null and b/docs/vendor/lato/lato-v11-latin-regular.woff differ
diff --git a/docs/vendor/lato/lato-v11-latin-regular.woff2 b/docs/vendor/lato/lato-v11-latin-regular.woff2
new file mode 100644
index 00000000..5469216e
Binary files /dev/null and b/docs/vendor/lato/lato-v11-latin-regular.woff2 differ
diff --git a/docs/vendor/lato/lato.css b/docs/vendor/lato/lato.css
new file mode 100644
index 00000000..2d977768
--- /dev/null
+++ b/docs/vendor/lato/lato.css
@@ -0,0 +1,39 @@
+/* lato-300 - latin */
+@font-face {
+ font-family: 'Lato';
+ font-style: normal;
+ font-weight: 300;
+ src: url('lato-v11-latin-300.eot'); /* IE9 Compat Modes */
+ src: local('Lato Light'), local('Lato-Light'),
+ url('lato-v11-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+ url('lato-v11-latin-300.woff2') format('woff2'), /* Super Modern Browsers */
+ url('lato-v11-latin-300.woff') format('woff'), /* Modern Browsers */
+ url('lato-v11-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */
+ url('lato-v11-latin-300.svg#Lato') format('svg'); /* Legacy iOS */
+}
+/* lato-regular - latin */
+@font-face {
+ font-family: 'Lato';
+ font-style: normal;
+ font-weight: 400;
+ src: url('lato-v11-latin-regular.eot'); /* IE9 Compat Modes */
+ src: local('Lato Regular'), local('Lato-Regular'),
+ url('lato-v11-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+ url('lato-v11-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+ url('lato-v11-latin-regular.woff') format('woff'), /* Modern Browsers */
+ url('lato-v11-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+ url('lato-v11-latin-regular.svg#Lato') format('svg'); /* Legacy iOS */
+}
+/* lato-900 - latin */
+@font-face {
+ font-family: 'Lato';
+ font-style: normal;
+ font-weight: 900;
+ src: url('lato-v11-latin-900.eot'); /* IE9 Compat Modes */
+ src: local('Lato Black'), local('Lato-Black'),
+ url('lato-v11-latin-900.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+ url('lato-v11-latin-900.woff2') format('woff2'), /* Super Modern Browsers */
+ url('lato-v11-latin-900.woff') format('woff'), /* Modern Browsers */
+ url('lato-v11-latin-900.ttf') format('truetype'), /* Safari, Android, iOS */
+ url('lato-v11-latin-900.svg#Lato') format('svg'); /* Legacy iOS */
+}
diff --git a/docs/volume/command-line-tools/index.md b/docs/volume/command-line-tools/index.md
new file mode 100644
index 00000000..da00c9f0
--- /dev/null
+++ b/docs/volume/command-line-tools/index.md
@@ -0,0 +1,8 @@
+---
+title: Command Line Tools
+layout: volume-default
+---
+
+## Command Line Tools
+---
+
diff --git a/docs/volume/contributing/index.md b/docs/volume/contributing/index.md
new file mode 100644
index 00000000..09eef529
--- /dev/null
+++ b/docs/volume/contributing/index.md
@@ -0,0 +1,26 @@
+---
+title: Contributing to RancherVolume
+layout: volume-default
+
+---
+
+## Contributing to RancherVolume
+---
+
+### Developing
+
+
+### Building
+
+
+### Repositories
+
+
+### Bugs
+
+If you find any bugs or are having any trouble, please contact us by filing an [issue](https://github.com/rancher/rancher-volume/issues/new).
+
+If you have any updates to our documentation, please make any PRs to our [docs repo](https://github.com/rancher/rancher.github.io).
+
+
+
\ No newline at end of file
diff --git a/docs/volume/faqs/index.md b/docs/volume/faqs/index.md
new file mode 100644
index 00000000..e8e95eaa
--- /dev/null
+++ b/docs/volume/faqs/index.md
@@ -0,0 +1,9 @@
+---
+title: FAQs
+layout: volume-default
+
+---
+
+## Frequently Asked Questions
+---
+
diff --git a/docs/volume/index.md b/docs/volume/index.md
new file mode 100644
index 00000000..bf80999e
--- /dev/null
+++ b/docs/volume/index.md
@@ -0,0 +1,8 @@
+---
+title: Overview of RancherVolume
+layout: volume-default
+---
+
+## Overview of RancherVolume
+---
+
diff --git a/docs/volume/quick-start-guide/index.md b/docs/volume/quick-start-guide/index.md
new file mode 100644
index 00000000..e881bd9c
--- /dev/null
+++ b/docs/volume/quick-start-guide/index.md
@@ -0,0 +1,10 @@
+---
+title: Quick Start Guide
+layout: volume-default
+
+---
+
+## Quick Start Guide
+---
+
+
diff --git a/images/01-base/Dockerfile b/images/01-base/Dockerfile
index 6929c088..2d256536 100644
--- a/images/01-base/Dockerfile
+++ b/images/01-base/Dockerfile
@@ -34,6 +34,10 @@ RUN rm /sbin/poweroff /sbin/reboot /sbin/halt && \
COPY inputrc /etc/inputrc
COPY growpart /usr/bin/growpart
RUN sed -i s/"partx --update \"\$part\" \"\$dev\""/"partx --update --nr \"\$part\" \"\$dev\""/g /usr/bin/growpart && \
- sed -i -e 's/duid/clientid/g' /etc/dhcpcd.conf
+ sed -i -e 's/duid/clientid/g' /etc/dhcpcd.conf && \
+ sed -i 1,10d /etc/rsyslog.conf && \
+ echo "*.* /var/log/syslog" >> /etc/rsyslog.conf
+# dump kernel log to console (but after we've finished booting)
+# echo "kern.* /dev/console" >> /etc/rsyslog.conf
ENTRYPOINT ["/usr/bin/ros", "entrypoint"]
diff --git a/images/01-base/entry.sh b/images/01-base/entry.sh
deleted file mode 100755
index ca1f5198..00000000
--- a/images/01-base/entry.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-if [ -e /host/dev ]; then
- mount --rbind /host/dev /dev
-fi
-
-CA_BASE=/etc/ssl/certs/ca-certificates.crt.rancher
-CA=/etc/ssl/certs/ca-certificates.crt
-
-if [[ -e ${CA_BASE} && ! -e ${CA} ]]; then
- cp $CA_BASE $CA
-fi
-
-exec "$@"
diff --git a/images/02-autoformat/Dockerfile b/images/02-bootstrap/Dockerfile
similarity index 62%
rename from images/02-autoformat/Dockerfile
rename to images/02-bootstrap/Dockerfile
index 9424c9ca..554d121e 100644
--- a/images/02-autoformat/Dockerfile
+++ b/images/02-bootstrap/Dockerfile
@@ -1,4 +1,3 @@
FROM rancher/os-base
COPY auto-format.sh /usr/sbin/
COPY od-1m0 /
-ENTRYPOINT ["/usr/sbin/auto-format.sh"]
diff --git a/images/02-autoformat/auto-format.sh b/images/02-bootstrap/auto-format.sh
similarity index 100%
rename from images/02-autoformat/auto-format.sh
rename to images/02-bootstrap/auto-format.sh
diff --git a/images/02-autoformat/od-1m0 b/images/02-bootstrap/od-1m0
similarity index 100%
rename from images/02-autoformat/od-1m0
rename to images/02-bootstrap/od-1m0
diff --git a/images/02-cloudinit/Dockerfile b/images/02-cloudinit/Dockerfile
deleted file mode 100644
index 88aa0d6c..00000000
--- a/images/02-cloudinit/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM rancher/os-base
-COPY cloud-init.sh /
-CMD ["/cloud-init.sh"]
diff --git a/images/02-cloudinit/cloud-init.sh b/images/02-cloudinit/cloud-init.sh
deleted file mode 100755
index 3c6c0c0a..00000000
--- a/images/02-cloudinit/cloud-init.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-set -x -e
-
-MOUNT_POINT=/media/config-2
-CONFIG_DEV=$(ros dev "LABEL=config-2")
-
-mkdir -p ${MOUNT_POINT}
-
-if [ -e "${CONFIG_DEV}" ]; then
- mount -t iso9660,vfat ${CONFIG_DEV} ${MOUNT_POINT}
-else
- mount -t 9p -o trans=virtio,version=9p2000.L config-2 ${MOUNT_POINT} 2>/dev/null || true
-fi
-
-cloud-init-save -network=${CLOUD_INIT_NETWORK:-true}
diff --git a/images/02-console/Dockerfile b/images/02-console/Dockerfile
index 37265454..a933b8cc 100644
--- a/images/02-console/Dockerfile
+++ b/images/02-console/Dockerfile
@@ -1,5 +1,4 @@
FROM rancher/os-base
-COPY update-ssh-keys /usr/sbin/
COPY build/lsb-release /etc/
RUN sed -i 's/rancher:!/rancher:*/g' /etc/shadow && \
sed -i 's/docker:!/docker:*/g' /etc/shadow && \
@@ -9,4 +8,3 @@ RUN sed -i 's/rancher:!/rancher:*/g' /etc/shadow && \
echo '## allow password less for docker user' >> /etc/sudoers && \
echo 'docker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
COPY prompt.sh /etc/profile.d/
-CMD ["/usr/sbin/console.sh"]
diff --git a/images/02-console/update-ssh-keys b/images/02-console/update-ssh-keys
deleted file mode 100755
index f2a0c637..00000000
--- a/images/02-console/update-ssh-keys
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-USERNAME=$1
-HOME_DIR=$(grep ^$USERNAME /etc/passwd | cut -f6 -d:)
-
-if [ ! -d $HOME_DIR/.ssh ]; then
- mkdir -p $HOME_DIR/.ssh
- chmod 0700 $HOME_DIR/.ssh
-fi
-
-if [ ! -e $HOME_DIR/.ssh/authorized_keys ]; then
- touch $HOME_DIR/.ssh/authorized_keys
- chmod 0600 $HOME_DIR/.ssh/authorized_keys
-fi
-
-if ! grep -q "$2" $HOME_DIR/.ssh/authorized_keys; then
- echo "$2" >> $HOME_DIR/.ssh/authorized_keys
-fi
-
-chown -R $USERNAME $HOME_DIR/.ssh
diff --git a/images/02-preload/Dockerfile b/images/02-preload/Dockerfile
deleted file mode 100644
index afc02c49..00000000
--- a/images/02-preload/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM rancher/os-base
-RUN ln -sf /var/lib/rancher/engine/docker /usr/bin/docker
-COPY preload.sh /
-CMD ["/preload.sh"]
diff --git a/images/02-preload/preload.sh b/images/02-preload/preload.sh
deleted file mode 100755
index 93526be2..00000000
--- a/images/02-preload/preload.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-set -e
-
-BASE=${1:-${PRELOAD_DIR}}
-BASE=${BASE:-/mnt/preload}
-
-if [ "${SYSTEM_IMAGES}" = "true" ]; then
- docker_bin=system-docker
-else
- docker_bin=docker
-fi
-
-should_load() {
- file=${1}
- if [[ ${file} =~ \.done$ ]]; then echo false
- elif [ -f ${file} ]; then
- if [[ ${file} -nt ${file}.done ]]; then echo true
- else echo false
- fi
- else echo false
- fi
-}
-
-if [ -d ${BASE} ]; then
- echo Preloading docker images from ${BASE}...
-
- for file in $(ls ${BASE}); do
- path=${BASE}/${file}
- loading=$(should_load ${path})
- if [ ${loading} == "true" ]; then
- CAT="cat ${path}"
- if [[ ${file} =~ \.t?gz$ ]]; then CAT="${CAT} | gunzip"; fi
- if [[ ${file} =~ \.t?xz$ ]]; then CAT="${CAT} | unxz"; fi
- wait-for-docker
- CAT="${CAT} | ${docker_bin} load"
- echo loading from ${path}
- eval ${CAT} || :
- touch ${path}.done || :
- fi
- done
-
- echo Done.
-else
- echo Can not preload images from ${BASE}: not a dir or does not exist.
-fi
-
diff --git a/images/02-statescript/Dockerfile b/images/02-statescript/Dockerfile
deleted file mode 100644
index 46dacbac..00000000
--- a/images/02-statescript/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM rancher/os-base
-COPY state.sh /usr/sbin/
-CMD ["/usr/sbin/state.sh"]
diff --git a/images/02-statescript/state.sh b/images/02-statescript/state.sh
deleted file mode 100755
index bc11050c..00000000
--- a/images/02-statescript/state.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -x
-
-if [ "$(ros config get rancher.state.mdadm_scan)" = "true" ]; then
- mdadm --assemble --scan
-fi
-
-ros config get rancher.state.script > config.sh
-if [ -s config.sh ]; then
- chmod +x config.sh
- exec ./config.sh
-fi
diff --git a/images/02-syslog/Dockerfile b/images/02-syslog/Dockerfile
deleted file mode 100644
index b97ad7bf..00000000
--- a/images/02-syslog/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM rancher/os-base
-COPY syslog.sh /
-RUN sed -i 1,10d /etc/rsyslog.conf
-CMD ["/syslog.sh"]
diff --git a/images/02-syslog/syslog.sh b/images/02-syslog/syslog.sh
deleted file mode 100755
index 285ffefa..00000000
--- a/images/02-syslog/syslog.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!bin/bash
-
-set -x -e
-
-exec rsyslogd -n
diff --git a/images/02-udev/Dockerfile b/images/02-udev/Dockerfile
deleted file mode 100644
index 6f8de398..00000000
--- a/images/02-udev/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM rancher/os-base
-COPY udev.sh /
-CMD ["/udev.sh"]
diff --git a/images/02-udev/udev.sh b/images/02-udev/udev.sh
deleted file mode 100755
index b91a9cc9..00000000
--- a/images/02-udev/udev.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-if [ "$DAEMON" = true ]; then
- exec udevd
-fi
-
-udevd --daemon
-udevadm trigger --action=add
-udevadm settle
-
-dev=$(ros config get rancher.state.dev)
-wait=$(ros config get rancher.state.wait)
-if [ "$BOOTSTRAP" != true ] || [ "$dev" == "" ] || [ "$wait" != "true" ]; then
- exit
-fi
-
-for i in `seq 1 30`; do
- drive=$(ros dev $dev)
- if [ "$drive" != "" ]; then
- break
- fi
- sleep 1
-done
-drive=$(ros dev $dev)
-if [ "$drive" = "" ]; then
- exit
-fi
-for i in `seq 1 30`; do
- if [ -e $drive ]; then
- break
- fi
- sleep 1
-done
diff --git a/init/bootstrap.go b/init/bootstrap.go
index 9b4f35f1..d5142e79 100644
--- a/init/bootstrap.go
+++ b/init/bootstrap.go
@@ -3,30 +3,25 @@ package init
import (
"syscall"
- "strings"
-
- log "github.com/Sirupsen/logrus"
- "github.com/rancher/docker-from-scratch"
"github.com/rancher/os/compose"
"github.com/rancher/os/config"
+ "github.com/rancher/os/dfs"
+ "github.com/rancher/os/log"
"github.com/rancher/os/util"
)
-func autoformat(cfg *config.CloudConfig) (*config.CloudConfig, error) {
- if len(cfg.Rancher.State.Autoformat) == 0 || util.ResolveDevice(cfg.Rancher.State.Dev) != "" {
+func bootstrapServices(cfg *config.CloudConfig) (*config.CloudConfig, error) {
+ if (len(cfg.Rancher.State.Autoformat) == 0 || util.ResolveDevice(cfg.Rancher.State.Dev) != "") && len(cfg.Bootcmd) == 0 {
return cfg, nil
}
- AUTOFORMAT := "AUTOFORMAT=" + strings.Join(cfg.Rancher.State.Autoformat, " ")
- t := *cfg
- t.Rancher.Autoformat["autoformat"].Environment = []string{AUTOFORMAT}
- log.Info("Running Autoformat services")
- _, err := compose.RunServiceSet("autoformat", &t, t.Rancher.Autoformat)
- return &t, err
+ log.Info("Running Bootstrap")
+ _, err := compose.RunServiceSet("bootstrap", cfg, cfg.Rancher.BootstrapContainers)
+ return cfg, err
}
-func runBootstrapContainers(cfg *config.CloudConfig) (*config.CloudConfig, error) {
- log.Info("Running Bootstrap services")
- _, err := compose.RunServiceSet("bootstrap", cfg, cfg.Rancher.BootstrapContainers)
+func runCloudInitServiceSet(cfg *config.CloudConfig) (*config.CloudConfig, error) {
+ log.Info("Running cloud-init services")
+ _, err := compose.RunServiceSet("cloud-init", cfg, cfg.Rancher.CloudInitServices)
return cfg, err
}
@@ -36,7 +31,7 @@ func startDocker(cfg *config.CloudConfig) (chan interface{}, error) {
launchConfig.LogFile = ""
launchConfig.NoLog = true
- cmd, err := dockerlaunch.LaunchDocker(launchConfig, config.SYSTEM_DOCKER_BIN, args...)
+ cmd, err := dfs.LaunchDocker(launchConfig, config.SystemDockerBin, args...)
if err != nil {
return nil, err
}
@@ -70,7 +65,20 @@ func bootstrap(cfg *config.CloudConfig) error {
_, err = config.ChainCfgFuncs(cfg,
loadImages,
- runBootstrapContainers,
- autoformat)
+ bootstrapServices)
+ return err
+}
+
+func runCloudInitServices(cfg *config.CloudConfig) error {
+ c, err := startDocker(cfg)
+ if err != nil {
+ return err
+ }
+
+ defer stopDocker(c)
+
+ _, err = config.ChainCfgFuncs(cfg,
+ loadImages,
+ runCloudInitServiceSet)
return err
}
diff --git a/init/init.go b/init/init.go
index 56f1fe7f..ed4ba267 100644
--- a/init/init.go
+++ b/init/init.go
@@ -5,29 +5,31 @@ package init
import (
"bufio"
"fmt"
+ "io/ioutil"
"os"
"os/exec"
"strings"
"syscall"
- log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/mount"
- "github.com/rancher/docker-from-scratch"
+ "github.com/rancher/os/cmd/cloudinitsave"
"github.com/rancher/os/config"
+ "github.com/rancher/os/dfs"
+ "github.com/rancher/os/log"
"github.com/rancher/os/util"
"github.com/rancher/os/util/network"
)
const (
- STATE string = "/state"
- BOOT2DOCKER_MAGIC string = "boot2docker, please format-me"
+ state string = "/state"
+ boot2DockerMagic string = "boot2docker, please format-me"
- TMPFS_MAGIC int64 = 0x01021994
- RAMFS_MAGIC int64 = 0x858458f6
+ tmpfsMagic int64 = 0x01021994
+ ramfsMagic int64 = 0x858458f6
)
var (
- mountConfig = dockerlaunch.Config{
+ mountConfig = dfs.Config{
CgroupHierarchy: map[string]string{
"cpu": "cpu",
"cpuacct": "cpu",
@@ -66,10 +68,10 @@ func loadModules(cfg *config.CloudConfig) (*config.CloudConfig, error) {
}
func sysInit(c *config.CloudConfig) (*config.CloudConfig, error) {
- args := append([]string{config.SYSINIT_BIN}, os.Args[1:]...)
+ args := append([]string{config.SysInitBin}, os.Args[1:]...)
cmd := &exec.Cmd{
- Path: config.ROS_BIN,
+ Path: config.RosBin,
Args: args,
}
@@ -85,6 +87,7 @@ func sysInit(c *config.CloudConfig) (*config.CloudConfig, error) {
}
func MainInit() {
+ // TODO: log.InitLogger()
if err := RunInit(); err != nil {
log.Fatal(err)
}
@@ -115,7 +118,7 @@ func mountConfigured(display, dev, fsType, target string) error {
}
func mountState(cfg *config.CloudConfig) error {
- return mountConfigured("state", cfg.Rancher.State.Dev, cfg.Rancher.State.FsType, STATE)
+ return mountConfigured("state", cfg.Rancher.State.Dev, cfg.Rancher.State.FsType, state)
}
func mountOem(cfg *config.CloudConfig) (*config.CloudConfig, error) {
@@ -143,36 +146,31 @@ func tryMountState(cfg *config.CloudConfig) error {
return mountState(cfg)
}
-func tryMountAndBootstrap(cfg *config.CloudConfig) (*config.CloudConfig, error) {
+func tryMountAndBootstrap(cfg *config.CloudConfig) (*config.CloudConfig, bool, error) {
if !isInitrd() || cfg.Rancher.State.Dev == "" {
- return cfg, nil
+ return cfg, false, nil
}
if err := tryMountState(cfg); !cfg.Rancher.State.Required && err != nil {
- return cfg, nil
+ return cfg, false, nil
} else if err != nil {
- return cfg, err
+ return cfg, false, err
}
- log.Debugf("Switching to new root at %s %s", STATE, cfg.Rancher.State.Directory)
- if err := switchRoot(STATE, cfg.Rancher.State.Directory, cfg.Rancher.RmUsr); err != nil {
- return cfg, err
- }
-
- return mountOem(cfg)
+ return cfg, true, nil
}
-func getLaunchConfig(cfg *config.CloudConfig, dockerCfg *config.DockerConfig) (*dockerlaunch.Config, []string) {
- var launchConfig dockerlaunch.Config
+func getLaunchConfig(cfg *config.CloudConfig, dockerCfg *config.DockerConfig) (*dfs.Config, []string) {
+ var launchConfig dfs.Config
- args := dockerlaunch.ParseConfig(&launchConfig, dockerCfg.FullArgs()...)
+ args := dfs.ParseConfig(&launchConfig, dockerCfg.FullArgs()...)
- launchConfig.DnsConfig.Nameservers = cfg.Rancher.Defaults.Network.Dns.Nameservers
- launchConfig.DnsConfig.Search = cfg.Rancher.Defaults.Network.Dns.Search
+ launchConfig.DNSConfig.Nameservers = cfg.Rancher.Defaults.Network.DNS.Nameservers
+ launchConfig.DNSConfig.Search = cfg.Rancher.Defaults.Network.DNS.Search
launchConfig.Environment = dockerCfg.Environment
if !cfg.Rancher.Debug {
- launchConfig.LogFile = config.SYSTEM_DOCKER_LOG
+ launchConfig.LogFile = config.SystemDockerLog
}
return &launchConfig, args
@@ -181,7 +179,7 @@ func getLaunchConfig(cfg *config.CloudConfig, dockerCfg *config.DockerConfig) (*
func isInitrd() bool {
var stat syscall.Statfs_t
syscall.Statfs("/", &stat)
- return int64(stat.Type) == TMPFS_MAGIC || int64(stat.Type) == RAMFS_MAGIC
+ return int64(stat.Type) == tmpfsMagic || int64(stat.Type) == ramfsMagic
}
func setupSharedRoot(c *config.CloudConfig) (*config.CloudConfig, error) {
@@ -218,9 +216,12 @@ func RunInit() error {
}
boot2DockerEnvironment := false
+ var shouldSwitchRoot bool
+ var cloudConfigBootFile []byte
+ var metadataFile []byte
initFuncs := []config.CfgFunc{
func(c *config.CloudConfig) (*config.CloudConfig, error) {
- return c, dockerlaunch.PrepareFs(&mountConfig)
+ return c, dfs.PrepareFs(&mountConfig)
},
mountOem,
func(_ *config.CloudConfig) (*config.CloudConfig, error) {
@@ -246,7 +247,7 @@ func RunInit() error {
}
devices := []string{"/dev/sda", "/dev/vda"}
- data := make([]byte, len(BOOT2DOCKER_MAGIC))
+ data := make([]byte, len(boot2DockerMagic))
for _, device := range devices {
f, err := os.Open(device)
@@ -254,7 +255,7 @@ func RunInit() error {
defer f.Close()
_, err = f.Read(data)
- if err == nil && string(data) == BOOT2DOCKER_MAGIC {
+ if err == nil && string(data) == boot2DockerMagic {
boot2DockerEnvironment = true
cfg.Rancher.State.Dev = "LABEL=B2D_STATE"
cfg.Rancher.State.Autoformat = []string{device}
@@ -265,7 +266,84 @@ func RunInit() error {
return cfg, nil
},
- tryMountAndBootstrap,
+ func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
+ var err error
+ cfg, shouldSwitchRoot, err = tryMountAndBootstrap(cfg)
+ if err != nil {
+ return nil, err
+ }
+ return cfg, nil
+ },
+ func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
+ if err := os.MkdirAll(config.CloudConfigDir, os.ModeDir|0755); err != nil {
+ log.Error(err)
+ }
+
+ cfg.Rancher.CloudInit.Datasources = config.LoadConfigWithPrefix(state).Rancher.CloudInit.Datasources
+ if err := config.Set("rancher.cloud_init.datasources", cfg.Rancher.CloudInit.Datasources); err != nil {
+ log.Error(err)
+ }
+
+ network := false
+ for _, datasource := range cfg.Rancher.CloudInit.Datasources {
+ if cloudinitsave.RequiresNetwork(datasource) {
+ network = true
+ break
+ }
+ }
+
+ if network {
+ if err := runCloudInitServices(cfg); err != nil {
+ log.Error(err)
+ }
+ } else {
+ if err := cloudinitsave.MountConfigDrive(); err != nil {
+ log.Error(err)
+ }
+ if err := cloudinitsave.SaveCloudConfig(false); err != nil {
+ log.Error(err)
+ }
+ if err := cloudinitsave.UnmountConfigDrive(); err != nil {
+ log.Error(err)
+ }
+ }
+ return cfg, nil
+ },
+ func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
+ var err error
+ cloudConfigBootFile, err = ioutil.ReadFile(config.CloudConfigBootFile)
+ if err != nil {
+ log.Error(err)
+ }
+ metadataFile, err = ioutil.ReadFile(config.MetaDataFile)
+ if err != nil {
+ log.Error(err)
+ }
+ return cfg, nil
+ },
+ func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
+ if !shouldSwitchRoot {
+ return cfg, nil
+ }
+ log.Debugf("Switching to new root at %s %s", state, cfg.Rancher.State.Directory)
+ if err := switchRoot(state, cfg.Rancher.State.Directory, cfg.Rancher.RmUsr); err != nil {
+ return cfg, err
+ }
+ return cfg, nil
+ },
+ mountOem,
+ func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
+ if err := os.MkdirAll(config.CloudConfigDir, os.ModeDir|0755); err != nil {
+ log.Error(err)
+ }
+ if err := util.WriteFileAtomic(config.CloudConfigBootFile, cloudConfigBootFile, 400); err != nil {
+ log.Error(err)
+ }
+ if err := util.WriteFileAtomic(config.MetaDataFile, metadataFile, 400); err != nil {
+ log.Error(err)
+ }
+ return cfg, nil
+ },
func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
if boot2DockerEnvironment {
if err := config.Set("rancher.state.dev", cfg.Rancher.State.Dev); err != nil {
@@ -280,7 +358,7 @@ func RunInit() error {
},
loadModules,
func(c *config.CloudConfig) (*config.CloudConfig, error) {
- return c, dockerlaunch.PrepareFs(&mountConfig)
+ return c, dfs.PrepareFs(&mountConfig)
},
func(c *config.CloudConfig) (*config.CloudConfig, error) {
network.SetProxyEnvironmentVariables(c)
@@ -300,7 +378,7 @@ func RunInit() error {
launchConfig.Fork = !cfg.Rancher.SystemDocker.Exec
log.Info("Launching System Docker")
- _, err = dockerlaunch.LaunchDocker(launchConfig, config.SYSTEM_DOCKER_BIN, args...)
+ _, err = dfs.LaunchDocker(launchConfig, config.SystemDockerBin, args...)
if err != nil {
return err
}
diff --git a/init/root.go b/init/root.go
index 03c0e397..f87d5c48 100644
--- a/init/root.go
+++ b/init/root.go
@@ -8,10 +8,10 @@ import (
"strings"
"syscall"
- log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/archive"
- "github.com/rancher/docker-from-scratch"
"github.com/rancher/os/config"
+ "github.com/rancher/os/dfs"
+ "github.com/rancher/os/log"
)
func cleanupTarget(rootfs, targetUsr, usr, usrVer, tmpDir string) (bool, error) {
@@ -21,7 +21,7 @@ func cleanupTarget(rootfs, targetUsr, usr, usrVer, tmpDir string) (bool, error)
return false, err
}
- if err := dockerlaunch.CreateSymlink(usrVer, path.Join(rootfs, "usr")); err != nil {
+ if err := dfs.CreateSymlink(usrVer, path.Join(rootfs, "usr")); err != nil {
return false, err
}
@@ -39,7 +39,7 @@ func cleanupTarget(rootfs, targetUsr, usr, usrVer, tmpDir string) (bool, error)
}
func copyMoveRoot(rootfs string, rmUsr bool) error {
- usrVer := fmt.Sprintf("usr-%s", config.VERSION)
+ usrVer := fmt.Sprintf("usr-%s", config.Version)
usr := path.Join(rootfs, usrVer)
targetUsr := path.Join(rootfs, "usr")
tmpDir := path.Join(rootfs, "tmp")
diff --git a/init/selinux.go b/init/selinux.go
index afdfc271..aeaf068e 100644
--- a/init/selinux.go
+++ b/init/selinux.go
@@ -3,8 +3,8 @@
package init
import (
- log "github.com/Sirupsen/logrus"
"github.com/rancher/os/config"
+ "github.com/rancher/os/log"
"github.com/rancher/os/selinux"
"io/ioutil"
)
diff --git a/init/sysinit.go b/init/sysinit.go
index 0dfa96cb..e3237fd3 100644
--- a/init/sysinit.go
+++ b/init/sysinit.go
@@ -7,15 +7,20 @@ import (
"golang.org/x/net/context"
- log "github.com/Sirupsen/logrus"
"github.com/docker/libcompose/project/options"
+ "github.com/rancher/os/cmd/control"
"github.com/rancher/os/compose"
"github.com/rancher/os/config"
"github.com/rancher/os/docker"
+ "github.com/rancher/os/log"
+)
+
+const (
+ systemImagesPreloadDirectory = "/var/lib/rancher/preload/system-docker"
)
func hasImage(name string) bool {
- stamp := path.Join(STATE, name)
+ stamp := path.Join(state, name)
if _, err := os.Stat(stamp); os.IsNotExist(err) {
return false
}
@@ -23,13 +28,13 @@ func hasImage(name string) bool {
}
func findImages(cfg *config.CloudConfig) ([]string, error) {
- log.Debugf("Looking for images at %s", config.IMAGES_PATH)
+ log.Debugf("Looking for images at %s", config.ImagesPath)
result := []string{}
- dir, err := os.Open(config.IMAGES_PATH)
+ dir, err := os.Open(config.ImagesPath)
if os.IsNotExist(err) {
- log.Debugf("Not loading images, %s does not exist", config.IMAGES_PATH)
+ log.Debugf("Not loading images, %s does not exist", config.ImagesPath)
return result, nil
}
if err != nil {
@@ -44,7 +49,7 @@ func findImages(cfg *config.CloudConfig) ([]string, error) {
}
for _, fileName := range files {
- if ok, _ := path.Match(config.IMAGES_PATTERN, fileName); ok {
+ if ok, _ := path.Match(config.ImagesPattern, fileName); ok {
log.Debugf("Found %s", fileName)
result = append(result, fileName)
}
@@ -69,7 +74,7 @@ func loadImages(cfg *config.CloudConfig) (*config.CloudConfig, error) {
continue
}
- inputFileName := path.Join(config.IMAGES_PATH, image)
+ inputFileName := path.Join(config.ImagesPath, image)
input, err := os.Open(inputFileName)
if err != nil {
return cfg, err
@@ -91,6 +96,10 @@ func loadImages(cfg *config.CloudConfig) (*config.CloudConfig, error) {
func SysInit() error {
cfg := config.LoadConfig()
+ if err := control.PreloadImages(docker.NewSystemClient, systemImagesPreloadDirectory); err != nil {
+ log.Errorf("Failed to preload System Docker images: %v", err)
+ }
+
_, err := config.ChainCfgFuncs(cfg,
loadImages,
func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
@@ -110,7 +119,7 @@ func SysInit() error {
return cfg, nil
},
func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
- log.Infof("RancherOS %s started", config.VERSION)
+ log.Infof("RancherOS %s started", config.Version)
return cfg, nil
})
return err
diff --git a/log/log.go b/log/log.go
new file mode 100644
index 00000000..04c0a2d0
--- /dev/null
+++ b/log/log.go
@@ -0,0 +1,143 @@
+package log
+
+import (
+ "io"
+ "os"
+
+ "github.com/Sirupsen/logrus"
+)
+
+// Default to using the logrus standard logger until log.InitLogger(logLevel) is called
+var appLog = logrus.StandardLogger()
+var userHook *ShowuserlogHook
+
+type Fields logrus.Fields
+type Level logrus.Level
+type Logger logrus.Logger
+
+const (
+ // PanicLevel level, highest level of severity. Logs and then calls panic with the
+ // message passed to Debug, Info, ...
+ PanicLevel Level = iota
+ // FatalLevel level. Logs and then calls `os.Exit(1)`. It will exit even if the
+ // logging level is set to Panic.
+ FatalLevel
+ // ErrorLevel level. Logs. Used for errors that should definitely be noted.
+ // Commonly used for hooks to send errors to an error tracking service.
+ ErrorLevel
+ // WarnLevel level. Non-critical entries that deserve eyes.
+ WarnLevel
+ // InfoLevel level. General operational entries about what's going on inside the
+ // application.
+ InfoLevel
+ // DebugLevel level. Usually only enabled when debugging. Very verbose logging.
+ DebugLevel
+)
+
+func SetOutput(out io.Writer) {
+ appLog.Out = out
+}
+func SetLevel(level Level) {
+ if userHook != nil {
+ userHook.Level = logrus.Level(level)
+ } else {
+ appLog.Level = logrus.Level(level)
+ logrus.SetLevel(logrus.Level(level))
+ }
+}
+
+func Debugf(format string, args ...interface{}) {
+ appLog.Debugf(format, args...)
+}
+func Infof(format string, args ...interface{}) {
+ appLog.Infof(format, args...)
+}
+func Printf(format string, args ...interface{}) {
+ appLog.Printf(format, args...)
+}
+func Warnf(format string, args ...interface{}) {
+ appLog.Warnf(format, args...)
+}
+func Warningf(format string, args ...interface{}) {
+ appLog.Warningf(format, args...)
+}
+func Errorf(format string, args ...interface{}) {
+ appLog.Errorf(format, args...)
+}
+func Fatalf(format string, args ...interface{}) {
+ appLog.Fatalf(format, args...)
+}
+func Panicf(format string, args ...interface{}) {
+ appLog.Panicf(format, args...)
+}
+
+func Debug(args ...interface{}) {
+ appLog.Debug(args...)
+}
+func Info(args ...interface{}) {
+ appLog.Info(args...)
+}
+func Print(args ...interface{}) {
+ appLog.Print(args...)
+}
+func Warn(args ...interface{}) {
+ appLog.Warn(args...)
+}
+func Warning(args ...interface{}) {
+ appLog.Warning(args...)
+}
+func Error(args ...interface{}) {
+ appLog.Error(args...)
+}
+func Fatal(args ...interface{}) {
+ appLog.Fatal(args...)
+}
+func Panic(args ...interface{}) {
+ appLog.Panic(args...)
+}
+
+func WithField(key string, value interface{}) *logrus.Entry {
+ return appLog.WithField(key, value)
+}
+func WithFields(fields Fields) *logrus.Entry {
+ return appLog.WithFields(logrus.Fields(fields))
+}
+
+func InitLogger() {
+ if userHook != nil {
+ return // we've already initialised it
+ }
+ thisLog := logrus.New()
+
+ filename := "/dev/kmsg"
+ f, err := os.OpenFile(filename, os.O_WRONLY, 0644)
+ if err != nil {
+ logrus.Debugf("error opening /dev/kmsg %s", err)
+ }
+
+ // Filter what the user sees (info level, unless they set --debug)
+ stdLogger := logrus.StandardLogger()
+ showuserHook, err := NewShowuserlogHook(stdLogger.Level)
+ if err != nil {
+ f.Close()
+ logrus.Errorf("hook failure %s", err)
+ }
+
+ // We're all set up, now we can make it global
+ appLog = thisLog
+ userHook = showuserHook
+
+ thisLog.Hooks.Add(showuserHook)
+ logrus.StandardLogger().Hooks.Add(showuserHook)
+ thisLog.Out = f
+ logrus.SetOutput(f)
+ thisLog.Level = logrus.DebugLevel
+
+ pwd, err := os.Getwd()
+ if err != nil {
+ thisLog.Error(err)
+ }
+
+ thisLog.Debugf("START: %v in %s", os.Args, pwd)
+
+}
diff --git a/log/showuserlog.go b/log/showuserlog.go
new file mode 100644
index 00000000..7e6fa2be
--- /dev/null
+++ b/log/showuserlog.go
@@ -0,0 +1,40 @@
+package log
+
+import (
+ "fmt"
+ "github.com/Sirupsen/logrus"
+ "os"
+)
+
+// ShowuserlogHook writes all levels of logrus entries to a file for later analysis
+type ShowuserlogHook struct {
+ Level logrus.Level
+}
+
+func NewShowuserlogHook(l logrus.Level) (*ShowuserlogHook, error) {
+ return &ShowuserlogHook{l}, nil
+}
+
+func (hook *ShowuserlogHook) Fire(entry *logrus.Entry) error {
+ line, err := entry.String()
+ if err != nil {
+ fmt.Fprintf(os.Stderr, "Unable to read entry, %v", err)
+ return err
+ }
+
+ if entry.Level <= hook.Level {
+ fmt.Printf("> %s", line)
+ }
+ return nil
+}
+
+func (hook *ShowuserlogHook) Levels() []logrus.Level {
+ return []logrus.Level{
+ logrus.DebugLevel,
+ logrus.InfoLevel,
+ logrus.WarnLevel,
+ logrus.ErrorLevel,
+ logrus.FatalLevel,
+ logrus.PanicLevel,
+ }
+}
diff --git a/main.go b/main.go
index c225e282..165852c2 100644
--- a/main.go
+++ b/main.go
@@ -6,42 +6,33 @@ import (
"github.com/docker/docker/docker"
"github.com/docker/docker/pkg/reexec"
"github.com/rancher/cniglue"
- "github.com/rancher/docker-from-scratch"
"github.com/rancher/os/cmd/cloudinitexecute"
"github.com/rancher/os/cmd/cloudinitsave"
- "github.com/rancher/os/cmd/console"
"github.com/rancher/os/cmd/control"
- "github.com/rancher/os/cmd/dockerinit"
"github.com/rancher/os/cmd/network"
"github.com/rancher/os/cmd/power"
"github.com/rancher/os/cmd/respawn"
- "github.com/rancher/os/cmd/switchconsole"
"github.com/rancher/os/cmd/sysinit"
"github.com/rancher/os/cmd/systemdocker"
- "github.com/rancher/os/cmd/userdocker"
"github.com/rancher/os/cmd/wait"
+ "github.com/rancher/os/dfs"
osInit "github.com/rancher/os/init"
)
var entrypoints = map[string]func(){
"cloud-init-execute": cloudinitexecute.Main,
"cloud-init-save": cloudinitsave.Main,
- "console": console.Main,
- "console.sh": console.Main,
"docker": docker.Main,
- "docker-init": dockerinit.Main,
- "dockerlaunch": dockerlaunch.Main,
+ "dockerlaunch": dfs.Main,
"halt": power.Halt,
"init": osInit.MainInit,
"netconf": network.Main,
- "poweroff": power.PowerOff,
+ "poweroff": power.Off,
"reboot": power.Reboot,
"respawn": respawn.Main,
"ros-sysinit": sysinit.Main,
"shutdown": power.Main,
- "switch-console": switchconsole.Main,
"system-docker": systemdocker.Main,
- "user-docker": userdocker.Main,
"wait-for-docker": wait.Main,
"cni-glue": glue.Main,
"bridge": bridge.Main,
diff --git a/vendor/github.com/rancher/netconf/bonding.go b/netconf/bonding.go
similarity index 87%
rename from vendor/github.com/rancher/netconf/bonding.go
rename to netconf/bonding.go
index 5f92c56d..62b173d1 100644
--- a/vendor/github.com/rancher/netconf/bonding.go
+++ b/netconf/bonding.go
@@ -7,7 +7,7 @@ import (
"strings"
"time"
- "github.com/Sirupsen/logrus"
+ "github.com/rancher/os/log"
"github.com/vishvananda/netlink"
)
@@ -23,7 +23,7 @@ type Bonding struct {
func (b *Bonding) init() error {
_, err := os.Stat(bondingMasters)
if os.IsNotExist(err) {
- logrus.Info("Loading bonding kernel module")
+ log.Info("Loading bonding kernel module")
cmd := exec.Command("modprobe", "bonding")
cmd.Stderr = os.Stderr
cmd.Stdout = os.Stdin
@@ -89,7 +89,7 @@ func (b *Bonding) RemoveSlave(slave string) error {
}
p := base + b.name + "/bonding/slaves"
- logrus.Infof("Removing slave %s from master %s", slave, b.name)
+ log.Infof("Removing slave %s from master %s", slave, b.name)
return ioutil.WriteFile(p, []byte("-"+slave), 0644)
}
@@ -101,7 +101,7 @@ func (b *Bonding) AddSlave(slave string) error {
}
p := base + b.name + "/bonding/slaves"
- logrus.Infof("Adding slave %s to master %s", slave, b.name)
+ log.Infof("Adding slave %s to master %s", slave, b.name)
return ioutil.WriteFile(p, []byte("+"+slave), 0644)
}
@@ -117,12 +117,12 @@ func (b *Bonding) Opt(key, value string) error {
p := base + b.name + "/bonding/" + key
if err := ioutil.WriteFile(p, []byte(value), 0644); err != nil {
- logrus.Errorf("Failed to set %s=%s on %s: %v", key, value, b.name, err)
+ log.Errorf("Failed to set %s=%s on %s: %v", key, value, b.name, err)
return err
- } else {
- logrus.Infof("Set %s=%s on %s", key, value, b.name)
}
+ log.Infof("Set %s=%s on %s", key, value, b.name)
+
return nil
}
@@ -138,6 +138,6 @@ func Bond(name string) (*Bonding, error) {
return b, nil
}
- logrus.Infof("Creating bond %s", name)
+ log.Infof("Creating bond %s", name)
return b, ioutil.WriteFile(bondingMasters, []byte("+"+name), 0644)
}
diff --git a/vendor/github.com/rancher/netconf/bridge.go b/netconf/bridge.go
similarity index 100%
rename from vendor/github.com/rancher/netconf/bridge.go
rename to netconf/bridge.go
diff --git a/vendor/github.com/rancher/netconf/ipv4ll_linux.go b/netconf/ipv4ll_linux.go
similarity index 98%
rename from vendor/github.com/rancher/netconf/ipv4ll_linux.go
rename to netconf/ipv4ll_linux.go
index b7ed8ec3..2a1cf9f3 100644
--- a/vendor/github.com/rancher/netconf/ipv4ll_linux.go
+++ b/netconf/ipv4ll_linux.go
@@ -6,7 +6,7 @@ import (
"math/rand"
"net"
- log "github.com/Sirupsen/logrus"
+ "github.com/rancher/os/log"
"github.com/j-keck/arping"
"github.com/vishvananda/netlink"
diff --git a/vendor/github.com/rancher/netconf/netconf_linux.go b/netconf/netconf_linux.go
similarity index 84%
rename from vendor/github.com/rancher/netconf/netconf_linux.go
rename to netconf/netconf_linux.go
index e0de813e..31474cd7 100644
--- a/vendor/github.com/rancher/netconf/netconf_linux.go
+++ b/netconf/netconf_linux.go
@@ -10,9 +10,10 @@ import (
"sync"
"syscall"
- log "github.com/Sirupsen/logrus"
"github.com/flynn/go-shlex"
+ "github.com/rancher/os/log"
+ "github.com/rancher/os/config"
"github.com/ryanuber/go-glob"
"github.com/vishvananda/netlink"
)
@@ -26,7 +27,7 @@ var (
defaultDhcpArgs = []string{"dhcpcd", "-MA4"}
)
-func createInterfaces(netCfg *NetworkConfig) {
+func createInterfaces(netCfg *config.NetworkConfig) {
configured := map[string]bool{}
for name, iface := range netCfg.Interfaces {
@@ -64,7 +65,7 @@ func createInterfaces(netCfg *NetworkConfig) {
}
}
-func createSlaveInterfaces(netCfg *NetworkConfig) {
+func createSlaveInterfaces(netCfg *config.NetworkConfig) {
links, err := netlink.LinkList()
if err != nil {
log.Errorf("Failed to list links: %v", err)
@@ -84,16 +85,16 @@ func createSlaveInterfaces(netCfg *NetworkConfig) {
}
for _, vlanDef := range vlanDefs {
- if _, err = NewVlan(link, vlanDef.Name, vlanDef.Id); err != nil {
- log.Errorf("Failed to create vlans on device %s, id %d: %v", link.Attrs().Name, vlanDef.Id, err)
+ if _, err = NewVlan(link, vlanDef.Name, vlanDef.ID); err != nil {
+ log.Errorf("Failed to create vlans on device %s, id %d: %v", link.Attrs().Name, vlanDef.ID, err)
}
}
}
}
-func findMatch(link netlink.Link, netCfg *NetworkConfig) (InterfaceConfig, bool) {
+func findMatch(link netlink.Link, netCfg *config.NetworkConfig) (config.InterfaceConfig, bool) {
linkName := link.Attrs().Name
- var match InterfaceConfig
+ var match config.InterfaceConfig
exactMatch := false
found := false
@@ -135,25 +136,25 @@ func findMatch(link netlink.Link, netCfg *NetworkConfig) (InterfaceConfig, bool)
return match, exactMatch || found
}
-func populateDefault(netCfg *NetworkConfig) {
+func populateDefault(netCfg *config.NetworkConfig) {
if netCfg.Interfaces == nil {
- netCfg.Interfaces = map[string]InterfaceConfig{}
+ netCfg.Interfaces = map[string]config.InterfaceConfig{}
}
if len(netCfg.Interfaces) == 0 {
- netCfg.Interfaces["eth*"] = InterfaceConfig{
+ netCfg.Interfaces["eth*"] = config.InterfaceConfig{
DHCP: true,
}
}
if _, ok := netCfg.Interfaces["lo"]; !ok {
- netCfg.Interfaces["lo"] = InterfaceConfig{
+ netCfg.Interfaces["lo"] = config.InterfaceConfig{
Address: "127.0.0.1/8",
}
}
}
-func ApplyNetworkConfigs(netCfg *NetworkConfig) error {
+func ApplyNetworkConfigs(netCfg *config.NetworkConfig) error {
populateDefault(netCfg)
log.Debugf("Config: %#v", netCfg)
@@ -182,7 +183,7 @@ func ApplyNetworkConfigs(netCfg *NetworkConfig) error {
return err
}
-func RunDhcp(netCfg *NetworkConfig, setHostname, setDns bool) error {
+func RunDhcp(netCfg *config.NetworkConfig, setHostname, setDNS bool) error {
populateDefault(netCfg)
links, err := netlink.LinkList()
@@ -202,7 +203,7 @@ func RunDhcp(netCfg *NetworkConfig, setHostname, setDns bool) error {
for iface, args := range dhcpLinks {
wg.Add(1)
go func(iface, args string) {
- runDhcp(netCfg, iface, args, setHostname, setDns)
+ runDhcp(netCfg, iface, args, setHostname, setDNS)
wg.Done()
}(iface, args)
}
@@ -211,7 +212,7 @@ func RunDhcp(netCfg *NetworkConfig, setHostname, setDns bool) error {
return err
}
-func runDhcp(netCfg *NetworkConfig, iface string, argstr string, setHostname, setDns bool) {
+func runDhcp(netCfg *config.NetworkConfig, iface string, argstr string, setHostname, setDNS bool) {
log.Infof("Running DHCP on %s", iface)
args := []string{}
if argstr != "" {
@@ -229,7 +230,7 @@ func runDhcp(netCfg *NetworkConfig, iface string, argstr string, setHostname, se
args = append(args, "-e", "force_hostname=true")
}
- if !setDns {
+ if !setDNS {
args = append(args, "--nohook", "resolv.conf")
}
@@ -242,7 +243,7 @@ func runDhcp(netCfg *NetworkConfig, iface string, argstr string, setHostname, se
}
}
-func linkUp(link netlink.Link, netConf InterfaceConfig) error {
+func linkUp(link netlink.Link, netConf config.InterfaceConfig) error {
if err := netlink.LinkSetUp(link); err != nil {
log.Errorf("failed to setup link: %v", err)
return err
@@ -251,7 +252,7 @@ func linkUp(link netlink.Link, netConf InterfaceConfig) error {
return nil
}
-func applyAddress(address string, link netlink.Link, netConf InterfaceConfig) error {
+func applyAddress(address string, link netlink.Link, netConf config.InterfaceConfig) error {
addr, err := netlink.ParseAddr(address)
if err != nil {
return err
@@ -272,14 +273,14 @@ func setGateway(gateway string) error {
return nil
}
- gatewayIp := net.ParseIP(gateway)
- if gatewayIp == nil {
+ gatewayIP := net.ParseIP(gateway)
+ if gatewayIP == nil {
return errors.New("Invalid gateway address " + gateway)
}
route := netlink.Route{
Scope: netlink.SCOPE_UNIVERSE,
- Gw: gatewayIp,
+ Gw: gatewayIP,
}
if err := netlink.RouteAdd(&route); err == syscall.EEXIST {
@@ -293,7 +294,7 @@ func setGateway(gateway string) error {
return nil
}
-func applyInterfaceConfig(link netlink.Link, netConf InterfaceConfig) error {
+func applyInterfaceConfig(link netlink.Link, netConf config.InterfaceConfig) error {
if netConf.Bond != "" {
if err := netlink.LinkSetDown(link); err != nil {
return err
@@ -388,7 +389,7 @@ func runCmds(cmds []string, iface string) {
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
- log.Errorf("Failed to run command [%s]: %v", cmd, err)
+ log.Errorf("Failed to run command [%v]: %v", cmd, err)
continue
}
}
diff --git a/vendor/github.com/rancher/netconf/vlan.go b/netconf/vlan.go
similarity index 98%
rename from vendor/github.com/rancher/netconf/vlan.go
rename to netconf/vlan.go
index 75821d82..c4f315ee 100644
--- a/vendor/github.com/rancher/netconf/vlan.go
+++ b/netconf/vlan.go
@@ -9,7 +9,7 @@ import (
)
type VlanDefinition struct {
- Id int
+ ID int
Name string
}
@@ -65,7 +65,7 @@ func ParseVlanDefinitions(vlans string) ([]VlanDefinition, error) {
}
def := VlanDefinition{
- Id: id,
+ ID: id,
}
if len(idName) > 1 {
diff --git a/os-config.tpl.yml b/os-config.tpl.yml
index ed175b5b..7f6d80a2 100644
--- a/os-config.tpl.yml
+++ b/os-config.tpl.yml
@@ -6,7 +6,7 @@ rancher:
hostname: {{.HOSTNAME_DEFAULT}}
{{if eq "amd64" .ARCH -}}
docker:
- engine: docker-1.12.1
+ engine: docker-1.12.3
{{else -}}
docker:
engine: docker-1.11.2
@@ -15,15 +15,14 @@ rancher:
dns:
nameservers: [8.8.8.8, 8.8.4.4]
bootstrap:
- state-script:
- image: {{.OS_REPO}}/os-statescript:{{.VERSION}}{{.SUFFIX}}
+ bootstrap:
+ image: {{.OS_REPO}}/os-bootstrap:{{.VERSION}}{{.SUFFIX}}
+ command: ros bootstrap
labels:
io.rancher.os.detach: "false"
io.rancher.os.scope: system
- io.rancher.os.after: udev-bootstrap
log_driver: json-file
- net: host
- uts: host
+ net: none
privileged: true
volumes:
- /dev:/host/dev
@@ -31,53 +30,36 @@ rancher:
- /lib/firmware:/lib/firmware
- /usr/bin/ros:/usr/bin/ros:ro
- /usr/share/ros:/usr/share/ros:ro
- udev-bootstrap:
- image: {{.OS_REPO}}/os-udev:{{.VERSION}}{{.SUFFIX}}
- environment:
- - BOOTSTRAP=true
+ cloud_init_services:
+ cloud-init:
+ image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+ command: cloud-init-save
labels:
io.rancher.os.detach: "false"
io.rancher.os.scope: system
log_driver: json-file
net: host
uts: host
+ pid: host
+ ipc: host
privileged: true
volumes:
- /dev:/host/dev
+ - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt.rancher
- /lib/modules:/lib/modules
- /lib/firmware:/lib/firmware
- /usr/bin/ros:/usr/bin/ros:ro
- autoformat:
- autoformat:
- image: {{.OS_REPO}}/os-autoformat:{{.VERSION}}{{.SUFFIX}}
- labels:
- io.rancher.os.detach: "false"
- io.rancher.os.scope: system
- log_driver: json-file
- net: none
- privileged: true
- udev-autoformat:
- image: {{.OS_REPO}}/os-udev:{{.VERSION}}{{.SUFFIX}}
- labels:
- io.rancher.os.detach: "false"
- io.rancher.os.scope: system
- io.rancher.os.after: autoformat
- log_driver: json-file
- net: host
- uts: host
- privileged: true
- volumes:
- - /dev:/host/dev
- - /lib/modules:/lib/modules
- - /lib/firmware:/lib/firmware
- - /usr/bin/ros:/usr/bin/ros:ro
+ - /usr/bin/ros:/usr/bin/cloud-init-save
+ - /usr/share/ros:/usr/share/ros:ro
+ - /var/lib/rancher:/var/lib/rancher
+ - /var/lib/rancher/conf:/var/lib/rancher/conf
bootstrap_docker:
bridge: none
storage_driver: overlay
restart: false
graph: /var/lib/system-docker
group: root
- host: "unix:///var/run/system-docker.sock"
+ host: ["unix:///var/run/system-docker.sock"]
userland_proxy: false
console: default
cloud_init:
@@ -121,26 +103,13 @@ rancher:
- command-volumes
- user-volumes
- system-volumes
- cloud-init:
- image: {{.OS_REPO}}/os-cloudinit:{{.VERSION}}{{.SUFFIX}}
- labels:
- io.rancher.os.detach: "false"
- io.rancher.os.reloadconfig: "true"
- io.rancher.os.scope: system
- io.rancher.os.after: ntp
- net: host
- uts: host
- privileged: true
- volumes_from:
- - command-volumes
- - system-volumes
cloud-init-execute:
image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
command: cloud-init-execute -pre-console
labels:
io.rancher.os.detach: "false"
io.rancher.os.scope: system
- io.rancher.os.after: cloud-init
+ io.rancher.os.after: ntp
net: host
uts: host
privileged: true
@@ -149,21 +118,6 @@ rancher:
volumes:
- /usr/bin/ros:/usr/bin/ros
- /usr/bin/ros:/usr/bin/cloud-init-execute
- cloud-init-pre:
- image: {{.OS_REPO}}/os-cloudinit:{{.VERSION}}{{.SUFFIX}}
- environment:
- - CLOUD_INIT_NETWORK=false
- labels:
- io.rancher.os.detach: "false"
- io.rancher.os.reloadconfig: "true"
- io.rancher.os.scope: system
- io.rancher.os.after: udev,preload-system-images
- net: host
- uts: host
- privileged: true
- volumes_from:
- - command-volumes
- - system-volumes
command-volumes:
image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
command: echo
@@ -176,28 +130,20 @@ rancher:
read_only: true
volumes:
- /usr/bin/ros:/usr/bin/dockerlaunch:ro
- - /usr/bin/ros:/usr/bin/user-docker:ro
- /usr/bin/ros:/usr/bin/system-docker:ro
- - /usr/bin/ros:/sbin/poweroff:ro
- - /usr/bin/ros:/sbin/reboot:ro
- - /usr/bin/ros:/sbin/halt:ro
- - /usr/bin/ros:/sbin/shutdown:ro
- /usr/bin/ros:/usr/bin/respawn:ro
- /usr/bin/ros:/usr/bin/ros:ro
- /usr/bin/ros:/usr/bin/cloud-init-execute:ro
- /usr/bin/ros:/usr/bin/cloud-init-save:ro
- /usr/bin/ros:/usr/sbin/netconf:ro
- /usr/bin/ros:/usr/sbin/wait-for-docker:ro
- - /usr/bin/ros:/usr/bin/switch-console:ro
- - /usr/bin/ros:/usr/bin/console:ro
- - /usr/bin/ros:/usr/sbin/console.sh:ro
- - /usr/bin/ros:/usr/sbin/docker-init:ro
+ - /usr/share/rancher:/usr/share/rancher:ro
console:
image: {{.OS_REPO}}/os-console:{{.VERSION}}{{.SUFFIX}}
- command: console
+ command: ros console-init
labels:
io.rancher.os.scope: system
- io.rancher.os.after: network
+ io.rancher.os.after: cloud-init-execute
io.docker.compose.rebuild: always
io.rancher.os.console: default
net: host
@@ -224,25 +170,13 @@ rancher:
read_only: true
volumes:
- /var/lib/docker:/var/lib/docker
- network-pre:
+ network:
image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
command: netconf
labels:
io.rancher.os.scope: system
- io.rancher.os.after: cloud-init-pre
- net: host
- uts: host
- pid: host
- privileged: true
- volumes_from:
- - command-volumes
- - system-volumes
- network:
- image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
- command: netconf --stop-network-pre
- labels:
- io.rancher.os.scope: system
- io.rancher.os.after: cloud-init-execute
+ io.rancher.os.after: udev
+ io.rancher.os.reloadconfig: "true"
net: host
uts: host
pid: host
@@ -255,7 +189,7 @@ rancher:
command: ntpd --nofork -g
labels:
io.rancher.os.scope: system
- io.rancher.os.after: network-pre
+ io.rancher.os.after: network
net: host
uts: host
privileged: true
@@ -263,39 +197,20 @@ rancher:
volumes_from:
- command-volumes
- system-volumes
- preload-system-images:
- image: {{.OS_REPO}}/os-preload:{{.VERSION}}{{.SUFFIX}}
- environment:
- - SYSTEM_IMAGES=true
- labels:
- io.rancher.os.detach: "false"
- io.rancher.os.scope: system
- net: host
- privileged: true
- volumes:
- - /var/run/system-docker.sock:/var/run/docker.sock
- - /var/lib/rancher/preload/system-docker:/mnt/preload
- - /usr/bin/ros:/usr/sbin/wait-for-docker:ro
- volumes_from:
- - command-volumes
- - system-volumes
preload-user-images:
- image: {{.OS_REPO}}/os-preload:{{.VERSION}}{{.SUFFIX}}
+ image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+ command: ros preload-images
labels:
io.rancher.os.detach: "false"
io.rancher.os.scope: system
io.rancher.os.after: console
- net: host
privileged: true
- volumes:
- - /var/run/:/var/run/
- - /var/lib/rancher/preload/docker:/mnt/preload
- - /usr/bin/ros:/usr/sbin/wait-for-docker:ro
volumes_from:
- command-volumes
- system-volumes
syslog:
- image: {{.OS_REPO}}/os-syslog:{{.VERSION}}{{.SUFFIX}}
+ image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+ command: rsyslogd -n
labels:
io.rancher.os.scope: system
log_driver: json-file
@@ -333,7 +248,8 @@ rancher:
- /var/log:/var/log
- /var/run:/var/run
udev-cold:
- image: {{.OS_REPO}}/os-udev:{{.VERSION}}{{.SUFFIX}}
+ image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+ command: ros udev-settle
labels:
io.rancher.os.detach: "false"
io.rancher.os.scope: system
@@ -344,9 +260,8 @@ rancher:
- command-volumes
- system-volumes
udev:
- image: {{.OS_REPO}}/os-udev:{{.VERSION}}{{.SUFFIX}}
- environment:
- - DAEMON=true
+ image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+ command: udevd
labels:
io.rancher.os.detach: "true"
io.rancher.os.scope: system
@@ -373,11 +288,11 @@ rancher:
- /opt:/opt
docker:
{{if eq "amd64" .ARCH -}}
- image: {{.OS_REPO}}/os-docker:1.12.1{{.SUFFIX}}
+ image: {{.OS_REPO}}/os-docker:1.12.3{{.SUFFIX}}
{{else -}}
image: {{.OS_REPO}}/os-docker:1.11.2{{.SUFFIX}}
{{end -}}
- command: /usr/bin/user-docker
+ command: ros user-docker
environment:
- HTTP_PROXY
- HTTPS_PROXY
@@ -402,7 +317,7 @@ rancher:
restart: false
graph: /var/lib/system-docker
group: root
- host: "unix:///var/run/system-docker.sock"
+ host: ["unix:///var/run/system-docker.sock"]
pid_file: /var/run/system-docker.pid
exec_root: /var/run/system-docker
config_file: /etc/docker/system-docker.json
@@ -415,13 +330,13 @@ rancher:
image: {{.OS_REPO}}/os
docker:
{{if eq "amd64" .ARCH -}}
- engine: docker-1.12.1
+ engine: docker-1.12.3
{{else -}}
engine: docker-1.11.2
{{end -}}
storage_driver: overlay
group: docker
- host: "unix:///var/run/docker.sock"
+ host: ["unix:///var/run/docker.sock"]
log_opts:
max-size: 25m
max-file: 2
diff --git a/scripts/build-images b/scripts/build-images
index 26a87c8a..a3d677c2 100755
--- a/scripts/build-images
+++ b/scripts/build-images
@@ -7,6 +7,10 @@ BASE=images
source $(dirname $0)/version
cd $(dirname $0)/..
+mkdir -p dist
+rm -f dist/images
+touch dist/images
+
for i in $BASE/[0-9]*; do
name="os-$(echo ${i} | cut -f2 -d-)"
tag="${OS_REPO}/${name}:${VERSION}${SUFFIX}"
@@ -17,6 +21,7 @@ for i in $BASE/[0-9]*; do
if dapper -d --build -f ${i}/Dockerfile -- -t rancher/${name} ${i}; then
docker tag rancher/${name} ${tag}
+ echo "${tag}" >> dist/images
elif [ "$?" != "42" ]; then
exit 1
else
diff --git a/scripts/build-target b/scripts/build-target
index ca637dd3..0cba8443 100755
--- a/scripts/build-target
+++ b/scripts/build-target
@@ -15,6 +15,5 @@ fi
OUTPUT=${OUTPUT:-bin/ros}
echo Building $OUTPUT
-CONST="-X github.com/docker/docker/dockerversion.GitCommit=${COMMIT} -X github.com/docker/docker/dockerversion.Version=${DOCKER_PATCH_VERSION} -X github.com/docker/docker/dockerversion.BuildTime=$(date -u +'%Y-%m-%dT%H:%M:%SZ') -X github.com/docker/docker/dockerversion.IAmStatic=true -X github.com/rancher/os/config.VERSION=${VERSION} -X github.com/rancher/os/config.OS_REPO=${OS_REPO}"
-go build -tags "selinux cgo daemon netgo dnspatch" -installsuffix netgo -ldflags "$CONST -linkmode external -extldflags -static" -o ${OUTPUT}
-strip --strip-all ${OUTPUT}
+CONST="-X github.com/docker/docker/dockerversion.GitCommit=${COMMIT} -X github.com/docker/docker/dockerversion.Version=${DOCKER_PATCH_VERSION} -X github.com/docker/docker/dockerversion.BuildTime=$(date -u +'%Y-%m-%dT%H:%M:%SZ') -X github.com/docker/docker/dockerversion.IAmStatic=true -X github.com/rancher/os/config.Version=${VERSION} -X github.com/rancher/os/config.OsRepo=${OS_REPO}"
+go build -tags "selinux cgo daemon netgo dnspatch" -installsuffix netgo -ldflags "$CONST -linkmode external -extldflags -static -s -w" -o ${OUTPUT}
diff --git a/scripts/ci b/scripts/ci
index 655fcbcc..9c81e8fd 100755
--- a/scripts/ci
+++ b/scripts/ci
@@ -1,11 +1,23 @@
#!/bin/bash
set -e
-cd $(dirname $0)
+cd $(dirname $0)/..
-./build
-./test
-./validate
-./prepare
-./package
-./integration-test
+./scripts/build
+./scripts/test
+./scripts/validate
+./scripts/prepare
+./scripts/package
+./scripts/integration-test
+
+echo "--- Run"
+echo "github-release release --user rancher --repo os --tag ${VERSION} --pre-release --draft"
+for file in $(ls dist/artifacts/); do
+ if [ "$file" != "installer.tar" ]; then
+ echo "github-release upload --user rancher --repo os --tag ${VERSION} \
+ --file ./dist/kernel/${file} -name ${file}"
+ fi
+done
+echo
+
+cat dist/images | sed 's/^/docker push /'
diff --git a/scripts/clean b/scripts/clean
index 8c6b0034..e86582e2 100755
--- a/scripts/clean
+++ b/scripts/clean
@@ -2,4 +2,4 @@
set -e
cd $(dirname $0)/..
-rm -rf build dist bin images/*/build
+rm -rf build dist bin images/*/build state
diff --git a/scripts/dev b/scripts/dev
index 0caad111..0753136a 100755
--- a/scripts/dev
+++ b/scripts/dev
@@ -6,4 +6,4 @@ cd $(dirname $0)
./build
./prepare
-INSTALLER=0 ROOTFS=0 ./package
+ROOTFS=0 ./package
diff --git a/scripts/docs b/scripts/docs
new file mode 100755
index 00000000..0be13169
--- /dev/null
+++ b/scripts/docs
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+set -x
+
+docker run --rm -v $(pwd)/docs:/site -p 4000:4000 andredumas/github-pages serve --watch
+
diff --git a/scripts/hosting/digitalocean/cloud-config.yml b/scripts/hosting/digitalocean/cloud-config.yml
new file mode 100644
index 00000000..2042f1cb
--- /dev/null
+++ b/scripts/hosting/digitalocean/cloud-config.yml
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+PUBLIC_IPV4=$(wget -qO- http://169.254.169.254/metadata/v1/interfaces/public/0/ipv4/address)
+
+if [ "$(ros config get rancher.environment.installer)" == "true" ] && ros --version &>/dev/null; then
+ cat > cloud-config.yml <
> cloud-config.yml
+ done < <(wget -qO- http://169.254.169.254/metadata/v1/public-keys; echo)
+ yes | ros install -c cloud-config.yml -d /dev/vda
+ exit 0
+fi
+
+URL_BASE="https://releases.rancher.com/os/latest"
+cd /tmp
+curl -O -L "${URL_BASE}/vmlinuz"
+curl -O -L "${URL_BASE}/initrd"
+
+export DEBIAN_FRONTEND=noninteractive
+apt-get update && apt-get install -y kexec-tools ipcalc
+
+PUBLIC_IPV4_NETMASK=$(curl -s http://169.254.169.254/metadata/v1/interfaces/public/0/ipv4/netmask)
+PUBLIC_IPV4_CIDR=$(ipcalc ${PUBLIC_IPV4}/${PUBLIC_IPV4_NETMASK} | awk '/^Network/ {n=split($2, i, "/"); print i[2]};')
+PUBLIC_IPV4_GATEWAY=$(curl -s http://169.254.169.254/metadata/v1/interfaces/public/0/ipv4/gateway)
+
+
+kexec --initrd=initrd -l vmlinuz -f --command-line="quiet rancher.network.interfaces.eth0.address=${PUBLIC_IPV4}/${PUBLIC_IPV4_CIDR} rancher.network.interfaces.eth0.gateway=${PUBLIC_IPV4_GATEWAY} rancher.network.interfaces.eth0.dhcp=false rancher.cloud_init.datasources=[digitalocean] rancher.environment.installer=true"
diff --git a/scripts/hosting/packet/packet.sh b/scripts/hosting/packet/packet.sh
index ebbd5397..4802e1ea 100644
--- a/scripts/hosting/packet/packet.sh
+++ b/scripts/hosting/packet/packet.sh
@@ -1,8 +1,23 @@
#!/bin/bash
-set -e
+set -ex
+
+INSTALLER_IMAGE=rancher/os:v0.7.1
+
+ros config set rancher.network.interfaces.eth1.dhcp false
+if grep eth2 /proc/net/dev; then
+ ros config set rancher.network.interfaces.eth0.dhcp false
+ ros config set rancher.network.interfaces.eth2.dhcp true
+ system-docker restart network
+fi
+
+for ((i=0;i<30;i++)); do
+ if system-docker pull ${INSTALLER_IMAGE}; then
+ break
+ fi
+ sleep 1
+done
TINKERBELL_URL=$(cat /proc/cmdline | sed -e 's/^.*tinkerbell=//' -e 's/ .*$//')/phone-home
-INSTALLER_IMAGE=rancher/os:v0.7.0-rc3
tinkerbell_post()
{
@@ -120,5 +135,5 @@ else
ros install -f -t noformat -i ${INSTALLER_IMAGE} -d ${DEV_PREFIX}a -a "${COMMON_ARGS}" --no-reboot
fi
-tinkerbell_post 108 "Installation finished, rebooting server"
+tinkerbell_post 109 "Installation finished, rebooting server"
reboot
diff --git a/scripts/images/raspberry-pi-hypriot/Dockerfile.dapper b/scripts/images/raspberry-pi-hypriot/Dockerfile.dapper
index 18c0a78e..3fc9194f 100644
--- a/scripts/images/raspberry-pi-hypriot/Dockerfile.dapper
+++ b/scripts/images/raspberry-pi-hypriot/Dockerfile.dapper
@@ -8,12 +8,15 @@ RUN mkdir -p /source/assets
# RancherOS for ARM
RUN curl -fL https://releases.rancher.com/os/latest/rootfs_arm.tar.gz > /source/assets/rootfs_arm.tar.gz
+#COPY rootfs_arm.tar.gz /source/assets/rootfs_arm.tar.gz
-# Hypriot Kernel 4.1.17+ and bootfiles for RPi2
-RUN curl -fL http://downloads.hypriot.com/raspberrypi-bootloader_20160212-075712_armhf.deb > /source/assets/raspberrypi-bootloader_20160212-075712_armhf.deb
-
-# Bootfiles to support Raspberry Pi 3 B
-RUN curl -fL http://downloads.hypriot.com/rpi3-bootfiles.tar.gz > /source/assets/rpi3-bootfiles.tar.gz
+# 4.4.27-hypriotos-v7+
+# see https://packagecloud.io/Hypriot/rpi/?filter=debs
+ENV URL=https://packagecloud.io/Hypriot/rpi/packages/debian/jessie/
+RUN curl -fL $URL/raspberrypi-kernel_20161028-083330_armhf.deb/download \
+ > /source/assets/kernel.deb
+RUN curl -fL $URL/raspberrypi-bootloader_20161028-083330_armhf.deb/download \
+ > /source/assets/bootloader.deb
WORKDIR /source
CMD ["./scripts/build.sh"]
diff --git a/scripts/images/raspberry-pi-hypriot/scripts/build.sh b/scripts/images/raspberry-pi-hypriot/scripts/build.sh
index ef61d043..84fe74ea 100755
--- a/scripts/images/raspberry-pi-hypriot/scripts/build.sh
+++ b/scripts/images/raspberry-pi-hypriot/scripts/build.sh
@@ -6,8 +6,7 @@ cd $(dirname $0)/..
# create build directory for assembling our image filesystem
mkdir -p build/{boot,root,basefs} dist
-cp assets/raspberrypi-bootloader_*_armhf.deb build/bootloader.deb
-cp assets/rpi3-bootfiles.tar.gz build/rpi3-bootfiles.tar.gz
+cp assets/*.deb build/
#---build SD card image---
@@ -50,12 +49,11 @@ echo "RancherOS: root partition" > build/root/root.txt
# unpack and cleanup the basefs
#- doing this on a local folder keeps our resulting image clean (no dirty blocks from a delete)
+dpkg-deb -x build/kernel.deb build/basefs
dpkg-deb -x build/bootloader.deb build/basefs
-# upgrade Raspberry Pi bootfile for RPi3 support
-tar xvzf build/rpi3-bootfiles.tar.gz -C build/basefs/boot
# remove RPi1 kernel, we only support RPi2 and RPi3 in ARMv7 mode
rm -fr build/basefs/boot/kernel.img
-rm -fr build/basefs/lib/modules/{4.1.17+,4.1.17-hypriotos+}
+rm -fr build/basefs/lib/modules/{4.4.27+,4.4.27-hypriotos+}
# populate kernel, bootloader and RancherOS rootfs
cp -R build/basefs/* build/root
diff --git a/scripts/inline_schema.go b/scripts/inline_schema.go
new file mode 100644
index 00000000..6251dbbf
--- /dev/null
+++ b/scripts/inline_schema.go
@@ -0,0 +1,32 @@
+package main
+
+import (
+ "io/ioutil"
+ "os"
+ "text/template"
+)
+
+func main() {
+ t, err := template.New("schema_template").ParseFiles("./scripts/schema_template")
+ if err != nil {
+ panic(err)
+ }
+
+ schema, err := ioutil.ReadFile("./scripts/schema.json")
+ if err != nil {
+ panic(err)
+ }
+
+ inlinedFile, err := os.Create("config/schema.go")
+ if err != nil {
+ panic(err)
+ }
+
+ err = t.Execute(inlinedFile, map[string]string{
+ "schema": string(schema),
+ })
+
+ if err != nil {
+ panic(err)
+ }
+}
diff --git a/scripts/installer/Dockerfile.arm64 b/scripts/installer/Dockerfile.arm64
index 9d902950..966bde1a 100644
--- a/scripts/installer/Dockerfile.arm64
+++ b/scripts/installer/Dockerfile.arm64
@@ -6,8 +6,8 @@ RUN apt-get update && apt-get install -y parted git gcc make autoconf
RUN mkdir -p /usr/local/src && \
cd /usr/local/src && \
- git clone https://git.linaro.org/people/takahiro.akashi/kexec-tools.git && \
- cd kexec-tools && git checkout kdump/for-14 && ./bootstrap && ./configure && make && make install
+ git clone -b kdump/v0.14 https://git.linaro.org/people/takahiro.akashi/kexec-tools.git && \
+ cd kexec-tools && ./bootstrap && ./configure && make && make install
COPY conf lay-down-os seed-data set-disk-partitions /scripts/
COPY ./build/vmlinuz /dist/vmlinuz
diff --git a/scripts/integration-test b/scripts/integration-test
index c001c5cd..08c6f487 100755
--- a/scripts/integration-test
+++ b/scripts/integration-test
@@ -14,4 +14,8 @@ if [ ! -e ../dist/artifacts/initrd ]; then
../scripts/dev
fi
-go test -timeout 30m
+if [ "$RUNTEST" != "" ]; then
+ RUNTEST="-check.f ${RUNTEST}"
+fi
+
+go test -timeout 9999m $RUNTEST
diff --git a/scripts/layout b/scripts/layout
index 53fd362f..9c058f86 100755
--- a/scripts/layout
+++ b/scripts/layout
@@ -31,6 +31,12 @@ touch ${INITRD_DIR}/usr/bin/docker-containerd
touch ${INITRD_DIR}/usr/bin/docker-containerd-shim
touch ${INITRD_DIR}/usr/bin/docker
+# Override using a local kernel build
+if [ -e ${DAPPER_SOURCE}/assets/kernel.tar.gz ]; then
+ echo "copying ${DAPPER_SOURCE}/assets/kernel.tar.gz ${DOWNLOADS}/kernel.tar.gz"
+ cp ${DAPPER_SOURCE}/assets/kernel.tar.gz ${DOWNLOADS}/kernel.tar.gz
+fi
+
if [ -e ${DOWNLOADS}/kernel.tar.gz ]; then
mkdir -p ${BUILD}/kernel
tar xf ${DOWNLOADS}/kernel.tar.gz -C ${BUILD}/kernel
diff --git a/scripts/package-installer b/scripts/package-installer
index 69605345..25a85c08 100755
--- a/scripts/package-installer
+++ b/scripts/package-installer
@@ -17,5 +17,5 @@ trap "rm -rf ./scripts/installer/build" EXIT
docker build -t ${OS_REPO}/os:${VERSION}${SUFFIX} --build-arg VERSION=${VERSION} -f $DOCKERFILE ./scripts/installer
docker save -o dist/artifacts/installer.tar ${OS_REPO}/os:${VERSION}${SUFFIX}
-echo ${OS_REPO}/os:${VERSION}${SUFFIX} > dist/images
+echo ${OS_REPO}/os:${VERSION}${SUFFIX} >> dist/images
echo Built ${OS_REPO}/os:${VERSION}${SUFFIX}
diff --git a/scripts/package-rootfs b/scripts/package-rootfs
index cba25bf8..aa532524 100755
--- a/scripts/package-rootfs
+++ b/scripts/package-rootfs
@@ -22,6 +22,25 @@ if [ "$(docker info | grep 'Storage Driver: ' | sed 's/Storage Driver: //')" !=
exit 0
fi
+mkdir -p ${INITRD_DIR}/usr/share/rancher/
+cat < ${INITRD_DIR}/usr/share/rancher/os-release
+NAME="RancherOS"
+VERSION=${VERSION}
+ID=rancheros
+ID_LIKE=
+VERSION_ID=${VERSION}
+PRETTY_NAME="RancherOS ${VERSION}"
+HOME_URL="http://rancher.com/rancher-os/"
+SUPPORT_URL="https://forums.rancher.com/c/rancher-os"
+BUG_REPORT_URL="https://github.com/rancher/os/issues"
+BUILD_ID=
+HERE
+
+# need to make relative links to the os-release file
+cd ${INITRD_DIR}/usr/lib
+ln -s ../share/rancher/os-release os-release
+cd $(dirname $0)/..
+
DFS=$(docker run -d --privileged -v /lib/modules/$(uname -r):/lib/modules/$(uname -r) ${DFS_IMAGE}${SUFFIX} ${DFS_ARGS})
trap "docker rm -fv ${DFS_ARCH} ${DFS}" EXIT
docker exec -i ${DFS} docker load < ${INITRD_DIR}/usr/share/ros/images.tar
diff --git a/scripts/run b/scripts/run
index 00e738ce..a1d7c3e5 100755
--- a/scripts/run
+++ b/scripts/run
@@ -8,6 +8,11 @@ source ./scripts/run-common
while [ "$#" -gt 0 ]; do
case $1 in
+ --iso)
+ BOOT_ISO=1
+ QEMU=0
+ QIND=0
+ ;;
--append)
shift 1
QEMU_APPEND="${QEMU_APPEND} $1"
@@ -73,7 +78,9 @@ if [[ ! -e ${KERNEL} || ! -e ${INITRD_SRC} ]]; then
exit 1
fi
+echo "initrd ${INITRD}"
if [ "$REBUILD" == "1" ] || [ ! -e ${INITRD} ]; then
+ echo "rebuilding ${INITRD} from ${INITRD_SRC}"
cp bin/ros ${INITRD_SRC}/usr/bin/ros
./scripts/hash-initrd
pushd ${INITRD_SRC} >/dev/null
@@ -93,8 +100,7 @@ if [ "$KVM" == "" ] && [ -c /dev/kvm ] && [ -r /dev/kvm ] && [ -w /dev/kvm ]; th
KVM=1
fi
-if [ "$QEMU" == "1" ]; then
-
+if [ "$QEMU" == "1" ] || [ "$BOOT_ISO" == "1" ]; then
HD=${BASE}/state/hd.img
HD2=${BASE}/state/hd2.img
[ "$FRESH" == "1" ] && rm -f ${HD} ${HD2} >/dev/null 2>&1 || :
@@ -108,7 +114,15 @@ if [ "$QEMU" == "1" ]; then
qemu-img create -f qcow2 -o size=10G ${HD2}
SECOND_DRIVE_ENABLE=$(eval "${hd["$ARCH"]} ${HD2}")
fi
+ CPU=${cpu["$ARCH"]}
+ if [ "$KVM" == "1" ] && [ "$ARCH" == "$HOST_ARCH" ]; then
+ KVM_ENABLE="-enable-kvm"
+ CPU="-cpu host"
+ fi
+fi
+
+if [ "$QEMU" == "1" ]; then
CCROOT=${BUILD}/cloud-config
rm -rf ${CCROOT}
mkdir -p ${CCROOT}
@@ -124,47 +138,27 @@ if [ "$QEMU" == "1" ]; then
echo "- $(<${BASE}/assets/rancher.key.pub)" >> ${USER_DATA}
fi
- CPU=${cpu["$ARCH"]}
- if [ "$KVM" == "1" ] && [ "$ARCH" == "$HOST_ARCH" ]; then
- KVM_ENABLE="-enable-kvm"
- CPU="-cpu host"
- fi
HOME=${HOME:-/}
if [ "$INSTALLED" == "1" ]; then
- set -x
- exec qemu-system-${QEMUARCH} -serial stdio \
- -rtc base=utc,clock=host \
- ${KVM_ENABLE} \
- ${CPU} \
- ${machine["$ARCH"]} \
- -m 2048 \
- ${network["$ARCH"]} \
- $(eval "${hd["$ARCH"]} ${HD}") \
- ${SECOND_DRIVE_ENABLE} \
- -smp 1 \
- -nographic \
- -display none \
- -fsdev local,security_model=passthrough,readonly,id=fsdev0,path=${CCROOT} \
- -device virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=config-2 \
- -fsdev local,security_model=none,id=fsdev1,path=${HOME} \
- -device virtio-9p-pci,id=fs1,fsdev=fsdev1,mount_tag=home \
- ${QEMU_ARGS} \
- "${@}"
+ # kernel args only works when using -kernel
+ KERNEL_ARGS=""
else
- set -x
- exec qemu-system-${QEMUARCH} -serial stdio \
+ INSTALLED_ARGS="-kernel ${KERNEL} -initrd ${INITRD}"
+ fi
+ set -x
+ exec qemu-system-${QEMUARCH} \
+ -serial stdio \
-rtc base=utc,clock=host \
+ ${INSTALLED_ARGS} \
+ -append "${KERNEL_ARGS}" \
${KVM_ENABLE} \
${CPU} \
${machine["$ARCH"]} \
- -kernel ${KERNEL} \
- -initrd ${INITRD} \
-m 2048 \
${network["$ARCH"]} \
$(eval "${hd["$ARCH"]} ${HD}") \
${SECOND_DRIVE_ENABLE} \
-smp 1 \
- -append "${KERNEL_ARGS}" \
-nographic \
-display none \
-fsdev local,security_model=passthrough,readonly,id=fsdev0,path=${CCROOT} \
@@ -173,8 +167,22 @@ if [ "$QEMU" == "1" ]; then
-device virtio-9p-pci,id=fs1,fsdev=fsdev1,mount_tag=home \
${QEMU_ARGS} \
"${@}"
- fi
+elif [ "$BOOT_ISO" == "1" ]; then
+ set -x
+ exec qemu-system-${QEMUARCH} \
+ -curses \
+ -rtc base=utc,clock=host \
+ ${KVM_ENABLE} \
+ ${CPU} \
+ ${machine["$ARCH"]} \
+ -m 2048 \
+ ${network["$ARCH"]} \
+ $(eval "${hd["$ARCH"]} ${HD}") \
+ ${SECOND_DRIVE_ENABLE} \
+ -smp 1 \
+ -boot d \
+ -cdrom ./dist/artifacts/rancheros.iso
elif [ "$QIND" == "1" ]; then
NAME=${NAME:-ros-qind}
diff --git a/scripts/schema.json b/scripts/schema.json
new file mode 100644
index 00000000..f16d88bb
--- /dev/null
+++ b/scripts/schema.json
@@ -0,0 +1,197 @@
+{
+ "type": "object",
+ "additionalProperties": false,
+
+ "properties": {
+ "ssh_authorized_keys": {"$ref": "#/definitions/list_of_strings"},
+ "write_files": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/file_config"}
+ },
+ "hostname": {"type": "string"},
+ "mounts": {"type": "array"},
+ "rancher": {"$ref": "#/definitions/rancher_config"},
+ "runcmd": {"type": "array"},
+ "bootcmd": {"type": "array"}
+ },
+
+ "definitions": {
+ "rancher_config": {
+ "id": "#/definitions/rancher_config",
+ "type": "object",
+ "additionalProperties": false,
+
+ "properties": {
+ "console": {"type": "string"},
+ "environment": {"type": "object"},
+ "cloud_init_services": {"type": "object"},
+ "services": {"type": "object"},
+ "bootstrap": {"type": "object"},
+ "autoformat": {"type": "object"},
+ "bootstrap_docker": {"$ref": "#/definitions/docker_config"},
+ "cloud_init": {"$ref": "#/definitions/cloud_init_config"},
+ "debug": {"type": "boolean"},
+ "rm_usr": {"type": "boolean"},
+ "no_sharedroot": {"type": "boolean"},
+ "log": {"type": "boolean"},
+ "force_console_rebuild": {"type": "boolean"},
+ "disable": {"$ref": "#/definitions/list_of_strings"},
+ "services_include": {"type": "object"},
+ "modules": {"$ref": "#/definitions/list_of_strings"},
+ "network": {"$ref": "#/definitions/network_config"},
+ "default_network": {"type": "object"},
+ "repositories": {"type": "object"},
+ "ssh": {"$ref": "#/definitions/ssh_config"},
+ "state": {"$ref": "#/definitions/state_config"},
+ "system_docker": {"$ref": "#/definitions/docker_config"},
+ "upgrade": {"$ref": "#/definitions/upgrade_config"},
+ "docker": {"$ref": "#/definitions/docker_config"},
+ "registry_auths": {"type": "object"},
+ "defaults": {"$ref": "#/definitions/defaults_config"},
+ "resize_device": {"type": "string"},
+ "sysctl": {"type": "object"},
+ "restart_services": {"type": "array"}
+ }
+ },
+
+ "file_config": {
+ "id": "#/definitions/file_config",
+ "type": "object",
+ "additionalProperties": false,
+
+ "properties": {
+ "encoding": {"type": "string"},
+ "container": {"type": "string"},
+ "content": {"type": "string"},
+ "owner": {"type": "string"},
+ "path": {"type": "string"},
+ "permissions": {"type": "string"}
+ }
+ },
+
+ "network_config": {
+ "id": "#/definitions/network_config",
+ "type": "object",
+ "additionalProperties": false,
+
+ "properties": {
+ "pre_cmds": {"$ref": "#/definitions/list_of_strings"},
+ "dns": {"type": "object"},
+ "interfaces": {"type": "object"},
+ "post_cmds": {"$ref": "#/definitions/list_of_strings"},
+ "http_proxy": {"type": "string"},
+ "https_proxy": {"type": "string"},
+ "no_proxy": {"type": "string"}
+ }
+ },
+
+ "upgrade_config": {
+ "id": "#/definitions/upgrade_config",
+ "type": "object",
+ "additionalProperties": false,
+
+ "properties": {
+ "url": {"type": "string"},
+ "image": {"type": "string"},
+ "rollback": {"type": "string"}
+ }
+ },
+
+ "docker_config": {
+ "id": "#/definitions/docker_config",
+ "type": "object",
+ "additionalProperties": false,
+
+ "properties": {
+ "engine": {"type": "string"},
+ "tls": {"type": "boolean"},
+ "tls_args": {"$ref": "#/definitions/list_of_strings"},
+ "args": {"$ref": "#/definitions/list_of_strings"},
+ "extra_args": {"$ref": "#/definitions/list_of_strings"},
+ "server_cert": {"type": "string"},
+ "server_key": {"type": "string"},
+ "ca_cert": {"type": "string"},
+ "ca_key": {"type": "string"},
+ "environment": {"$ref": "#/definitions/list_of_strings"},
+ "storage_context": {"type": "string"},
+ "exec": {"type": ["boolean", "null"]},
+ "bridge": {"type": "string"},
+ "config_file": {"type": "string"},
+ "containerd": {"type": "string"},
+ "debug": {"type": ["boolean", "null"]},
+ "exec_root": {"type": "string"},
+ "group": {"type": "string"},
+ "graph": {"type": "string"},
+ "host": {"type": "array"},
+ "live_restore": {"type": ["boolean", "null"]},
+ "log_driver": {"type": "string"},
+ "log_opts": {"type": "object"},
+ "pid_file": {"type": "string"},
+ "registry_mirror": {"type": "string"},
+ "restart": {"type": ["boolean", "null"]},
+ "selinux_enabled": {"type": ["boolean", "null"]},
+ "storage_driver": {"type": "string"},
+ "userland_proxy": {"type": ["boolean", "null"]},
+ "insecure_registry": {"$ref": "#/definitions/list_of_strings"}
+ }
+ },
+
+ "ssh_config": {
+ "id": "#/definitions/ssh_config",
+ "type": "object",
+ "additionalProperties": false,
+
+ "properties": {
+ "keys": {"type": "object"}
+ }
+ },
+
+ "state_config": {
+ "id": "#/definitions/state_config",
+ "type": "object",
+ "additionalProperties": false,
+
+ "properties": {
+ "directory": {"type": "string"},
+ "fstype": {"type": "string"},
+ "dev": {"type": "string"},
+ "wait": {"type": "boolean"},
+ "required": {"type": "boolean"},
+ "autoformat": {"$ref": "#/definitions/list_of_strings"},
+ "mdadm_scan": {"type": "boolean"},
+ "script": {"type": "string"},
+ "oem_fstype": {"type": "string"},
+ "oem_dev": {"type": "string"}
+ }
+ },
+
+ "cloud_init_config": {
+ "id": "#/definitions/cloud_init_config",
+ "type": "object",
+ "additionalProperties": false,
+
+ "properties": {
+ "datasources": {"$ref": "#/definitions/list_of_strings"}
+ }
+ },
+
+ "defaults_config": {
+ "id": "#/definitions/defaults_config",
+ "type": "object",
+ "additionalProperties": false,
+
+ "properties": {
+ "hostname": {"type": "string"},
+ "docker": {"type": "object"},
+ "network": {"$ref": "#/definitions/network_config"}
+ }
+ },
+
+ "list_of_strings": {
+ "type": "array",
+ "items": {"type": "string"},
+ "uniqueItems": true
+ }
+ }
+}
+
diff --git a/scripts/schema_template b/scripts/schema_template
new file mode 100644
index 00000000..84035db0
--- /dev/null
+++ b/scripts/schema_template
@@ -0,0 +1,3 @@
+package config
+
+var schema = `{{.schema}}`
diff --git a/scripts/validate b/scripts/validate
index 9bd48c41..17f8372e 100755
--- a/scripts/validate
+++ b/scripts/validate
@@ -9,12 +9,12 @@ PACKAGES=". $(find -name '*.go' | xargs -I{} dirname {} | cut -f2 -d/ | sort -u
echo Running: go vet
go vet ${PACKAGES}
-#echo Running: golint
-#for i in ${PACKAGES}; do
-# if [ -n "$(golint $i | grep -v 'should have comment.*or be unexported' | tee /dev/stderr)" ]; then
-# failed=true
-# fi
-#done
+echo Running: golint
+for i in ${PACKAGES}; do
+ if [ -n "$(golint $i | grep -v 'should have comment.*or be unexported' | tee /dev/stderr)" ]; then
+ failed=true
+ fi
+done
test -z "$failed"
echo Running: go fmt
test -z "$(go fmt ${PACKAGES} | tee /dev/stderr)"
diff --git a/scripts/version b/scripts/version
index d463f3d0..e9949750 100755
--- a/scripts/version
+++ b/scripts/version
@@ -18,5 +18,8 @@ export VERSION COMMIT
# Suffix
export SUFFIX=""
if [ -n "${ARCH}" ] && [ "${ARCH}" != "amd64" ]; then
+ # TODO: why is this not exported?
SUFFIX="_${ARCH}"
fi
+
+echo " Building ${VERSION} from ${COMMIT} on ${ARCH}"
diff --git a/selinux/selinux_linux.go b/selinux/selinux_linux.go
index e999ca33..c1550e6e 100644
--- a/selinux/selinux_linux.go
+++ b/selinux/selinux_linux.go
@@ -9,3 +9,8 @@ func InitializeSelinux() (int, error) {
ret, err := C.selinux_init_load_policy(&enforce)
return int(ret), err
}
+
+func SetFileContext(path string, context string) (int, error) {
+ ret, err := C.setfilecon(C.CString(path), C.CString(context))
+ return int(ret), err
+}
diff --git a/tests/assets/test_26/cloud-config.yml b/tests/assets/test_26/cloud-config.yml
index b74010dc..f4f15f8b 100644
--- a/tests/assets/test_26/cloud-config.yml
+++ b/tests/assets/test_26/cloud-config.yml
@@ -27,5 +27,6 @@ runcmd:
- []
- [ test ]
- [ touch, /home/rancher/test2 ]
+- echo "" > /home/rancher/test5
ssh_authorized_keys:
- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF
diff --git a/tests/bad_state_test.go b/tests/bad_state_test.go
index 413783a9..29530160 100644
--- a/tests/bad_state_test.go
+++ b/tests/bad_state_test.go
@@ -3,13 +3,11 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestBadState(c *C) {
- err := s.RunQemu("--no-format", "--append", "rancher.state.dev=LABEL=BAD_STATE")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--no-format", "--append", "rancher.state.dev=LABEL=BAD_STATE")
s.CheckCall(c, "mount | grep /var/lib/docker | grep rootfs")
}
func (s *QemuSuite) TestBadStateWithWait(c *C) {
- err := s.RunQemu("--no-format", "--append", "rancher.state.dev=LABEL=BAD_STATE", "--append", "rancher.state.wait")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--no-format", "--append", "rancher.state.dev=LABEL=BAD_STATE", "--append", "rancher.state.wait")
s.CheckCall(c, "mount | grep /var/lib/docker | grep rootfs")
}
diff --git a/tests/cloud_config_hostname_test.go b/tests/cloud_config_hostname_test.go
index 5dee29c5..e22bc289 100644
--- a/tests/cloud_config_hostname_test.go
+++ b/tests/cloud_config_hostname_test.go
@@ -3,8 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestCloudConfigHostname(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_13/cloud-config.yml")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_13/cloud-config.yml")
s.CheckCall(c, "hostname | grep rancher-test")
s.CheckCall(c, "cat /etc/hosts | grep rancher-test")
diff --git a/tests/cloud_init_test.go b/tests/cloud_init_test.go
new file mode 100644
index 00000000..a04d0d05
--- /dev/null
+++ b/tests/cloud_init_test.go
@@ -0,0 +1,20 @@
+package integration
+
+import . "gopkg.in/check.v1"
+
+func (s *QemuSuite) TestReadDatasourcesFromDisk(c *C) {
+ s.RunQemu(c)
+
+ s.CheckCall(c, `
+sudo tee /var/lib/rancher/conf/cloud-config.d/datasources.yml << EOF
+rancher:
+ cloud_init:
+ datasources:
+ - url:https://gist.githubusercontent.com/joshwget/e1c49f8b1ddeeba01bc9d0a3be01ed60/raw/9168b380fde182d53acea487d49b680648a0ca5b/gistfile1.txt
+EOF
+`)
+
+ s.Reboot(c)
+
+ s.CheckCall(c, "sudo ros config get rancher.log | grep true")
+}
diff --git a/tests/common_test.go b/tests/common_test.go
index f3ee93f4..b58c3404 100644
--- a/tests/common_test.go
+++ b/tests/common_test.go
@@ -31,9 +31,8 @@ var (
"arm": "armhfbuild/nginx",
"arm64": "armhfbuild/nginx",
}[runtime.GOARCH]
- DockerUrl = "https://experimental.docker.com/builds/Linux/x86_64/docker-1.10.0-dev"
- Version = os.Getenv("VERSION")
- Suffix = os.Getenv("SUFFIX")
+ Version = os.Getenv("VERSION")
+ Suffix = os.Getenv("SUFFIX")
)
type QemuSuite struct {
@@ -47,7 +46,7 @@ func (s *QemuSuite) TearDownTest(c *C) {
time.Sleep(time.Millisecond * 1000)
}
-func (s *QemuSuite) RunQemu(additionalArgs ...string) error {
+func (s *QemuSuite) RunQemu(c *C, additionalArgs ...string) {
runArgs := []string{
"--qemu",
"--no-rebuild",
@@ -56,10 +55,10 @@ func (s *QemuSuite) RunQemu(additionalArgs ...string) error {
}
runArgs = append(runArgs, additionalArgs...)
- return s.runQemu(runArgs...)
+ c.Assert(s.runQemu(runArgs...), IsNil)
}
-func (s *QemuSuite) RunQemuInstalled(additionalArgs ...string) error {
+func (s *QemuSuite) RunQemuInstalled(c *C, additionalArgs ...string) {
runArgs := []string{
"--qemu",
"--no-rebuild",
@@ -68,7 +67,7 @@ func (s *QemuSuite) RunQemuInstalled(additionalArgs ...string) error {
}
runArgs = append(runArgs, additionalArgs...)
- return s.runQemu(runArgs...)
+ c.Assert(s.runQemu(runArgs...), IsNil)
}
func (s *QemuSuite) runQemu(args ...string) error {
@@ -84,6 +83,24 @@ func (s *QemuSuite) runQemu(args ...string) error {
func (s *QemuSuite) WaitForSSH() error {
sshArgs := []string{
+ "--qemu",
+ "true",
+ }
+
+ var err error
+ for i := 0; i < 100; i++ {
+ cmd := exec.Command(s.sshCommand, sshArgs...)
+ if err = cmd.Run(); err == nil {
+ break
+ }
+ time.Sleep(500 * time.Millisecond)
+ }
+
+ if err != nil {
+ return fmt.Errorf("Failed to connect to SSH: %v", err)
+ }
+
+ sshArgs = []string{
"--qemu",
"docker",
"version",
@@ -91,8 +108,7 @@ func (s *QemuSuite) WaitForSSH() error {
"2>&1",
}
- var err error
- for i := 0; i < 300; i++ {
+ for i := 0; i < 20; i++ {
cmd := exec.Command(s.sshCommand, sshArgs...)
if err = cmd.Run(); err == nil {
return nil
@@ -100,7 +116,7 @@ func (s *QemuSuite) WaitForSSH() error {
time.Sleep(500 * time.Millisecond)
}
- return fmt.Errorf("Failed to connect to SSH: %v", err)
+ return fmt.Errorf("Failed to check Docker version: %v", err)
}
func (s *QemuSuite) MakeCall(additionalArgs ...string) error {
diff --git a/tests/consoles_test.go b/tests/consoles_test.go
index b6896415..26900e3d 100644
--- a/tests/consoles_test.go
+++ b/tests/consoles_test.go
@@ -3,8 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestCloudConfigConsole(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_03/cloud-config.yml")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_03/cloud-config.yml")
s.CheckCall(c, "apt-get --version")
s.CheckCall(c, `
@@ -13,8 +12,7 @@ sudo ros console list | grep debian | grep current`)
}
func (s *QemuSuite) TestConsoleCommand(c *C) {
- err := s.RunQemu()
- c.Assert(err, IsNil)
+ s.RunQemu(c)
s.CheckCall(c, `
sudo ros console list | grep default | grep current
@@ -53,3 +51,21 @@ sudo ros console list | grep debian | grep disabled`)
sudo ros console list | grep default | grep disabled
sudo ros console list | grep debian | grep current`)
}
+
+func (s *QemuSuite) TestContainersRestartAfterConsoleSwitch(c *C) {
+ s.RunQemu(c)
+
+ s.CheckCall(c, `
+docker run -d --restart=always nginx
+docker ps | grep nginx`)
+
+ s.MakeCall("sudo ros console switch -f debian")
+ c.Assert(s.WaitForSSH(), IsNil)
+
+ s.CheckCall(c, "docker ps | grep nginx")
+ s.CheckCall(c, "sudo ros console enable default")
+
+ s.Reboot(c)
+
+ s.CheckCall(c, "docker ps | grep nginx")
+}
diff --git a/tests/custom_docker_test.go b/tests/custom_docker_test.go
index e4a68c70..d056794e 100644
--- a/tests/custom_docker_test.go
+++ b/tests/custom_docker_test.go
@@ -3,8 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestCustomDocker(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_05/cloud-config.yml")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_05/cloud-config.yml")
s.CheckCall(c, `
set -ex
@@ -35,8 +34,7 @@ docker ps | grep nginx`)
}
func (s *QemuSuite) TestCustomDockerInPersistentConsole(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_25/cloud-config.yml")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_25/cloud-config.yml")
s.CheckCall(c, `
set -ex
diff --git a/tests/dhcp_hostname_test.go b/tests/dhcp_hostname_test.go
index bf1dcc4c..726dd960 100644
--- a/tests/dhcp_hostname_test.go
+++ b/tests/dhcp_hostname_test.go
@@ -3,8 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestDhcpHostname(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_12/cloud-config.yml")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_12/cloud-config.yml")
s.CheckCall(c, "hostname | grep rancher-dev")
s.CheckCall(c, "cat /etc/hosts | grep rancher-dev")
diff --git a/tests/environment_test.go b/tests/environment_test.go
index 79d3d842..a1ddc24b 100644
--- a/tests/environment_test.go
+++ b/tests/environment_test.go
@@ -3,8 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestEnvironment(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_11/cloud-config.yml")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_11/cloud-config.yml")
s.CheckCall(c, "sudo system-docker inspect env | grep A=A")
s.CheckCall(c, "sudo system-docker inspect env | grep BB=BB")
diff --git a/tests/http_proxy_test.go b/tests/http_proxy_test.go
index 4b9dc99b..9640699b 100644
--- a/tests/http_proxy_test.go
+++ b/tests/http_proxy_test.go
@@ -3,15 +3,14 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestHttpProxy(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_17/cloud-config.yml")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_17/cloud-config.yml")
s.CheckCall(c, `
set -x -e
-sudo system-docker inspect docker env | grep HTTP_PROXY=invalid
-sudo system-docker inspect docker env | grep HTTPS_PROXY=invalid
-sudo system-docker inspect docker env | grep NO_PROXY=invalid
+sudo system-docker inspect docker | grep HTTP_PROXY=invalid
+sudo system-docker inspect docker | grep HTTPS_PROXY=invalid
+sudo system-docker inspect docker | grep NO_PROXY=invalid
if docker pull busybox; then
exit 1
diff --git a/tests/kernel_headers_test.go b/tests/kernel_headers_test.go
index cbba30f3..ecbef5f3 100644
--- a/tests/kernel_headers_test.go
+++ b/tests/kernel_headers_test.go
@@ -3,8 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestKernelHeaders(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_22/cloud-config.yml")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_22/cloud-config.yml")
s.CheckCall(c, `
sleep 15
diff --git a/tests/lenient_service_parsing_test.go b/tests/lenient_service_parsing_test.go
index d19521f5..2bd0cc9c 100644
--- a/tests/lenient_service_parsing_test.go
+++ b/tests/lenient_service_parsing_test.go
@@ -3,8 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestLenientServiceParsing(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_19/cloud-config.yml")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_19/cloud-config.yml")
s.CheckCall(c, `
sleep 5
diff --git a/tests/misc_test.go b/tests/misc_test.go
index 3e912446..cc6c9fe1 100644
--- a/tests/misc_test.go
+++ b/tests/misc_test.go
@@ -3,8 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestMisc(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_01/cloud-config.yml")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_01/cloud-config.yml")
s.CheckCall(c, "sudo ros env printenv FLANNEL_NETWORK | grep '10.244.0.0/16'")
diff --git a/tests/mounts_test.go b/tests/mounts_test.go
index ff92444d..6f9983c7 100644
--- a/tests/mounts_test.go
+++ b/tests/mounts_test.go
@@ -3,8 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestMounts(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_23/cloud-config.yml", "--second-drive")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_23/cloud-config.yml", "--second-drive")
s.CheckCall(c, "cat /home/rancher/test | grep test")
diff --git a/tests/network_from_url_test.go b/tests/network_from_url_test.go
index fac7d018..1effaa39 100644
--- a/tests/network_from_url_test.go
+++ b/tests/network_from_url_test.go
@@ -4,12 +4,11 @@ import . "gopkg.in/check.v1"
func (s *QemuSuite) TestNetworkFromUrl(c *C) {
netArgs := []string{"-net", "nic,vlan=0,model=virtio"}
- args := []string{"--cloud-config", "./tests/assets/test_10/cloud-config.yml"}
+ args := []string{"--append", "rancher.cloud_init.datasources=[url:https://gist.githubusercontent.com/joshwget/0bdc616cd26162ad87c535644c8b1ef6/raw/8cce947c08cf006e932b71d92ddbb96bae8e3325/gistfile1.txt]"}
for i := 0; i < 7; i++ {
args = append(args, netArgs...)
}
- err := s.RunQemu(args...)
- c.Assert(err, IsNil)
+ s.RunQemu(c, args...)
s.CheckCall(c, `
cat > test-merge << "SCRIPT"
diff --git a/tests/network_on_boot_test.go b/tests/network_on_boot_test.go
index 6ffc570d..f17dfe0a 100644
--- a/tests/network_on_boot_test.go
+++ b/tests/network_on_boot_test.go
@@ -3,8 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestNetworkOnBoot(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_18/cloud-config.yml", "-net", "nic,vlan=1,model=virtio")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_18/cloud-config.yml", "-net", "nic,vlan=1,model=virtio")
s.CheckCall(c, "apt-get --version")
s.CheckCall(c, "sudo system-docker images | grep tianon/true")
diff --git a/tests/network_test.go b/tests/network_test.go
index ba603473..c54bd813 100644
--- a/tests/network_test.go
+++ b/tests/network_test.go
@@ -8,8 +8,7 @@ func (s *QemuSuite) TestNetwork(c *C) {
for i := 0; i < 7; i++ {
args = append(args, netArgs...)
}
- err := s.RunQemu(args...)
- c.Assert(err, IsNil)
+ s.RunQemu(c, args...)
s.CheckCall(c, `
cat > test-merge << "SCRIPT"
diff --git a/tests/nonexistent_state_test.go b/tests/nonexistent_state_test.go
index 4a306b4f..9843f1bc 100644
--- a/tests/nonexistent_state_test.go
+++ b/tests/nonexistent_state_test.go
@@ -3,8 +3,6 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestNonexistentState(c *C) {
- err := s.RunQemu("--no-format", "--append", "rancher.state.dev=LABEL=NONEXISTENT")
- c.Assert(err, IsNil)
-
+ s.RunQemu(c, "--no-format", "--append", "rancher.state.dev=LABEL=NONEXISTENT")
s.CheckCall(c, "sudo ros config get rancher.state.dev | grep LABEL=NONEXISTENT")
}
diff --git a/tests/oem_test.go b/tests/oem_test.go
index 1095f390..7b785bf0 100644
--- a/tests/oem_test.go
+++ b/tests/oem_test.go
@@ -3,8 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestOem(c *C) {
- err := s.RunQemu("--second-drive")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--second-drive")
s.CheckCall(c, `
set -x
diff --git a/tests/preload_test.go b/tests/preload_test.go
index 960399ee..5b533475 100644
--- a/tests/preload_test.go
+++ b/tests/preload_test.go
@@ -5,12 +5,12 @@ import (
)
func (s *QemuSuite) TestPreload(c *C) {
- err := s.RunQemu()
- c.Assert(err, IsNil)
+ s.RunQemu(c)
s.CheckCall(c, `
docker pull busybox
sudo docker save -o /var/lib/rancher/preload/system-docker/busybox.tar busybox
+sudo gzip /var/lib/rancher/preload/system-docker/busybox.tar
sudo system-docker pull alpine
sudo system-docker save -o /var/lib/rancher/preload/docker/alpine.tar alpine`)
diff --git a/tests/ros_config_test.go b/tests/ros_config_test.go
index fb96ac8c..92cb2974 100644
--- a/tests/ros_config_test.go
+++ b/tests/ros_config_test.go
@@ -3,8 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestRosConfig(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_14/cloud-config.yml")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_14/cloud-config.yml")
s.CheckCall(c, `
set -x -e
diff --git a/tests/shared_mount_test.go b/tests/shared_mount_test.go
index de70b588..90428bc0 100644
--- a/tests/shared_mount_test.go
+++ b/tests/shared_mount_test.go
@@ -7,9 +7,7 @@ import (
)
func (s *QemuSuite) TestSharedMount(c *C) {
- err := s.RunQemu()
- c.Assert(err, IsNil)
-
+ s.RunQemu(c)
s.CheckCall(c, fmt.Sprintf(`
set -x -e
diff --git a/tests/ssh_key_merge_test.go b/tests/ssh_key_merge_test.go
index 05ef929c..e17e6b1c 100644
--- a/tests/ssh_key_merge_test.go
+++ b/tests/ssh_key_merge_test.go
@@ -3,9 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestSshKeyMerge(c *C) {
- err := s.RunQemu()
- c.Assert(err, IsNil)
-
+ s.RunQemu(c)
s.CheckCall(c, `
cat > test-merge << "SCRIPT"
set -x -e
diff --git a/tests/start_commands_test.go b/tests/start_commands_test.go
index 2b36928b..74871616 100644
--- a/tests/start_commands_test.go
+++ b/tests/start_commands_test.go
@@ -7,10 +7,9 @@ import (
)
func (s *QemuSuite) TestStartCommands(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_26/cloud-config.yml")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_26/cloud-config.yml")
- for i := 1; i < 5; i++ {
+ for i := 1; i < 6; i++ {
s.CheckCall(c, fmt.Sprintf("ls /home/rancher | grep test%d", i))
}
s.CheckCall(c, "docker ps | grep nginx")
diff --git a/tests/subdir_test.go b/tests/subdir_test.go
index 9d4afa67..d8b42c20 100644
--- a/tests/subdir_test.go
+++ b/tests/subdir_test.go
@@ -3,9 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestSubdir(c *C) {
- err := s.RunQemu("--append", "rancher.state.directory=ros_subdir")
- c.Assert(err, IsNil)
-
+ s.RunQemu(c, "--append", "rancher.state.directory=ros_subdir")
s.CheckCall(c, `
set -x -e
mkdir x
diff --git a/tests/swap_test.go b/tests/swap_test.go
index e062833b..abe2dfa3 100644
--- a/tests/swap_test.go
+++ b/tests/swap_test.go
@@ -3,8 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestSwap(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_21/cloud-config.yml", "--second-drive")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_21/cloud-config.yml", "--second-drive")
s.CheckCall(c, "sudo mkswap /dev/vdb")
s.CheckCall(c, "sudo cloud-init-execute")
diff --git a/tests/sysctl_test.go b/tests/sysctl_test.go
index b7b3ff3b..865f8b47 100644
--- a/tests/sysctl_test.go
+++ b/tests/sysctl_test.go
@@ -3,8 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestSysctl(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_20/cloud-config.yml")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_20/cloud-config.yml")
s.CheckCall(c, "sudo cat /proc/sys/kernel/domainname | grep test")
s.CheckCall(c, "sudo cat /proc/sys/dev/cdrom/debug | grep 1")
diff --git a/tests/tls_test.go b/tests/tls_test.go
index 7a816f97..55894feb 100644
--- a/tests/tls_test.go
+++ b/tests/tls_test.go
@@ -3,9 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestTls(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_02/cloud-config.yml")
- c.Assert(err, IsNil)
-
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_02/cloud-config.yml")
s.CheckCall(c, `
set -e -x
sudo ros tls gen
diff --git a/tests/upgrade_test.go b/tests/upgrade_test.go
index d1067c2e..6167bd22 100644
--- a/tests/upgrade_test.go
+++ b/tests/upgrade_test.go
@@ -7,8 +7,7 @@ import (
)
func (s *QemuSuite) TestUpgrade(c *C) {
- err := s.RunQemuInstalled()
- c.Assert(err, IsNil)
+ s.RunQemuInstalled(c)
s.CheckCall(c, `
set -ex
diff --git a/tests/write_files_test.go b/tests/write_files_test.go
index cfea784f..84f27a7f 100644
--- a/tests/write_files_test.go
+++ b/tests/write_files_test.go
@@ -3,8 +3,7 @@ package integration
import . "gopkg.in/check.v1"
func (s *QemuSuite) TestWriteFiles(c *C) {
- err := s.RunQemu("--cloud-config", "./tests/assets/test_24/cloud-config.yml")
- c.Assert(err, IsNil)
+ s.RunQemu(c, "--cloud-config", "./tests/assets/test_24/cloud-config.yml")
s.CheckCall(c, "sudo cat /test | grep 'console content'")
s.CheckCall(c, "sudo cat /test2 | grep 'console content'")
diff --git a/trash.conf b/trash.conf
index a39ada32..2e7e9e94 100644
--- a/trash.conf
+++ b/trash.conf
@@ -1,6 +1,6 @@
github.com/Microsoft/go-winio v0.1.0
github.com/RackSec/srslog 259aed10dfa74ea2961eddd1d9847619f6e98837
-github.com/Sirupsen/logrus v0.9.0
+github.com/Sirupsen/logrus v0.11.0
github.com/boltdb/bolt v1.2.0
github.com/cloudfoundry-incubator/candiedyaml 01cbc92901719f599b11f3a7e3b1768d7002b0bb https://github.com/rancher/candiedyaml
github.com/cloudfoundry/gosigar 3ed7c74352dae6dc00bdc8c74045375352e3ec05
@@ -17,7 +17,7 @@ github.com/docker/docker bf16bd9dcfc3c9fafb7eb7b39ae7ef7abf1ae7f1 https://github
github.com/docker/engine-api v0.3.3
github.com/docker/go-connections v0.2.0
github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3
-github.com/docker/libcompose 09abf78a849d3cb81a4c17b48d0b68af713a80a5 https://github.com/rancher/libcompose.git
+github.com/docker/libcompose b9f88a071f78d49293a8f31ae0d2e339085fd0d7 https://github.com/rancher/libcompose.git
github.com/docker/libnetwork v0.5.6
github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a
github.com/docker/machine 4a8e93ac9bc2ced1c3bc4a43c03fdaa1c2749205
@@ -37,8 +37,6 @@ github.com/packethost/packngo 7b3a781a3c8c45b0e55390fa3c4d24981402b99f https://g
github.com/pkg/errors d62207b3dc916c342cd6a7180fa861d898cf42ee
github.com/pmezard/go-difflib d8ed2627bdf02c080bf22230dbb337003b7aba2d
github.com/rancher/cniglue b56bd68e5df113ad3fcc59c58034c22afaede877
-github.com/rancher/docker-from-scratch 084910d99b12408467a559f338e5a27bf4a1aed3
-github.com/rancher/netconf ddd7e35a6aacd7e80991920774083dd4408ec018
github.com/rcrowley/go-metrics eeba7bd0dd01ace6e690fa833b3f22aaec29af43
github.com/ryanuber/go-glob 0067a9abd927e50aed5190662702f81231413ae0
github.com/seccomp/libseccomp-golang 1b506fc7c24eec5a3693cdcbed40d9c226cfc6a1
diff --git a/util/network/cache.go b/util/network/cache.go
index fcf5c22e..cba17518 100644
--- a/util/network/cache.go
+++ b/util/network/cache.go
@@ -6,7 +6,7 @@ import (
"io/ioutil"
"os"
- log "github.com/Sirupsen/logrus"
+ "github.com/rancher/os/log"
)
const (
diff --git a/util/network/network.go b/util/network/network.go
index 0436fb15..6223c339 100644
--- a/util/network/network.go
+++ b/util/network/network.go
@@ -11,8 +11,8 @@ import (
yaml "github.com/cloudfoundry-incubator/candiedyaml"
- log "github.com/Sirupsen/logrus"
"github.com/rancher/os/config"
+ "github.com/rancher/os/log"
)
var (
@@ -36,17 +36,17 @@ func getServices(urls []string, key string) ([]string, error) {
result := []string{}
for _, url := range urls {
- indexUrl := fmt.Sprintf("%s/index.yml", url)
- content, err := LoadResource(indexUrl, true)
+ indexURL := fmt.Sprintf("%s/index.yml", url)
+ content, err := LoadResource(indexURL, true)
if err != nil {
- log.Errorf("Failed to load %s: %v", indexUrl, err)
+ log.Errorf("Failed to load %s: %v", indexURL, err)
continue
}
services := make(map[string][]string)
err = yaml.Unmarshal(content, &services)
if err != nil {
- log.Errorf("Failed to unmarshal %s: %v", indexUrl, err)
+ log.Errorf("Failed to unmarshal %s: %v", indexURL, err)
continue
}
@@ -59,14 +59,14 @@ func getServices(urls []string, key string) ([]string, error) {
}
func SetProxyEnvironmentVariables(cfg *config.CloudConfig) {
- if cfg.Rancher.Network.HttpProxy != "" {
- err := os.Setenv("HTTP_PROXY", cfg.Rancher.Network.HttpProxy)
+ if cfg.Rancher.Network.HTTPProxy != "" {
+ err := os.Setenv("HTTP_PROXY", cfg.Rancher.Network.HTTPProxy)
if err != nil {
log.Errorf("Unable to set HTTP_PROXY: %s", err)
}
}
- if cfg.Rancher.Network.HttpsProxy != "" {
- err := os.Setenv("HTTPS_PROXY", cfg.Rancher.Network.HttpsProxy)
+ if cfg.Rancher.Network.HTTPSProxy != "" {
+ err := os.Setenv("HTTPS_PROXY", cfg.Rancher.Network.HTTPSProxy)
if err != nil {
log.Errorf("Unable to set HTTPS_PROXY: %s", err)
}
@@ -128,7 +128,7 @@ func LoadResource(location string, network bool) ([]byte, error) {
return nil, ErrNotFound
}
-func serviceUrl(url, name string) string {
+func serviceURL(url, name string) string {
return fmt.Sprintf("%s/%s/%s.yml", url, name[0:1], name)
}
@@ -144,10 +144,10 @@ func LoadServiceResource(name string, useNetwork bool, cfg *config.CloudConfig)
urls := cfg.Rancher.Repositories.ToArray()
for _, url := range urls {
- serviceUrl := serviceUrl(url, name)
- bytes, err = LoadResource(serviceUrl, useNetwork)
+ serviceURL := serviceURL(url, name)
+ bytes, err = LoadResource(serviceURL, useNetwork)
if err == nil {
- log.Debugf("Loaded %s from %s", name, serviceUrl)
+ log.Debugf("Loaded %s from %s", name, serviceURL)
return bytes, nil
}
}
diff --git a/util/util.go b/util/util.go
index 90cddc88..91c5c1ee 100644
--- a/util/util.go
+++ b/util/util.go
@@ -7,16 +7,18 @@ import (
"fmt"
"io/ioutil"
"os"
+ "os/exec"
"path"
"strings"
- yaml "github.com/cloudfoundry-incubator/candiedyaml"
+ "github.com/rancher/os/log"
- log "github.com/Sirupsen/logrus"
+ yaml "github.com/cloudfoundry-incubator/candiedyaml"
+ osYaml "github.com/rancher/os/config/yaml"
)
const (
- DOCKER_CGROUPS_FILE = "/proc/self/cgroup"
+ dockerCgroupsFile = "/proc/self/cgroup"
)
type AnyMap map[interface{}]interface{}
@@ -194,8 +196,8 @@ func TrimSplit(str, sep string) []string {
return TrimSplitN(str, sep, -1)
}
-func GetCurrentContainerId() (string, error) {
- file, err := os.Open(DOCKER_CGROUPS_FILE)
+func GetCurrentContainerID() (string, error) {
+ file, err := os.Open(dockerCgroupsFile)
if err != nil {
return "", err
@@ -241,3 +243,47 @@ func ExistsAndExecutable(path string) bool {
mode := info.Mode().Perm()
return mode&os.ModePerm != 0
}
+
+func RunScript(path string) error {
+ if !ExistsAndExecutable(path) {
+ return nil
+ }
+
+ script, err := os.Open(path)
+ if err != nil {
+ return err
+ }
+
+ magic := make([]byte, 2)
+ if _, err = script.Read(magic); err != nil {
+ return err
+ }
+
+ cmd := exec.Command("/bin/sh", path)
+ if string(magic) == "#!" {
+ cmd = exec.Command(path)
+ }
+
+ cmd.Stdout = os.Stdout
+ cmd.Stderr = os.Stderr
+
+ return cmd.Run()
+}
+
+func RunCommandSequence(commandSequence []osYaml.StringandSlice) {
+ for _, command := range commandSequence {
+ var cmd *exec.Cmd
+ if command.StringValue != "" {
+ cmd = exec.Command("sh", "-c", command.StringValue)
+ } else if len(command.SliceValue) > 0 {
+ cmd = exec.Command(command.SliceValue[0], command.SliceValue[1:]...)
+ } else {
+ continue
+ }
+ cmd.Stdout = os.Stdout
+ cmd.Stderr = os.Stderr
+ if err := cmd.Run(); err != nil {
+ log.Errorf("Failed to run %s: %v", command, err)
+ }
+ }
+}
diff --git a/vendor/github.com/Sirupsen/logrus/.travis.yml b/vendor/github.com/Sirupsen/logrus/.travis.yml
index ff23150d..dee4eb2c 100644
--- a/vendor/github.com/Sirupsen/logrus/.travis.yml
+++ b/vendor/github.com/Sirupsen/logrus/.travis.yml
@@ -3,6 +3,7 @@ go:
- 1.3
- 1.4
- 1.5
+ - 1.6
- tip
install:
- go get -t ./...
diff --git a/vendor/github.com/Sirupsen/logrus/CHANGELOG.md b/vendor/github.com/Sirupsen/logrus/CHANGELOG.md
index 9e9e6009..f2c2bc21 100644
--- a/vendor/github.com/Sirupsen/logrus/CHANGELOG.md
+++ b/vendor/github.com/Sirupsen/logrus/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 0.10.0
+
+* feature: Add a test hook (#180)
+* feature: `ParseLevel` is now case-insensitive (#326)
+* feature: `FieldLogger` interface that generalizes `Logger` and `Entry` (#308)
+* performance: avoid re-allocations on `WithFields` (#335)
+
# 0.9.0
* logrus/text_formatter: don't emit empty msg
diff --git a/vendor/github.com/Sirupsen/logrus/README.md b/vendor/github.com/Sirupsen/logrus/README.md
index f8720c9a..126cd1fc 100644
--- a/vendor/github.com/Sirupsen/logrus/README.md
+++ b/vendor/github.com/Sirupsen/logrus/README.md
@@ -1,4 +1,4 @@
-# Logrus .
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import (
+ "fmt"
+ "os"
+)
+
+var handlers = []func(){}
+
+func runHandler(handler func()) {
+ defer func() {
+ if err := recover(); err != nil {
+ fmt.Fprintln(os.Stderr, "Error: Logrus exit handler error:", err)
+ }
+ }()
+
+ handler()
+}
+
+func runHandlers() {
+ for _, handler := range handlers {
+ runHandler(handler)
+ }
+}
+
+// Exit runs all the Logrus atexit handlers and then terminates the program using os.Exit(code)
+func Exit(code int) {
+ runHandlers()
+ os.Exit(code)
+}
+
+// RegisterExitHandler adds a Logrus Exit handler, call logrus.Exit to invoke
+// all handlers. The handlers will also be invoked when any Fatal log entry is
+// made.
+//
+// This method is useful when a caller wishes to use logrus to log a fatal
+// message but also needs to gracefully shutdown. An example usecase could be
+// closing database connections, or sending a alert that the application is
+// closing.
+func RegisterExitHandler(handler func()) {
+ handlers = append(handlers, handler)
+}
diff --git a/vendor/github.com/Sirupsen/logrus/entry.go b/vendor/github.com/Sirupsen/logrus/entry.go
index 9ae900bc..4edbe7a2 100644
--- a/vendor/github.com/Sirupsen/logrus/entry.go
+++ b/vendor/github.com/Sirupsen/logrus/entry.go
@@ -3,11 +3,21 @@ package logrus
import (
"bytes"
"fmt"
- "io"
"os"
+ "sync"
"time"
)
+var bufferPool *sync.Pool
+
+func init() {
+ bufferPool = &sync.Pool{
+ New: func() interface{} {
+ return new(bytes.Buffer)
+ },
+ }
+}
+
// Defines the key when adding errors using WithError.
var ErrorKey = "error"
@@ -29,6 +39,9 @@ type Entry struct {
// Message passed to Debug, Info, Warn, Error, Fatal or Panic
Message string
+
+ // When formatter is called in entry.log(), an Buffer may be set to entry
+ Buffer *bytes.Buffer
}
func NewEntry(logger *Logger) *Entry {
@@ -39,21 +52,15 @@ func NewEntry(logger *Logger) *Entry {
}
}
-// Returns a reader for the entry, which is a proxy to the formatter.
-func (entry *Entry) Reader() (*bytes.Buffer, error) {
- serialized, err := entry.Logger.Formatter.Format(entry)
- return bytes.NewBuffer(serialized), err
-}
-
// Returns the string representation from the reader and ultimately the
// formatter.
func (entry *Entry) String() (string, error) {
- reader, err := entry.Reader()
+ serialized, err := entry.Logger.Formatter.Format(entry)
if err != nil {
return "", err
}
-
- return reader.String(), err
+ str := string(serialized)
+ return str, nil
}
// Add an error as single field (using the key defined in ErrorKey) to the Entry.
@@ -68,7 +75,7 @@ func (entry *Entry) WithField(key string, value interface{}) *Entry {
// Add a map of fields to the Entry.
func (entry *Entry) WithFields(fields Fields) *Entry {
- data := Fields{}
+ data := make(Fields, len(entry.Data)+len(fields))
for k, v := range entry.Data {
data[k] = v
}
@@ -81,6 +88,7 @@ func (entry *Entry) WithFields(fields Fields) *Entry {
// This function is not declared with a pointer value because otherwise
// race conditions will occur when using multiple goroutines
func (entry Entry) log(level Level, msg string) {
+ var buffer *bytes.Buffer
entry.Time = time.Now()
entry.Level = level
entry.Message = msg
@@ -90,20 +98,23 @@ func (entry Entry) log(level Level, msg string) {
fmt.Fprintf(os.Stderr, "Failed to fire hook: %v\n", err)
entry.Logger.mu.Unlock()
}
-
- reader, err := entry.Reader()
+ buffer = bufferPool.Get().(*bytes.Buffer)
+ buffer.Reset()
+ defer bufferPool.Put(buffer)
+ entry.Buffer = buffer
+ serialized, err := entry.Logger.Formatter.Format(&entry)
+ entry.Buffer = nil
if err != nil {
entry.Logger.mu.Lock()
fmt.Fprintf(os.Stderr, "Failed to obtain reader, %v\n", err)
entry.Logger.mu.Unlock()
- }
-
- entry.Logger.mu.Lock()
- defer entry.Logger.mu.Unlock()
-
- _, err = io.Copy(entry.Logger.Out, reader)
- if err != nil {
- fmt.Fprintf(os.Stderr, "Failed to write to log, %v\n", err)
+ } else {
+ entry.Logger.mu.Lock()
+ _, err = entry.Logger.Out.Write(serialized)
+ if err != nil {
+ fmt.Fprintf(os.Stderr, "Failed to write to log, %v\n", err)
+ }
+ entry.Logger.mu.Unlock()
}
// To avoid Entry#log() returning a value that only would make sense for
@@ -150,7 +161,7 @@ func (entry *Entry) Fatal(args ...interface{}) {
if entry.Logger.Level >= FatalLevel {
entry.log(FatalLevel, fmt.Sprint(args...))
}
- os.Exit(1)
+ Exit(1)
}
func (entry *Entry) Panic(args ...interface{}) {
@@ -198,7 +209,7 @@ func (entry *Entry) Fatalf(format string, args ...interface{}) {
if entry.Logger.Level >= FatalLevel {
entry.Fatal(fmt.Sprintf(format, args...))
}
- os.Exit(1)
+ Exit(1)
}
func (entry *Entry) Panicf(format string, args ...interface{}) {
@@ -245,7 +256,7 @@ func (entry *Entry) Fatalln(args ...interface{}) {
if entry.Logger.Level >= FatalLevel {
entry.Fatal(entry.sprintlnn(args...))
}
- os.Exit(1)
+ Exit(1)
}
func (entry *Entry) Panicln(args ...interface{}) {
diff --git a/vendor/github.com/Sirupsen/logrus/formatter.go b/vendor/github.com/Sirupsen/logrus/formatter.go
index 104d689f..b5fbe934 100644
--- a/vendor/github.com/Sirupsen/logrus/formatter.go
+++ b/vendor/github.com/Sirupsen/logrus/formatter.go
@@ -31,18 +31,15 @@ type Formatter interface {
// It's not exported because it's still using Data in an opinionated way. It's to
// avoid code duplication between the two default formatters.
func prefixFieldClashes(data Fields) {
- _, ok := data["time"]
- if ok {
- data["fields.time"] = data["time"]
+ if t, ok := data["time"]; ok {
+ data["fields.time"] = t
}
- _, ok = data["msg"]
- if ok {
- data["fields.msg"] = data["msg"]
+ if m, ok := data["msg"]; ok {
+ data["fields.msg"] = m
}
- _, ok = data["level"]
- if ok {
- data["fields.level"] = data["level"]
+ if l, ok := data["level"]; ok {
+ data["fields.level"] = l
}
}
diff --git a/vendor/github.com/Sirupsen/logrus/logger.go b/vendor/github.com/Sirupsen/logrus/logger.go
index 2fdb2317..b769f3d3 100644
--- a/vendor/github.com/Sirupsen/logrus/logger.go
+++ b/vendor/github.com/Sirupsen/logrus/logger.go
@@ -26,8 +26,31 @@ type Logger struct {
// to) `logrus.Info`, which allows Info(), Warn(), Error() and Fatal() to be
// logged. `logrus.Debug` is useful in
Level Level
- // Used to sync writing to the log.
- mu sync.Mutex
+ // Used to sync writing to the log. Locking is enabled by Default
+ mu MutexWrap
+ // Reusable empty entry
+ entryPool sync.Pool
+}
+
+type MutexWrap struct {
+ lock sync.Mutex
+ disabled bool
+}
+
+func (mw *MutexWrap) Lock() {
+ if !mw.disabled {
+ mw.lock.Lock()
+ }
+}
+
+func (mw *MutexWrap) Unlock() {
+ if !mw.disabled {
+ mw.lock.Unlock()
+ }
+}
+
+func (mw *MutexWrap) Disable() {
+ mw.disabled = true
}
// Creates a new logger. Configuration should be set by changing `Formatter`,
@@ -51,162 +74,235 @@ func New() *Logger {
}
}
-// Adds a field to the log entry, note that you it doesn't log until you call
+func (logger *Logger) newEntry() *Entry {
+ entry, ok := logger.entryPool.Get().(*Entry)
+ if ok {
+ return entry
+ }
+ return NewEntry(logger)
+}
+
+func (logger *Logger) releaseEntry(entry *Entry) {
+ logger.entryPool.Put(entry)
+}
+
+// Adds a field to the log entry, note that it doesn't log until you call
// Debug, Print, Info, Warn, Fatal or Panic. It only creates a log entry.
// If you want multiple fields, use `WithFields`.
func (logger *Logger) WithField(key string, value interface{}) *Entry {
- return NewEntry(logger).WithField(key, value)
+ entry := logger.newEntry()
+ defer logger.releaseEntry(entry)
+ return entry.WithField(key, value)
}
// Adds a struct of fields to the log entry. All it does is call `WithField` for
// each `Field`.
func (logger *Logger) WithFields(fields Fields) *Entry {
- return NewEntry(logger).WithFields(fields)
+ entry := logger.newEntry()
+ defer logger.releaseEntry(entry)
+ return entry.WithFields(fields)
}
// Add an error as single field to the log entry. All it does is call
// `WithError` for the given `error`.
func (logger *Logger) WithError(err error) *Entry {
- return NewEntry(logger).WithError(err)
+ entry := logger.newEntry()
+ defer logger.releaseEntry(entry)
+ return entry.WithError(err)
}
func (logger *Logger) Debugf(format string, args ...interface{}) {
if logger.Level >= DebugLevel {
- NewEntry(logger).Debugf(format, args...)
+ entry := logger.newEntry()
+ entry.Debugf(format, args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Infof(format string, args ...interface{}) {
if logger.Level >= InfoLevel {
- NewEntry(logger).Infof(format, args...)
+ entry := logger.newEntry()
+ entry.Infof(format, args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Printf(format string, args ...interface{}) {
- NewEntry(logger).Printf(format, args...)
+ entry := logger.newEntry()
+ entry.Printf(format, args...)
+ logger.releaseEntry(entry)
}
func (logger *Logger) Warnf(format string, args ...interface{}) {
if logger.Level >= WarnLevel {
- NewEntry(logger).Warnf(format, args...)
+ entry := logger.newEntry()
+ entry.Warnf(format, args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Warningf(format string, args ...interface{}) {
if logger.Level >= WarnLevel {
- NewEntry(logger).Warnf(format, args...)
+ entry := logger.newEntry()
+ entry.Warnf(format, args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Errorf(format string, args ...interface{}) {
if logger.Level >= ErrorLevel {
- NewEntry(logger).Errorf(format, args...)
+ entry := logger.newEntry()
+ entry.Errorf(format, args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Fatalf(format string, args ...interface{}) {
if logger.Level >= FatalLevel {
- NewEntry(logger).Fatalf(format, args...)
+ entry := logger.newEntry()
+ entry.Fatalf(format, args...)
+ logger.releaseEntry(entry)
}
- os.Exit(1)
+ Exit(1)
}
func (logger *Logger) Panicf(format string, args ...interface{}) {
if logger.Level >= PanicLevel {
- NewEntry(logger).Panicf(format, args...)
+ entry := logger.newEntry()
+ entry.Panicf(format, args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Debug(args ...interface{}) {
if logger.Level >= DebugLevel {
- NewEntry(logger).Debug(args...)
+ entry := logger.newEntry()
+ entry.Debug(args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Info(args ...interface{}) {
if logger.Level >= InfoLevel {
- NewEntry(logger).Info(args...)
+ entry := logger.newEntry()
+ entry.Info(args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Print(args ...interface{}) {
- NewEntry(logger).Info(args...)
+ entry := logger.newEntry()
+ entry.Info(args...)
+ logger.releaseEntry(entry)
}
func (logger *Logger) Warn(args ...interface{}) {
if logger.Level >= WarnLevel {
- NewEntry(logger).Warn(args...)
+ entry := logger.newEntry()
+ entry.Warn(args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Warning(args ...interface{}) {
if logger.Level >= WarnLevel {
- NewEntry(logger).Warn(args...)
+ entry := logger.newEntry()
+ entry.Warn(args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Error(args ...interface{}) {
if logger.Level >= ErrorLevel {
- NewEntry(logger).Error(args...)
+ entry := logger.newEntry()
+ entry.Error(args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Fatal(args ...interface{}) {
if logger.Level >= FatalLevel {
- NewEntry(logger).Fatal(args...)
+ entry := logger.newEntry()
+ entry.Fatal(args...)
+ logger.releaseEntry(entry)
}
- os.Exit(1)
+ Exit(1)
}
func (logger *Logger) Panic(args ...interface{}) {
if logger.Level >= PanicLevel {
- NewEntry(logger).Panic(args...)
+ entry := logger.newEntry()
+ entry.Panic(args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Debugln(args ...interface{}) {
if logger.Level >= DebugLevel {
- NewEntry(logger).Debugln(args...)
+ entry := logger.newEntry()
+ entry.Debugln(args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Infoln(args ...interface{}) {
if logger.Level >= InfoLevel {
- NewEntry(logger).Infoln(args...)
+ entry := logger.newEntry()
+ entry.Infoln(args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Println(args ...interface{}) {
- NewEntry(logger).Println(args...)
+ entry := logger.newEntry()
+ entry.Println(args...)
+ logger.releaseEntry(entry)
}
func (logger *Logger) Warnln(args ...interface{}) {
if logger.Level >= WarnLevel {
- NewEntry(logger).Warnln(args...)
+ entry := logger.newEntry()
+ entry.Warnln(args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Warningln(args ...interface{}) {
if logger.Level >= WarnLevel {
- NewEntry(logger).Warnln(args...)
+ entry := logger.newEntry()
+ entry.Warnln(args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Errorln(args ...interface{}) {
if logger.Level >= ErrorLevel {
- NewEntry(logger).Errorln(args...)
+ entry := logger.newEntry()
+ entry.Errorln(args...)
+ logger.releaseEntry(entry)
}
}
func (logger *Logger) Fatalln(args ...interface{}) {
if logger.Level >= FatalLevel {
- NewEntry(logger).Fatalln(args...)
+ entry := logger.newEntry()
+ entry.Fatalln(args...)
+ logger.releaseEntry(entry)
}
- os.Exit(1)
+ Exit(1)
}
func (logger *Logger) Panicln(args ...interface{}) {
if logger.Level >= PanicLevel {
- NewEntry(logger).Panicln(args...)
+ entry := logger.newEntry()
+ entry.Panicln(args...)
+ logger.releaseEntry(entry)
}
}
+
+//When file is opened with appending mode, it's safe to
+//write concurrently to a file (within 4k message on Linux).
+//In these cases user can choose to disable the lock.
+func (logger *Logger) SetNoLock() {
+ logger.mu.Disable()
+}
diff --git a/vendor/github.com/Sirupsen/logrus/logrus.go b/vendor/github.com/Sirupsen/logrus/logrus.go
index 0c09fbc2..e5966911 100644
--- a/vendor/github.com/Sirupsen/logrus/logrus.go
+++ b/vendor/github.com/Sirupsen/logrus/logrus.go
@@ -3,6 +3,7 @@ package logrus
import (
"fmt"
"log"
+ "strings"
)
// Fields type, used to pass to `WithFields`.
@@ -33,7 +34,7 @@ func (level Level) String() string {
// ParseLevel takes a string level and returns the Logrus log level constant.
func ParseLevel(lvl string) (Level, error) {
- switch lvl {
+ switch strings.ToLower(lvl) {
case "panic":
return PanicLevel, nil
case "fatal":
@@ -52,6 +53,16 @@ func ParseLevel(lvl string) (Level, error) {
return l, fmt.Errorf("not a valid logrus Level: %q", lvl)
}
+// A constant exposing all logging levels
+var AllLevels = []Level{
+ PanicLevel,
+ FatalLevel,
+ ErrorLevel,
+ WarnLevel,
+ InfoLevel,
+ DebugLevel,
+}
+
// These are the different logging levels. You can set the logging level to log
// on your instance of logger, obtained with `logrus.New()`.
const (
@@ -96,3 +107,37 @@ type StdLogger interface {
Panicf(string, ...interface{})
Panicln(...interface{})
}
+
+// The FieldLogger interface generalizes the Entry and Logger types
+type FieldLogger interface {
+ WithField(key string, value interface{}) *Entry
+ WithFields(fields Fields) *Entry
+ WithError(err error) *Entry
+
+ Debugf(format string, args ...interface{})
+ Infof(format string, args ...interface{})
+ Printf(format string, args ...interface{})
+ Warnf(format string, args ...interface{})
+ Warningf(format string, args ...interface{})
+ Errorf(format string, args ...interface{})
+ Fatalf(format string, args ...interface{})
+ Panicf(format string, args ...interface{})
+
+ Debug(args ...interface{})
+ Info(args ...interface{})
+ Print(args ...interface{})
+ Warn(args ...interface{})
+ Warning(args ...interface{})
+ Error(args ...interface{})
+ Fatal(args ...interface{})
+ Panic(args ...interface{})
+
+ Debugln(args ...interface{})
+ Infoln(args ...interface{})
+ Println(args ...interface{})
+ Warnln(args ...interface{})
+ Warningln(args ...interface{})
+ Errorln(args ...interface{})
+ Fatalln(args ...interface{})
+ Panicln(args ...interface{})
+}
diff --git a/vendor/github.com/Sirupsen/logrus/terminal_appengine.go b/vendor/github.com/Sirupsen/logrus/terminal_appengine.go
new file mode 100644
index 00000000..1960169e
--- /dev/null
+++ b/vendor/github.com/Sirupsen/logrus/terminal_appengine.go
@@ -0,0 +1,8 @@
+// +build appengine
+
+package logrus
+
+// IsTerminal returns true if stderr's file descriptor is a terminal.
+func IsTerminal() bool {
+ return true
+}
diff --git a/vendor/github.com/Sirupsen/logrus/terminal_bsd.go b/vendor/github.com/Sirupsen/logrus/terminal_bsd.go
index 71f8d67a..5f6be4d3 100644
--- a/vendor/github.com/Sirupsen/logrus/terminal_bsd.go
+++ b/vendor/github.com/Sirupsen/logrus/terminal_bsd.go
@@ -1,4 +1,5 @@
// +build darwin freebsd openbsd netbsd dragonfly
+// +build !appengine
package logrus
diff --git a/vendor/github.com/Sirupsen/logrus/terminal_linux.go b/vendor/github.com/Sirupsen/logrus/terminal_linux.go
index a2c0b40d..308160ca 100644
--- a/vendor/github.com/Sirupsen/logrus/terminal_linux.go
+++ b/vendor/github.com/Sirupsen/logrus/terminal_linux.go
@@ -3,6 +3,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+// +build !appengine
+
package logrus
import "syscall"
diff --git a/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go b/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go
index b343b3a3..329038f6 100644
--- a/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go
+++ b/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go
@@ -4,6 +4,7 @@
// license that can be found in the LICENSE file.
// +build linux darwin freebsd openbsd netbsd dragonfly
+// +build !appengine
package logrus
diff --git a/vendor/github.com/Sirupsen/logrus/terminal_solaris.go b/vendor/github.com/Sirupsen/logrus/terminal_solaris.go
index 3e70bf7b..a3c6f6e7 100644
--- a/vendor/github.com/Sirupsen/logrus/terminal_solaris.go
+++ b/vendor/github.com/Sirupsen/logrus/terminal_solaris.go
@@ -1,4 +1,4 @@
-// +build solaris
+// +build solaris,!appengine
package logrus
diff --git a/vendor/github.com/Sirupsen/logrus/terminal_windows.go b/vendor/github.com/Sirupsen/logrus/terminal_windows.go
index 0146845d..3727e8ad 100644
--- a/vendor/github.com/Sirupsen/logrus/terminal_windows.go
+++ b/vendor/github.com/Sirupsen/logrus/terminal_windows.go
@@ -3,7 +3,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// +build windows
+// +build windows,!appengine
package logrus
diff --git a/vendor/github.com/Sirupsen/logrus/text_formatter.go b/vendor/github.com/Sirupsen/logrus/text_formatter.go
index 06ef2023..9114b3ca 100644
--- a/vendor/github.com/Sirupsen/logrus/text_formatter.go
+++ b/vendor/github.com/Sirupsen/logrus/text_formatter.go
@@ -57,6 +57,7 @@ type TextFormatter struct {
}
func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
+ var b *bytes.Buffer
var keys []string = make([]string, 0, len(entry.Data))
for k := range entry.Data {
keys = append(keys, k)
@@ -65,8 +66,11 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
if !f.DisableSorting {
sort.Strings(keys)
}
-
- b := &bytes.Buffer{}
+ if entry.Buffer != nil {
+ b = entry.Buffer
+ } else {
+ b = &bytes.Buffer{}
+ }
prefixFieldClashes(entry.Data)
@@ -118,7 +122,8 @@ func (f *TextFormatter) printColored(b *bytes.Buffer, entry *Entry, keys []strin
}
for _, k := range keys {
v := entry.Data[k]
- fmt.Fprintf(b, " \x1b[%dm%s\x1b[0m=%+v", levelColor, k, v)
+ fmt.Fprintf(b, " \x1b[%dm%s\x1b[0m=", levelColor, k)
+ f.appendValue(b, v)
}
}
@@ -128,34 +133,36 @@ func needsQuoting(text string) bool {
(ch >= 'A' && ch <= 'Z') ||
(ch >= '0' && ch <= '9') ||
ch == '-' || ch == '.') {
- return false
+ return true
}
}
- return true
+ return false
}
func (f *TextFormatter) appendKeyValue(b *bytes.Buffer, key string, value interface{}) {
b.WriteString(key)
b.WriteByte('=')
+ f.appendValue(b, value)
+ b.WriteByte(' ')
+}
+func (f *TextFormatter) appendValue(b *bytes.Buffer, value interface{}) {
switch value := value.(type) {
case string:
- if needsQuoting(value) {
+ if !needsQuoting(value) {
b.WriteString(value)
} else {
fmt.Fprintf(b, "%q", value)
}
case error:
errmsg := value.Error()
- if needsQuoting(errmsg) {
+ if !needsQuoting(errmsg) {
b.WriteString(errmsg)
} else {
- fmt.Fprintf(b, "%q", value)
+ fmt.Fprintf(b, "%q", errmsg)
}
default:
fmt.Fprint(b, value)
}
-
- b.WriteByte(' ')
}
diff --git a/vendor/github.com/Sirupsen/logrus/writer.go b/vendor/github.com/Sirupsen/logrus/writer.go
index 1e30b1c7..f74d2aa5 100644
--- a/vendor/github.com/Sirupsen/logrus/writer.go
+++ b/vendor/github.com/Sirupsen/logrus/writer.go
@@ -7,18 +7,40 @@ import (
)
func (logger *Logger) Writer() *io.PipeWriter {
+ return logger.WriterLevel(InfoLevel)
+}
+
+func (logger *Logger) WriterLevel(level Level) *io.PipeWriter {
reader, writer := io.Pipe()
- go logger.writerScanner(reader)
+ var printFunc func(args ...interface{})
+ switch level {
+ case DebugLevel:
+ printFunc = logger.Debug
+ case InfoLevel:
+ printFunc = logger.Info
+ case WarnLevel:
+ printFunc = logger.Warn
+ case ErrorLevel:
+ printFunc = logger.Error
+ case FatalLevel:
+ printFunc = logger.Fatal
+ case PanicLevel:
+ printFunc = logger.Panic
+ default:
+ printFunc = logger.Print
+ }
+
+ go logger.writerScanner(reader, printFunc)
runtime.SetFinalizer(writer, writerFinalizer)
return writer
}
-func (logger *Logger) writerScanner(reader *io.PipeReader) {
+func (logger *Logger) writerScanner(reader *io.PipeReader, printFunc func(args ...interface{})) {
scanner := bufio.NewScanner(reader)
for scanner.Scan() {
- logger.Print(scanner.Text())
+ printFunc(scanner.Text())
}
if err := scanner.Err(); err != nil {
logger.Errorf("Error while reading from Writer: %s", err)
diff --git a/vendor/github.com/docker/libcompose/cli/command/command.go b/vendor/github.com/docker/libcompose/cli/command/command.go
deleted file mode 100644
index a4ccff08..00000000
--- a/vendor/github.com/docker/libcompose/cli/command/command.go
+++ /dev/null
@@ -1,336 +0,0 @@
-package command
-
-import (
- "github.com/codegangsta/cli"
- "github.com/docker/libcompose/cli/app"
-)
-
-// CreateCommand defines the libcompose create subcommand.
-func CreateCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "create",
- Usage: "Create all services but do not start",
- Action: app.WithProject(factory, app.ProjectCreate),
- Flags: []cli.Flag{
- cli.BoolFlag{
- Name: "no-recreate",
- Usage: "If containers already exist, don't recreate them. Incompatible with --force-recreate.",
- },
- cli.BoolFlag{
- Name: "force-recreate",
- Usage: "Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.",
- },
- cli.BoolFlag{
- Name: "no-build",
- Usage: "Don't build an image, even if it's missing.",
- },
- },
- }
-}
-
-// BuildCommand defines the libcompose build subcommand.
-func BuildCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "build",
- Usage: "Build or rebuild services.",
- Action: app.WithProject(factory, app.ProjectBuild),
- Flags: []cli.Flag{
- cli.BoolFlag{
- Name: "no-cache",
- Usage: "Do not use cache when building the image",
- },
- cli.BoolFlag{
- Name: "force-rm",
- Usage: "Always remove intermediate containers",
- },
- cli.BoolFlag{
- Name: "pull",
- Usage: "Always attempt to pull a newer version of the image",
- },
- },
- }
-}
-
-// PsCommand defines the libcompose ps subcommand.
-func PsCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "ps",
- Usage: "List containers",
- Action: app.WithProject(factory, app.ProjectPs),
- Flags: []cli.Flag{
- cli.BoolFlag{
- Name: "q",
- Usage: "Only display IDs",
- },
- },
- }
-}
-
-// PortCommand defines the libcompose port subcommand.
-func PortCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "port",
- Usage: "Print the public port for a port binding",
- Action: app.WithProject(factory, app.ProjectPort),
- Flags: []cli.Flag{
- cli.StringFlag{
- Name: "protocol",
- Usage: "tcp or udp ",
- Value: "tcp",
- },
- cli.IntFlag{
- Name: "index",
- Usage: "index of the container if there are multiple instances of a service",
- Value: 1,
- },
- },
- }
-}
-
-// UpCommand defines the libcompose up subcommand.
-func UpCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "up",
- Usage: "Bring all services up",
- Action: app.WithProject(factory, app.ProjectUp),
- Flags: []cli.Flag{
- cli.BoolFlag{
- Name: "d",
- Usage: "Do not block and log",
- },
- cli.BoolFlag{
- Name: "no-build",
- Usage: "Don't build an image, even if it's missing.",
- },
- cli.BoolFlag{
- Name: "no-recreate",
- Usage: "If containers already exist, don't recreate them. Incompatible with --force-recreate.",
- },
- cli.BoolFlag{
- Name: "force-recreate",
- Usage: "Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.",
- },
- },
- }
-}
-
-// StartCommand defines the libcompose start subcommand.
-func StartCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "start",
- Usage: "Start services",
- Action: app.WithProject(factory, app.ProjectStart),
- Flags: []cli.Flag{
- cli.BoolTFlag{
- Name: "d",
- Usage: "Do not block and log",
- },
- },
- }
-}
-
-// RunCommand defines the libcompose run subcommand.
-func RunCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "run",
- Usage: "Run a one-off command",
- Action: app.WithProject(factory, app.ProjectRun),
- Flags: []cli.Flag{},
- }
-}
-
-// PullCommand defines the libcompose pull subcommand.
-func PullCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "pull",
- Usage: "Pulls images for services",
- Action: app.WithProject(factory, app.ProjectPull),
- Flags: []cli.Flag{
- cli.BoolFlag{
- Name: "ignore-pull-failures",
- Usage: "Pull what it can and ignores images with pull failures.",
- },
- },
- }
-}
-
-// LogsCommand defines the libcompose logs subcommand.
-func LogsCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "logs",
- Usage: "Get service logs",
- Action: app.WithProject(factory, app.ProjectLog),
- Flags: []cli.Flag{
- cli.IntFlag{
- Name: "lines",
- Usage: "number of lines to tail",
- Value: 100,
- },
- cli.BoolFlag{
- Name: "follow",
- Usage: "Follow log output.",
- },
- },
- }
-}
-
-// RestartCommand defines the libcompose restart subcommand.
-func RestartCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "restart",
- Usage: "Restart services",
- Action: app.WithProject(factory, app.ProjectRestart),
- Flags: []cli.Flag{
- cli.IntFlag{
- Name: "timeout,t",
- Usage: "Specify a shutdown timeout in seconds.",
- Value: 10,
- },
- },
- }
-}
-
-// StopCommand defines the libcompose stop subcommand.
-func StopCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "stop",
- Usage: "Stop services",
- Action: app.WithProject(factory, app.ProjectStop),
- Flags: []cli.Flag{
- cli.IntFlag{
- Name: "timeout,t",
- Usage: "Specify a shutdown timeout in seconds.",
- Value: 10,
- },
- },
- }
-}
-
-// DownCommand defines the libcompose stop subcommand.
-func DownCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "down",
- Usage: "Stop and remove containers, networks, images, and volumes",
- Action: app.WithProject(factory, app.ProjectDown),
- Flags: []cli.Flag{
- cli.BoolFlag{
- Name: "volumes,v",
- Usage: "Remove data volumes",
- },
- cli.StringFlag{
- Name: "rmi",
- Usage: "Remove images, type may be one of: 'all' to remove all images, or 'local' to remove only images that don't have an custom name set by the `image` field",
- },
- cli.BoolFlag{
- Name: "remove-orphans",
- Usage: "Remove containers for services not defined in the Compose file",
- },
- },
- }
-}
-
-// ScaleCommand defines the libcompose scale subcommand.
-func ScaleCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "scale",
- Usage: "Scale services",
- Action: app.WithProject(factory, app.ProjectScale),
- Flags: []cli.Flag{
- cli.IntFlag{
- Name: "timeout,t",
- Usage: "Specify a shutdown timeout in seconds.",
- Value: 10,
- },
- },
- }
-}
-
-// RmCommand defines the libcompose rm subcommand.
-func RmCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "rm",
- Usage: "Delete services",
- Action: app.WithProject(factory, app.ProjectDelete),
- Flags: []cli.Flag{
- cli.BoolFlag{
- Name: "force,f",
- Usage: "Allow deletion of all services",
- },
- cli.BoolFlag{
- Name: "v",
- Usage: "Remove volumes associated with containers",
- },
- },
- }
-}
-
-// KillCommand defines the libcompose kill subcommand.
-func KillCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "kill",
- Usage: "Force stop service containers",
- Action: app.WithProject(factory, app.ProjectKill),
- Flags: []cli.Flag{
- cli.StringFlag{
- Name: "signal,s",
- Usage: "SIGNAL to send to the container",
- Value: "SIGKILL",
- },
- },
- }
-}
-
-// PauseCommand defines the libcompose pause subcommand.
-func PauseCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "pause",
- Usage: "Pause services.",
- // ArgsUsage: "[SERVICE...]",
- Action: app.WithProject(factory, app.ProjectPause),
- }
-}
-
-// UnpauseCommand defines the libcompose unpause subcommand.
-func UnpauseCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "unpause",
- Usage: "Unpause services.",
- // ArgsUsage: "[SERVICE...]",
- Action: app.WithProject(factory, app.ProjectUnpause),
- }
-}
-
-// VersionCommand defines the libcompose version subcommand.
-func VersionCommand(factory app.ProjectFactory) cli.Command {
- return cli.Command{
- Name: "version",
- Usage: "Show version informations",
- Action: app.Version,
- Flags: []cli.Flag{
- cli.BoolFlag{
- Name: "short",
- Usage: "Shows only Compose's version number.",
- },
- },
- }
-}
-
-// CommonFlags defines the flags that are in common for all subcommands.
-func CommonFlags() []cli.Flag {
- return []cli.Flag{
- cli.BoolFlag{
- Name: "verbose,debug",
- },
- cli.StringSliceFlag{
- Name: "file,f",
- Usage: "Specify one or more alternate compose files (default: docker-compose.yml)",
- Value: &cli.StringSlice{},
- EnvVar: "COMPOSE_FILE",
- },
- cli.StringFlag{
- Name: "project-name,p",
- Usage: "Specify an alternate project name (default: directory name)",
- EnvVar: "COMPOSE_PROJECT_NAME",
- },
- }
-}
diff --git a/vendor/github.com/docker/libcompose/cli/command/help.go b/vendor/github.com/docker/libcompose/cli/command/help.go
deleted file mode 100644
index 414b620d..00000000
--- a/vendor/github.com/docker/libcompose/cli/command/help.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package command
-
-import (
- "github.com/codegangsta/cli"
- "os"
- "path"
-)
-
-func init() {
- cli.AppHelpTemplate = `Usage: {{.Name}} {{if .Flags}}[OPTIONS] {{end}}COMMAND [arg...]
-
-{{.Usage}}
-
-Version: {{.Version}}{{if or .Author .Email}}
-
-Author:{{if .Author}}
- {{.Author}}{{if .Email}} - <{{.Email}}>{{end}}{{else}}
- {{.Email}}{{end}}{{end}}
-{{if .Flags}}
-Options:
- {{range .Flags}}{{.}}
- {{end}}{{end}}
-Commands:
- {{range .Commands}}{{.Name}}{{with .ShortName}}, {{.}}{{end}}{{ "\t" }}{{.Usage}}
- {{end}}
-Run '{{.Name}} COMMAND --help' for more information on a command.
-`
- cli.CommandHelpTemplate = `Usage: ` + path.Base(os.Args[0]) + ` {{.Name}}{{if .Flags}} [OPTIONS]
-
-{{.Usage}}
-
-Options:
- {{range .Flags}}{{.}}
- {{end}}{{end}}
-`
-
-}
diff --git a/vendor/github.com/rancher/docker-from-scratch/.dockerignore b/vendor/github.com/rancher/docker-from-scratch/.dockerignore
deleted file mode 100644
index d2efabbc..00000000
--- a/vendor/github.com/rancher/docker-from-scratch/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-base-image
-assets
-.vendor
diff --git a/vendor/github.com/rancher/docker-from-scratch/.drone.yml b/vendor/github.com/rancher/docker-from-scratch/.drone.yml
deleted file mode 100644
index 4cf357c3..00000000
--- a/vendor/github.com/rancher/docker-from-scratch/.drone.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-build:
- image: rancher/dapper:1.10.3
- volumes:
- - /var/run/docker.sock:/var/run/docker.sock
- commands:
- - dapper ./scripts/ci
diff --git a/vendor/github.com/rancher/docker-from-scratch/.gitignore b/vendor/github.com/rancher/docker-from-scratch/.gitignore
deleted file mode 100644
index 423f38d6..00000000
--- a/vendor/github.com/rancher/docker-from-scratch/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/dist
-/build
-/assets
-/base-image/assets/
-/base-image/build/
-/base-image/cache/
-/base-image/dist/
-/.vendor
diff --git a/vendor/github.com/rancher/docker-from-scratch/.wrap-docker-args b/vendor/github.com/rancher/docker-from-scratch/.wrap-docker-args
deleted file mode 100644
index 3c1a8ef1..00000000
--- a/vendor/github.com/rancher/docker-from-scratch/.wrap-docker-args
+++ /dev/null
@@ -1 +0,0 @@
---privileged
diff --git a/vendor/github.com/rancher/docker-from-scratch/Dockerfile b/vendor/github.com/rancher/docker-from-scratch/Dockerfile
deleted file mode 100644
index 37c56b45..00000000
--- a/vendor/github.com/rancher/docker-from-scratch/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM scratch
-ADD build/base-files.tar.gz /
-COPY build/ca-certificates.crt /usr/etc/ssl/certs/
-COPY build/dockerlaunch /usr/bin/
-COPY build/docker* /usr/bin/
-VOLUME /var/lib/docker
-ENTRYPOINT ["/usr/bin/dockerlaunch", "/usr/bin/docker"]
-CMD ["daemon", "-s", "overlay"]
diff --git a/vendor/github.com/rancher/docker-from-scratch/Dockerfile.dapper b/vendor/github.com/rancher/docker-from-scratch/Dockerfile.dapper
deleted file mode 100644
index ccd4a657..00000000
--- a/vendor/github.com/rancher/docker-from-scratch/Dockerfile.dapper
+++ /dev/null
@@ -1,41 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update && \
- apt-get -y install locales sudo vim less curl wget git rsync build-essential isolinux xorriso gccgo \
- libblkid-dev libmount-dev libselinux1-dev cpio genisoimage qemu-kvm python-pip ca-certificates pkg-config tox
-
-COPY ./scripts/install-libs.sh /tmp/
-RUN /tmp/install-libs.sh
-
-RUN wget -O - https://storage.googleapis.com/golang/go1.6.2.linux-amd64.tar.gz | tar -xz -C /usr/local
-RUN wget -O /usr/local/bin/docker -L https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 && \
- chmod +x /usr/local/bin/docker
-
-ENV PATH /usr/local/go/bin:$PATH
-RUN mkdir -p /go/src /go/bin && chmod -R 777 /go
-ENV GOPATH /go
-ENV PATH /go/bin:$PATH
-
-ENV DAPPER_SOURCE /go/src/github.com/rancher/docker-from-scratch
-ENV DAPPER_OUTPUT ""
-ENV DAPPER_DOCKER_SOCKET true
-ENV DAPPER_ENV NO_TEST ARCH
-
-RUN mkdir -p ${DAPPER_SOURCE}/assets && ln -s ${DAPPER_SOURCE} /source
-
-WORKDIR ${DAPPER_SOURCE}/assets
-
-RUN wget https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.4.0/base-files_amd64.tar.gz && \
- wget https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.4.0/base-files_arm.tar.gz && \
- wget https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.4.0/base-files_arm64.tar.gz
-
-ENV DOCKER_VERSION=1.11.2 DOCKER_PATCH_VERSION=v1.11.2-ros1
-ENV VERSION=v${DOCKER_VERSION}-2
-
-RUN wget -O docker-${DOCKER_VERSION}_amd64.tgz -L https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz && \
- wget -L https://github.com/rancher/docker/releases/download/${DOCKER_PATCH_VERSION}/docker-${DOCKER_VERSION}_arm.tgz && \
- wget -L https://github.com/rancher/docker/releases/download/${DOCKER_PATCH_VERSION}/docker-${DOCKER_VERSION}_arm64.tgz
-
-WORKDIR ${DAPPER_SOURCE}
-
-CMD ./scripts/ci
diff --git a/vendor/github.com/rancher/docker-from-scratch/LICENSE b/vendor/github.com/rancher/docker-from-scratch/LICENSE
deleted file mode 100644
index e454a525..00000000
--- a/vendor/github.com/rancher/docker-from-scratch/LICENSE
+++ /dev/null
@@ -1,178 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
diff --git a/vendor/github.com/rancher/docker-from-scratch/README.md b/vendor/github.com/rancher/docker-from-scratch/README.md
deleted file mode 100644
index c886d758..00000000
--- a/vendor/github.com/rancher/docker-from-scratch/README.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Docker `FROM scratch`
-
-Docker-in-Docker image based off of the empty image `scratch`. Only the bare minimum required files are included to make Docker run. This image weighs in around 25MB expanded.
-
-## Running
-
-### Overlay
-
-```bash
-# Daemon
-docker run --name daemon --privileged -d rancher/docker
-
-# Client
-docker exec -it daemon docker ps
-```
-
-### Aufs
-
-```bash
-# Daemon
-docker run --name daemon --privileged -d rancher/docker daemon -s aufs
-
-# Client
-docker exec -it daemon docker ps
-```
-
-## Embed in Custom Image
-
-Since docker-from-scratch doesn't assume a base Linux distro it can be easily copied into an other image to add Docker-in-Docker capabilities
-
-```bash
-docker export $(docker create rancher/docker) > files.tar
-
-cat > Dockerfile << EOF
-
-FROM ubuntu
-ADD files.tar /
-ENTRYPOINT ["/usr/bin/dockerlaunch", "/usr/bin/docker"]
-VOLUME /var/lib/docker
-CMD ["daemon", "-s", "overlay"]
-
-EOF
-
-docker build -t custom-dind .
-```
-
-## Graph Driver Compatibility
-
-This image is really designed to run with overlay. Aufs is known to work but other graph drivers may not work properly or be missing userspace programs needed.
-
-
-## Seriously, Why?
-
-This code and the supporting files were extracted out of RancherOS into a separate library and are still used by RancherOS. RancherOS runs Docker as the first process but before we can exec Docker we need to setup a minimal environment for Docker in which to run. Since RancherOS is executed by the kernel there is absolutely nothing setup in the system. At Rancher we wrote a small amount of code to setup all the required mounts and directories to launch Docker.
-
-We moved this code out into a separate project for two reasons. First was simply that we wanted to clean up and modularize the RancherOS code base. Second is that we wanted to demonstrate clearly what exactly Docker requires from the Linux user space. For the most part Docker requires the standard mounts (`/proc`, `/sys`, `/run`, `/var/run`, etc) and the cgroup mounts in `/sys/fs/cgroup` plus the following programs/files:
-
-
-```
-/etc/ssl/certs/ca-certificates.crt
-/usr/bin/modprobe
-/usr/bin/iptables
-/usr/bin/ssh
-/usr/bin/xz
-/usr/bin/git
-/usr/bin/ps
-/usr/libexec/git-core/git-clone
-/usr/libexec/git-core/git-submodule
-/usr/libexec/git-core/git-checkout
-```
-
-This list can be reduced to a bare minimum if you ignore certain features of Docker. A full description of why each program is needed is below.
-
-File | Description | Can it be ignored
------|-------------|------------------
-`/etc/ssl/certs/ca-certificates.crt` | Used as the CA roots to validate SSL connections | No
-`/usr/bin/modprobe` | Used to ensure that bridge, nf_nat, br_netfilter, aufs, or overlay modules are loaded. Additionally iptables loads kernel modules based on the configuration of the rules | Yes, just load the modules from the host that you will need.
-`/usr/bin/iptables` | Docker uses IPtables to setup networking | Yes, add `--iptables=false` to the `docker -d` command. Networking will have to be manually configured in this situation
-`/usr/bin/ssh`| Used by git to clone repos over SSH | Yes, don't use git based Docker builds
-`/usr/bin/xz` | Used to extract *legacy* Docker images that were compressed with xz | Yes, only use newer images. Most popular images are not based on xz
-`/usr/bin/git` | Used to do Docker builds from a git URL | Yes, don't use git based Docker builds
-`/usr/bin/ps` | `docker ps` uses the host `ps` to get information about the running process in a container | No
-`/usr/libexec/git-core/git-clone`| Used by git | Yes, don't use git based Docker builds
-`/usr/libexec/git-core/git-submodule`| Used by git | Yes, don't use git based Docker builds
-`/usr/libexec/git-core/git-checkout`| Used by git | Yes, don't use git based Docker builds
-
-## Custom Bridge Name
-
-If you want to run with a custom bridge name you must pass both `--bip` and `-b` as arguments. Normally this would be an error for Docker but in this situation the docker-from-scratch container will create the bridge device with the IP address specified and then old pass `-b` to Docker.
-
-# Troubleshooting
-
-## Zombies
-
-If you are running containers with `--pid=host` you can get zombies. When you launch docker-from-scratch just add `-e DOCKER_LAUNCH_REAP=true` as a parameter to the `docker run` command to fix this.
-
-## Weird module loading errors
-
-For various reasons Docker or iptables may try to load a kernel module. You can either manually load all the needed modules from the host or you can bind mount in the kernel modules by adding `-v /lib/modules/$(uname -r)/lib/modules/$(uname -r)` to your `docker run` command
-
-## Debug Logging
-
-To enable debug logging on the startup of docker-from-scrach just add `-e DOCKER_LAUNCH_DEBUG=true` to the `docker run` command. For example:
-
- docker run --name daemon --privileged -d -e DOCKER_LAUNCH_DEBUG=true rancher/docker
diff --git a/vendor/github.com/rancher/docker-from-scratch/build.sh b/vendor/github.com/rancher/docker-from-scratch/build.sh
deleted file mode 100755
index 8668d4ca..00000000
--- a/vendor/github.com/rancher/docker-from-scratch/build.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-cd $(dirname $0)
-rm -rf ./build
-
-export NO_TEST=true
-dapper ./scripts/ci
diff --git a/vendor/github.com/rancher/docker-from-scratch/selinux/selinux_linux.go b/vendor/github.com/rancher/docker-from-scratch/selinux/selinux_linux.go
deleted file mode 100644
index fe46d482..00000000
--- a/vendor/github.com/rancher/docker-from-scratch/selinux/selinux_linux.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package selinux
-
-// #cgo pkg-config: libselinux
-// #include
-import "C"
-
-func SetFileContext(path string, context string) (int, error) {
- ret, err := C.setfilecon(C.CString(path), C.CString(context))
- return int(ret), err
-}
diff --git a/vendor/github.com/rancher/docker-from-scratch/trash.yml b/vendor/github.com/rancher/docker-from-scratch/trash.yml
deleted file mode 100644
index 069be922..00000000
--- a/vendor/github.com/rancher/docker-from-scratch/trash.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-package: github.com/rancher/docker-from-scratch
-
-import:
-- package: github.com/Sirupsen/logrus
- version: 3cb248e9df77413d58a6330dde84236d04c197d5
-
-- package: github.com/docker/docker
- version: v1.9.1
- subpackages:
- - pkg/ioutils
- - pkg/mount
-
-- package: github.com/docker/libnetwork
- version: 077b0764e4926509c9e6213ae7b110de48494810
- subpackages:
- - resolvconf
-
-- package: github.com/j-keck/arping
- version: 4f4d2c8983a18e2c9c63a3f339bc9a998c4557bc
-
-- package: github.com/rancher/netconf
- version: bf95fd720be9de4f7aa3a4a529b70f2865dd0fc7
-
-- package: github.com/ryanuber/go-glob
- version: 0067a9abd927e50aed5190662702f81231413ae0
-
-- package: github.com/stretchr/testify
- version: a1f97990ddc16022ec7610326dd9bce31332c116
- subpackages:
- - assert
- - require
-
-- package: github.com/vishvananda/netlink
- version: edcd99c0881a4de0fdb3818af6b24f4ee6948464
-
-- package: github.com/flynn/go-shlex
- version: 3f9db97f856818214da2e1057f8ad84803971cff
diff --git a/vendor/github.com/rancher/docker-from-scratch/util/util.go b/vendor/github.com/rancher/docker-from-scratch/util/util.go
deleted file mode 100644
index a64c409b..00000000
--- a/vendor/github.com/rancher/docker-from-scratch/util/util.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package util
-
-import (
- "strings"
-)
-
-func GetValue(index int, args []string) string {
- val := args[index]
- parts := strings.SplitN(val, "=", 2)
- if len(parts) == 1 {
- if len(args) > index+1 {
- return args[index+1]
- } else {
- return ""
- }
- } else {
- return parts[1]
- }
-}
diff --git a/vendor/github.com/rancher/docker-from-scratch/util/util_linux.go b/vendor/github.com/rancher/docker-from-scratch/util/util_linux.go
deleted file mode 100644
index e33d458c..00000000
--- a/vendor/github.com/rancher/docker-from-scratch/util/util_linux.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// +build linux
-
-package util
-
-import (
- "os"
- "syscall"
-
- "github.com/docker/docker/pkg/mount"
-)
-
-func mountProc() error {
- if _, err := os.Stat("/proc/self/mountinfo"); os.IsNotExist(err) {
- if _, err := os.Stat("/proc"); os.IsNotExist(err) {
- if err = os.Mkdir("/proc", 0755); err != nil {
- return err
- }
- }
-
- if err := syscall.Mount("none", "/proc", "proc", 0, ""); err != nil {
- return err
- }
- }
-
- return nil
-}
-
-func Mount(device, directory, fsType, options string) error {
- if err := mountProc(); err != nil {
- return nil
- }
-
- if _, err := os.Stat(directory); os.IsNotExist(err) {
- err = os.MkdirAll(directory, 0755)
- if err != nil {
- return err
- }
- }
-
- return mount.Mount(device, directory, fsType, options)
-}
diff --git a/vendor/github.com/rancher/netconf/.gitignore b/vendor/github.com/rancher/netconf/.gitignore
deleted file mode 100644
index db0e9a4b..00000000
--- a/vendor/github.com/rancher/netconf/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/netconf
diff --git a/vendor/github.com/rancher/netconf/LICENSE b/vendor/github.com/rancher/netconf/LICENSE
deleted file mode 100644
index e454a525..00000000
--- a/vendor/github.com/rancher/netconf/LICENSE
+++ /dev/null
@@ -1,178 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
diff --git a/vendor/github.com/rancher/netconf/README.md b/vendor/github.com/rancher/netconf/README.md
deleted file mode 100644
index 8d676d34..00000000
--- a/vendor/github.com/rancher/netconf/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# RancherOS Netconf
-
-Simple wrapper around various netlink calls to configure networking
diff --git a/vendor/github.com/rancher/netconf/types.go b/vendor/github.com/rancher/netconf/types.go
deleted file mode 100644
index fa409bc1..00000000
--- a/vendor/github.com/rancher/netconf/types.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package netconf
-
-type NetworkConfig struct {
- PreCmds []string `yaml:"pre_cmds,omitempty"`
- Dns DnsConfig `yaml:"dns,omitempty"`
- Interfaces map[string]InterfaceConfig `yaml:"interfaces,omitempty"`
- PostCmds []string `yaml:"post_cmds,omitempty"`
- HttpProxy string `yaml:"http_proxy,omitempty"`
- HttpsProxy string `yaml:"https_proxy,omitempty"`
- NoProxy string `yaml:"no_proxy,omitempty"`
-}
-
-type InterfaceConfig struct {
- Match string `yaml:"match,omitempty"`
- DHCP bool `yaml:"dhcp,omitempty"`
- DHCPArgs string `yaml:"dhcp_args,omitempty"`
- Address string `yaml:"address,omitempty"`
- Addresses []string `yaml:"addresses,omitempty"`
- IPV4LL bool `yaml:"ipv4ll,omitempty"`
- Gateway string `yaml:"gateway,omitempty"`
- GatewayIpv6 string `yaml:"gateway_ipv6,omitempty"`
- MTU int `yaml:"mtu,omitempty"`
- Bridge string `yaml:"bridge,omitempty"`
- Bond string `yaml:"bond,omitempty"`
- BondOpts map[string]string `yaml:"bond_opts,omitempty"`
- PostUp []string `yaml:"post_up,omitempty"`
- PreUp []string `yaml:"pre_up,omitempty"`
- Vlans string `yaml:"vlans,omitempty"`
-}
-
-type DnsConfig struct {
- Nameservers []string `yaml:"nameservers,flow,omitempty"`
- Search []string `yaml:"search,flow,omitempty"`
-}
+ 
