Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Add support for client binary on upgrade - #242

Merged
tianon merged 5 commits into
boot2docker:masterfrom
nathanleclaire:upgrade_client_binary
Dec 16, 2014
Merged

Add support for client binary on upgrade#242
tianon merged 5 commits into
boot2docker:masterfrom
nathanleclaire:upgrade_client_binary

Conversation

@nathanleclaire

Copy link
Copy Markdown
Contributor

Went ahead and implemented this, looking for feedback, how do those file permissions look to you?

ping @SvenDowideit@tianon

@SvenDowideit

Copy link
Copy Markdown
Contributor

mmm, a couple of things to consider
It'd be nice to only download if the version is different from the one you have.

On Linux, this is dangerous - I install my docker using the debs - so there it should probably (also?) be optional

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

It'd be nice to only download if the version is different from the one you have.

Agreed, however I'm not sure what the best way to test this would be. Perhaps with the Github API?

On Linux, this is dangerous - I install my docker using the debs - so there it should probably (also?) be optional

Were you thinking this would be optional as a flag, or something that should prompt the user?

@SvenDowideit

Copy link
Copy Markdown
Contributor

yup, same GH api request as we make to get the iso version number (and we can amend that one to ask the VM what its version is too..)
I'd make it option based on a flag for now :)

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

OK, I have added the requested changes:

  • only download client binary if user's version lags behind latest (non-RC) tag
  • skip client binary upgrade on Linux unless user manually sets --clobber flag

PTAL @SvenDowideit and @tianon 👍

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Capitalise Docker or you'll make James cry.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

;_;

@SvenDowideit

Copy link
Copy Markdown
Contributor

neat - do you want to do the same for the boot2docker binary? >:}

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docker, and go on, tell them the version they have

@SvenDowideit

Copy link
Copy Markdown
Contributor

this would close boot2docker/osx-installer#63

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

neat - do you want to do the same for the boot2docker binary? >:}

Yes - perhaps in a separate PR - this would over-write the existing (running) executable with the latest release if it is behind? And it would continue to be part of upgrade command, correct?

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

OK @SvenDowideit I have implemented the additional feedback! Let me know if I missed anything. One thing I had thought of is - should we move existing docker binary to docker.bak or something instead of just steamrolling over it if there is a later version?

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this blank line here for?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an artifact from vim-go (run goimports on save hook).

@SvenDowideit

Copy link
Copy Markdown
Contributor

@nathanleclaire darn - i presume this got lost in the busyness?

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Yes - finishing it is relatively low hanging fruit but it's too late for this release I'm afraid :( (well, unless the b2d release goes later than the docker 1.3 release)

SvenDowideit pushed a commit to SvenDowideit/boot2docker-cli that referenced this pull request Nov 10, 2014
If mount fails, let's "modprobe" the partition type and try again
@nathanleclaire
nathanleclaireforce-pushed the upgrade_client_binary branch 2 times, most recently from e852ac8 to 46ea9a9CompareDecember 13, 2014 04:11
@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Implemented some new stuff (boot2docker-cli binary upgrade) and code review feedback. @SvenDowideit when you get back from vacation and @tianon PTAL

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the random blank line here? 😄

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

goimports as an editor hook >_>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this doesn't make sense as a goimports change. It's not "remote stuff" being pushed below, it's just other random stdlib imports.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must've accidentally added it - I'll fix

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very wishful thinking, and will likely be very wrong (especially since it doesn't even account for GOARM, let alone the actual ARM version of the current system). Please remove and add a default: case that returns an error like was mentioned above. 😉

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a side note, this is where using uname -m as a URL component completely breaks down. For example, on my Pogoplug, I get armv5tel, but armv5el is also very much a thing (ie, the bits after the number mark supported features).

@tianon

Copy link
Copy Markdown
Contributor

Lots of little nits, but overall I'm a fan. 👍

@SvenDowideit

Copy link
Copy Markdown
Contributor

I'm a big fan :)

`boot2docker upgrade` will support the Docker client binary,
boot2docker-cli binary, and boot2docker ISO now.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@nathanleclaire
nathanleclaireforce-pushed the upgrade_client_binary branch 2 times, most recently from 69e84dd to 11c898cCompareDecember 16, 2014 21:33
@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Nice revised with the feedback from review. @SvenDowideit@tianon PTAL

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Comment threadREADME.md Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add console here so we get nice highlights? 👼

ie:

$ command hereoutput here

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely!

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@tianon

Copy link
Copy Markdown
Contributor

LGTM

1 similar comment
@daghack

Copy link
Copy Markdown
Contributor

LGTM

tianon added a commit that referenced this pull request Dec 16, 2014
@tianon
tianon merged commit d2f3a3b into boot2docker:masterDec 16, 2014
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@nathanleclaire@SvenDowideit@tianon@daghack
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add support for client binary on upgrade by nathanleclaire · Pull Request #242 · boot2docker/boot2docker-cli · GitHub
Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Add support for client binary on upgrade - #242

Merged
tianon merged 5 commits into
boot2docker:masterfrom
nathanleclaire:upgrade_client_binary
Dec 16, 2014
Merged

Add support for client binary on upgrade#242
tianon merged 5 commits into
boot2docker:masterfrom
nathanleclaire:upgrade_client_binary

Conversation

@nathanleclaire

Copy link
Copy Markdown
Contributor

Went ahead and implemented this, looking for feedback, how do those file permissions look to you?

ping @SvenDowideit@tianon

@SvenDowideit

Copy link
Copy Markdown
Contributor

mmm, a couple of things to consider
It'd be nice to only download if the version is different from the one you have.

On Linux, this is dangerous - I install my docker using the debs - so there it should probably (also?) be optional

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

It'd be nice to only download if the version is different from the one you have.

Agreed, however I'm not sure what the best way to test this would be. Perhaps with the Github API?

On Linux, this is dangerous - I install my docker using the debs - so there it should probably (also?) be optional

Were you thinking this would be optional as a flag, or something that should prompt the user?

@SvenDowideit

Copy link
Copy Markdown
Contributor

yup, same GH api request as we make to get the iso version number (and we can amend that one to ask the VM what its version is too..)
I'd make it option based on a flag for now :)

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

OK, I have added the requested changes:

  • only download client binary if user's version lags behind latest (non-RC) tag
  • skip client binary upgrade on Linux unless user manually sets --clobber flag

PTAL @SvenDowideit and @tianon 👍

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Capitalise Docker or you'll make James cry.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

;_;

@SvenDowideit

Copy link
Copy Markdown
Contributor

neat - do you want to do the same for the boot2docker binary? >:}

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docker, and go on, tell them the version they have

@SvenDowideit

Copy link
Copy Markdown
Contributor

this would close boot2docker/osx-installer#63

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

neat - do you want to do the same for the boot2docker binary? >:}

Yes - perhaps in a separate PR - this would over-write the existing (running) executable with the latest release if it is behind? And it would continue to be part of upgrade command, correct?

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

OK @SvenDowideit I have implemented the additional feedback! Let me know if I missed anything. One thing I had thought of is - should we move existing docker binary to docker.bak or something instead of just steamrolling over it if there is a later version?

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this blank line here for?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an artifact from vim-go (run goimports on save hook).

@SvenDowideit

Copy link
Copy Markdown
Contributor

@nathanleclaire darn - i presume this got lost in the busyness?

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Yes - finishing it is relatively low hanging fruit but it's too late for this release I'm afraid :( (well, unless the b2d release goes later than the docker 1.3 release)

SvenDowideit pushed a commit to SvenDowideit/boot2docker-cli that referenced this pull request Nov 10, 2014
If mount fails, let's "modprobe" the partition type and try again
@nathanleclaire
nathanleclaireforce-pushed the upgrade_client_binary branch 2 times, most recently from e852ac8 to 46ea9a9CompareDecember 13, 2014 04:11
@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Implemented some new stuff (boot2docker-cli binary upgrade) and code review feedback. @SvenDowideit when you get back from vacation and @tianon PTAL

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the random blank line here? 😄

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

goimports as an editor hook >_>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this doesn't make sense as a goimports change. It's not "remote stuff" being pushed below, it's just other random stdlib imports.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must've accidentally added it - I'll fix

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very wishful thinking, and will likely be very wrong (especially since it doesn't even account for GOARM, let alone the actual ARM version of the current system). Please remove and add a default: case that returns an error like was mentioned above. 😉

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a side note, this is where using uname -m as a URL component completely breaks down. For example, on my Pogoplug, I get armv5tel, but armv5el is also very much a thing (ie, the bits after the number mark supported features).

@tianon

Copy link
Copy Markdown
Contributor

Lots of little nits, but overall I'm a fan. 👍

@SvenDowideit

Copy link
Copy Markdown
Contributor

I'm a big fan :)

`boot2docker upgrade` will support the Docker client binary,
boot2docker-cli binary, and boot2docker ISO now.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@nathanleclaire
nathanleclaireforce-pushed the upgrade_client_binary branch 2 times, most recently from 69e84dd to 11c898cCompareDecember 16, 2014 21:33
@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Nice revised with the feedback from review. @SvenDowideit@tianon PTAL

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Comment threadREADME.md Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add console here so we get nice highlights? 👼

ie:

$ command hereoutput here

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely!

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@tianon

Copy link
Copy Markdown
Contributor

LGTM

1 similar comment
@daghack

Copy link
Copy Markdown
Contributor

LGTM

tianon added a commit that referenced this pull request Dec 16, 2014
@tianon
tianon merged commit d2f3a3b into boot2docker:masterDec 16, 2014
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@nathanleclaire@SvenDowideit@tianon@daghack
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add support for client binary on upgrade by nathanleclaire · Pull Request #242 · boot2docker/boot2docker-cli · GitHub
Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Add support for client binary on upgrade - #242

Merged
tianon merged 5 commits into
boot2docker:masterfrom
nathanleclaire:upgrade_client_binary
Dec 16, 2014
Merged

Add support for client binary on upgrade#242
tianon merged 5 commits into
boot2docker:masterfrom
nathanleclaire:upgrade_client_binary

Conversation

@nathanleclaire

Copy link
Copy Markdown
Contributor

Went ahead and implemented this, looking for feedback, how do those file permissions look to you?

ping @SvenDowideit@tianon

@SvenDowideit

Copy link
Copy Markdown
Contributor

mmm, a couple of things to consider
It'd be nice to only download if the version is different from the one you have.

On Linux, this is dangerous - I install my docker using the debs - so there it should probably (also?) be optional

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

It'd be nice to only download if the version is different from the one you have.

Agreed, however I'm not sure what the best way to test this would be. Perhaps with the Github API?

On Linux, this is dangerous - I install my docker using the debs - so there it should probably (also?) be optional

Were you thinking this would be optional as a flag, or something that should prompt the user?

@SvenDowideit

Copy link
Copy Markdown
Contributor

yup, same GH api request as we make to get the iso version number (and we can amend that one to ask the VM what its version is too..)
I'd make it option based on a flag for now :)

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

OK, I have added the requested changes:

  • only download client binary if user's version lags behind latest (non-RC) tag
  • skip client binary upgrade on Linux unless user manually sets --clobber flag

PTAL @SvenDowideit and @tianon 👍

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Capitalise Docker or you'll make James cry.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

;_;

@SvenDowideit

Copy link
Copy Markdown
Contributor

neat - do you want to do the same for the boot2docker binary? >:}

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docker, and go on, tell them the version they have

@SvenDowideit

Copy link
Copy Markdown
Contributor

this would close boot2docker/osx-installer#63

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

neat - do you want to do the same for the boot2docker binary? >:}

Yes - perhaps in a separate PR - this would over-write the existing (running) executable with the latest release if it is behind? And it would continue to be part of upgrade command, correct?

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

OK @SvenDowideit I have implemented the additional feedback! Let me know if I missed anything. One thing I had thought of is - should we move existing docker binary to docker.bak or something instead of just steamrolling over it if there is a later version?

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this blank line here for?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an artifact from vim-go (run goimports on save hook).

@SvenDowideit

Copy link
Copy Markdown
Contributor

@nathanleclaire darn - i presume this got lost in the busyness?

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Yes - finishing it is relatively low hanging fruit but it's too late for this release I'm afraid :( (well, unless the b2d release goes later than the docker 1.3 release)

SvenDowideit pushed a commit to SvenDowideit/boot2docker-cli that referenced this pull request Nov 10, 2014
If mount fails, let's "modprobe" the partition type and try again
@nathanleclaire
nathanleclaireforce-pushed the upgrade_client_binary branch 2 times, most recently from e852ac8 to 46ea9a9CompareDecember 13, 2014 04:11
@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Implemented some new stuff (boot2docker-cli binary upgrade) and code review feedback. @SvenDowideit when you get back from vacation and @tianon PTAL

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the random blank line here? 😄

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

goimports as an editor hook >_>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this doesn't make sense as a goimports change. It's not "remote stuff" being pushed below, it's just other random stdlib imports.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must've accidentally added it - I'll fix

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very wishful thinking, and will likely be very wrong (especially since it doesn't even account for GOARM, let alone the actual ARM version of the current system). Please remove and add a default: case that returns an error like was mentioned above. 😉

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a side note, this is where using uname -m as a URL component completely breaks down. For example, on my Pogoplug, I get armv5tel, but armv5el is also very much a thing (ie, the bits after the number mark supported features).

@tianon

Copy link
Copy Markdown
Contributor

Lots of little nits, but overall I'm a fan. 👍

@SvenDowideit

Copy link
Copy Markdown
Contributor

I'm a big fan :)

`boot2docker upgrade` will support the Docker client binary,
boot2docker-cli binary, and boot2docker ISO now.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@nathanleclaire
nathanleclaireforce-pushed the upgrade_client_binary branch 2 times, most recently from 69e84dd to 11c898cCompareDecember 16, 2014 21:33
@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Nice revised with the feedback from review. @SvenDowideit@tianon PTAL

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Comment threadREADME.md Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add console here so we get nice highlights? 👼

ie:

$ command hereoutput here

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely!

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@tianon

Copy link
Copy Markdown
Contributor

LGTM

1 similar comment
@daghack

Copy link
Copy Markdown
Contributor

LGTM

tianon added a commit that referenced this pull request Dec 16, 2014
@tianon
tianon merged commit d2f3a3b into boot2docker:masterDec 16, 2014
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@nathanleclaire@SvenDowideit@tianon@daghack
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add support for client binary on upgrade by nathanleclaire · Pull Request #242 · boot2docker/boot2docker-cli · GitHub
Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Add support for client binary on upgrade - #242

Merged
tianon merged 5 commits into
boot2docker:masterfrom
nathanleclaire:upgrade_client_binary
Dec 16, 2014
Merged

Add support for client binary on upgrade#242
tianon merged 5 commits into
boot2docker:masterfrom
nathanleclaire:upgrade_client_binary

Conversation

@nathanleclaire

Copy link
Copy Markdown
Contributor

Went ahead and implemented this, looking for feedback, how do those file permissions look to you?

ping @SvenDowideit@tianon

@SvenDowideit

Copy link
Copy Markdown
Contributor

mmm, a couple of things to consider
It'd be nice to only download if the version is different from the one you have.

On Linux, this is dangerous - I install my docker using the debs - so there it should probably (also?) be optional

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

It'd be nice to only download if the version is different from the one you have.

Agreed, however I'm not sure what the best way to test this would be. Perhaps with the Github API?

On Linux, this is dangerous - I install my docker using the debs - so there it should probably (also?) be optional

Were you thinking this would be optional as a flag, or something that should prompt the user?

@SvenDowideit

Copy link
Copy Markdown
Contributor

yup, same GH api request as we make to get the iso version number (and we can amend that one to ask the VM what its version is too..)
I'd make it option based on a flag for now :)

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

OK, I have added the requested changes:

  • only download client binary if user's version lags behind latest (non-RC) tag
  • skip client binary upgrade on Linux unless user manually sets --clobber flag

PTAL @SvenDowideit and @tianon 👍

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Capitalise Docker or you'll make James cry.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

;_;

@SvenDowideit

Copy link
Copy Markdown
Contributor

neat - do you want to do the same for the boot2docker binary? >:}

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docker, and go on, tell them the version they have

@SvenDowideit

Copy link
Copy Markdown
Contributor

this would close boot2docker/osx-installer#63

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

neat - do you want to do the same for the boot2docker binary? >:}

Yes - perhaps in a separate PR - this would over-write the existing (running) executable with the latest release if it is behind? And it would continue to be part of upgrade command, correct?

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

OK @SvenDowideit I have implemented the additional feedback! Let me know if I missed anything. One thing I had thought of is - should we move existing docker binary to docker.bak or something instead of just steamrolling over it if there is a later version?

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this blank line here for?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an artifact from vim-go (run goimports on save hook).

@SvenDowideit

Copy link
Copy Markdown
Contributor

@nathanleclaire darn - i presume this got lost in the busyness?

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Yes - finishing it is relatively low hanging fruit but it's too late for this release I'm afraid :( (well, unless the b2d release goes later than the docker 1.3 release)

SvenDowideit pushed a commit to SvenDowideit/boot2docker-cli that referenced this pull request Nov 10, 2014
If mount fails, let's "modprobe" the partition type and try again
@nathanleclaire
nathanleclaireforce-pushed the upgrade_client_binary branch 2 times, most recently from e852ac8 to 46ea9a9CompareDecember 13, 2014 04:11
@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Implemented some new stuff (boot2docker-cli binary upgrade) and code review feedback. @SvenDowideit when you get back from vacation and @tianon PTAL

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the random blank line here? 😄

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

goimports as an editor hook >_>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this doesn't make sense as a goimports change. It's not "remote stuff" being pushed below, it's just other random stdlib imports.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must've accidentally added it - I'll fix

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very wishful thinking, and will likely be very wrong (especially since it doesn't even account for GOARM, let alone the actual ARM version of the current system). Please remove and add a default: case that returns an error like was mentioned above. 😉

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a side note, this is where using uname -m as a URL component completely breaks down. For example, on my Pogoplug, I get armv5tel, but armv5el is also very much a thing (ie, the bits after the number mark supported features).

@tianon

Copy link
Copy Markdown
Contributor

Lots of little nits, but overall I'm a fan. 👍

@SvenDowideit

Copy link
Copy Markdown
Contributor

I'm a big fan :)

`boot2docker upgrade` will support the Docker client binary,
boot2docker-cli binary, and boot2docker ISO now.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@nathanleclaire
nathanleclaireforce-pushed the upgrade_client_binary branch 2 times, most recently from 69e84dd to 11c898cCompareDecember 16, 2014 21:33
@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Nice revised with the feedback from review. @SvenDowideit@tianon PTAL

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Comment threadREADME.md Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add console here so we get nice highlights? 👼

ie:

$ command hereoutput here

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely!

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@tianon

Copy link
Copy Markdown
Contributor

LGTM

1 similar comment
@daghack

Copy link
Copy Markdown
Contributor

LGTM

tianon added a commit that referenced this pull request Dec 16, 2014
@tianon
tianon merged commit d2f3a3b into boot2docker:masterDec 16, 2014
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@nathanleclaire@SvenDowideit@tianon@daghack
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Add support for client binary on upgrade by nathanleclaire · Pull Request #242 · boot2docker/boot2docker-cli · GitHub
Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Add support for client binary on upgrade - #242

Merged
tianon merged 5 commits into
boot2docker:masterfrom
nathanleclaire:upgrade_client_binary
Dec 16, 2014
Merged

Add support for client binary on upgrade#242
tianon merged 5 commits into
boot2docker:masterfrom
nathanleclaire:upgrade_client_binary

Conversation

@nathanleclaire

Copy link
Copy Markdown
Contributor

Went ahead and implemented this, looking for feedback, how do those file permissions look to you?

ping @SvenDowideit@tianon

@SvenDowideit

Copy link
Copy Markdown
Contributor

mmm, a couple of things to consider
It'd be nice to only download if the version is different from the one you have.

On Linux, this is dangerous - I install my docker using the debs - so there it should probably (also?) be optional

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

It'd be nice to only download if the version is different from the one you have.

Agreed, however I'm not sure what the best way to test this would be. Perhaps with the Github API?

On Linux, this is dangerous - I install my docker using the debs - so there it should probably (also?) be optional

Were you thinking this would be optional as a flag, or something that should prompt the user?

@SvenDowideit

Copy link
Copy Markdown
Contributor

yup, same GH api request as we make to get the iso version number (and we can amend that one to ask the VM what its version is too..)
I'd make it option based on a flag for now :)

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

OK, I have added the requested changes:

  • only download client binary if user's version lags behind latest (non-RC) tag
  • skip client binary upgrade on Linux unless user manually sets --clobber flag

PTAL @SvenDowideit and @tianon 👍

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Capitalise Docker or you'll make James cry.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

;_;

@SvenDowideit

Copy link
Copy Markdown
Contributor

neat - do you want to do the same for the boot2docker binary? >:}

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docker, and go on, tell them the version they have

@SvenDowideit

Copy link
Copy Markdown
Contributor

this would close boot2docker/osx-installer#63

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

neat - do you want to do the same for the boot2docker binary? >:}

Yes - perhaps in a separate PR - this would over-write the existing (running) executable with the latest release if it is behind? And it would continue to be part of upgrade command, correct?

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

OK @SvenDowideit I have implemented the additional feedback! Let me know if I missed anything. One thing I had thought of is - should we move existing docker binary to docker.bak or something instead of just steamrolling over it if there is a later version?

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this blank line here for?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an artifact from vim-go (run goimports on save hook).

@SvenDowideit

Copy link
Copy Markdown
Contributor

@nathanleclaire darn - i presume this got lost in the busyness?

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Yes - finishing it is relatively low hanging fruit but it's too late for this release I'm afraid :( (well, unless the b2d release goes later than the docker 1.3 release)

SvenDowideit pushed a commit to SvenDowideit/boot2docker-cli that referenced this pull request Nov 10, 2014
If mount fails, let's "modprobe" the partition type and try again
@nathanleclaire
nathanleclaireforce-pushed the upgrade_client_binary branch 2 times, most recently from e852ac8 to 46ea9a9CompareDecember 13, 2014 04:11
@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Implemented some new stuff (boot2docker-cli binary upgrade) and code review feedback. @SvenDowideit when you get back from vacation and @tianon PTAL

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the random blank line here? 😄

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

goimports as an editor hook >_>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this doesn't make sense as a goimports change. It's not "remote stuff" being pushed below, it's just other random stdlib imports.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must've accidentally added it - I'll fix

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very wishful thinking, and will likely be very wrong (especially since it doesn't even account for GOARM, let alone the actual ARM version of the current system). Please remove and add a default: case that returns an error like was mentioned above. 😉

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a side note, this is where using uname -m as a URL component completely breaks down. For example, on my Pogoplug, I get armv5tel, but armv5el is also very much a thing (ie, the bits after the number mark supported features).

@tianon

Copy link
Copy Markdown
Contributor

Lots of little nits, but overall I'm a fan. 👍

@SvenDowideit

Copy link
Copy Markdown
Contributor

I'm a big fan :)

`boot2docker upgrade` will support the Docker client binary,
boot2docker-cli binary, and boot2docker ISO now.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@nathanleclaire
nathanleclaireforce-pushed the upgrade_client_binary branch 2 times, most recently from 69e84dd to 11c898cCompareDecember 16, 2014 21:33
@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Nice revised with the feedback from review. @SvenDowideit@tianon PTAL

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Comment threadREADME.md Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add console here so we get nice highlights? 👼

ie:

$ command hereoutput here

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely!

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@tianon

Copy link
Copy Markdown
Contributor

LGTM

1 similar comment
@daghack

Copy link
Copy Markdown
Contributor

LGTM

tianon added a commit that referenced this pull request Dec 16, 2014
@tianon
tianon merged commit d2f3a3b into boot2docker:masterDec 16, 2014
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@nathanleclaire@SvenDowideit@tianon@daghack
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add support for client binary on upgrade by nathanleclaire · Pull Request #242 · boot2docker/boot2docker-cli · GitHub
Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Add support for client binary on upgrade - #242

Merged
tianon merged 5 commits into
boot2docker:masterfrom
nathanleclaire:upgrade_client_binary
Dec 16, 2014
Merged

Add support for client binary on upgrade#242
tianon merged 5 commits into
boot2docker:masterfrom
nathanleclaire:upgrade_client_binary

Conversation

@nathanleclaire

Copy link
Copy Markdown
Contributor

Went ahead and implemented this, looking for feedback, how do those file permissions look to you?

ping @SvenDowideit@tianon

@SvenDowideit

Copy link
Copy Markdown
Contributor

mmm, a couple of things to consider
It'd be nice to only download if the version is different from the one you have.

On Linux, this is dangerous - I install my docker using the debs - so there it should probably (also?) be optional

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

It'd be nice to only download if the version is different from the one you have.

Agreed, however I'm not sure what the best way to test this would be. Perhaps with the Github API?

On Linux, this is dangerous - I install my docker using the debs - so there it should probably (also?) be optional

Were you thinking this would be optional as a flag, or something that should prompt the user?

@SvenDowideit

Copy link
Copy Markdown
Contributor

yup, same GH api request as we make to get the iso version number (and we can amend that one to ask the VM what its version is too..)
I'd make it option based on a flag for now :)

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

OK, I have added the requested changes:

  • only download client binary if user's version lags behind latest (non-RC) tag
  • skip client binary upgrade on Linux unless user manually sets --clobber flag

PTAL @SvenDowideit and @tianon 👍

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Capitalise Docker or you'll make James cry.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

;_;

@SvenDowideit

Copy link
Copy Markdown
Contributor

neat - do you want to do the same for the boot2docker binary? >:}

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docker, and go on, tell them the version they have

@SvenDowideit

Copy link
Copy Markdown
Contributor

this would close boot2docker/osx-installer#63

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

neat - do you want to do the same for the boot2docker binary? >:}

Yes - perhaps in a separate PR - this would over-write the existing (running) executable with the latest release if it is behind? And it would continue to be part of upgrade command, correct?

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

OK @SvenDowideit I have implemented the additional feedback! Let me know if I missed anything. One thing I had thought of is - should we move existing docker binary to docker.bak or something instead of just steamrolling over it if there is a later version?

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this blank line here for?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an artifact from vim-go (run goimports on save hook).

@SvenDowideit

Copy link
Copy Markdown
Contributor

@nathanleclaire darn - i presume this got lost in the busyness?

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Yes - finishing it is relatively low hanging fruit but it's too late for this release I'm afraid :( (well, unless the b2d release goes later than the docker 1.3 release)

SvenDowideit pushed a commit to SvenDowideit/boot2docker-cli that referenced this pull request Nov 10, 2014
If mount fails, let's "modprobe" the partition type and try again
@nathanleclaire
nathanleclaireforce-pushed the upgrade_client_binary branch 2 times, most recently from e852ac8 to 46ea9a9CompareDecember 13, 2014 04:11
@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Implemented some new stuff (boot2docker-cli binary upgrade) and code review feedback. @SvenDowideit when you get back from vacation and @tianon PTAL

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the random blank line here? 😄

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

goimports as an editor hook >_>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this doesn't make sense as a goimports change. It's not "remote stuff" being pushed below, it's just other random stdlib imports.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must've accidentally added it - I'll fix

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very wishful thinking, and will likely be very wrong (especially since it doesn't even account for GOARM, let alone the actual ARM version of the current system). Please remove and add a default: case that returns an error like was mentioned above. 😉

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a side note, this is where using uname -m as a URL component completely breaks down. For example, on my Pogoplug, I get armv5tel, but armv5el is also very much a thing (ie, the bits after the number mark supported features).

@tianon

Copy link
Copy Markdown
Contributor

Lots of little nits, but overall I'm a fan. 👍

@SvenDowideit

Copy link
Copy Markdown
Contributor

I'm a big fan :)

`boot2docker upgrade` will support the Docker client binary,
boot2docker-cli binary, and boot2docker ISO now.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@nathanleclaire
nathanleclaireforce-pushed the upgrade_client_binary branch 2 times, most recently from 69e84dd to 11c898cCompareDecember 16, 2014 21:33
@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Nice revised with the feedback from review. @SvenDowideit@tianon PTAL

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Comment threadREADME.md Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add console here so we get nice highlights? 👼

ie:

$ command hereoutput here

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely!

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@tianon

Copy link
Copy Markdown
Contributor

LGTM

1 similar comment
@daghack

Copy link
Copy Markdown
Contributor

LGTM

tianon added a commit that referenced this pull request Dec 16, 2014
@tianon
tianon merged commit d2f3a3b into boot2docker:masterDec 16, 2014
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@nathanleclaire@SvenDowideit@tianon@daghack
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add support for client binary on upgrade by nathanleclaire · Pull Request #242 · boot2docker/boot2docker-cli · GitHub
Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Add support for client binary on upgrade - #242

Merged
tianon merged 5 commits into
boot2docker:masterfrom
nathanleclaire:upgrade_client_binary
Dec 16, 2014
Merged

Add support for client binary on upgrade#242
tianon merged 5 commits into
boot2docker:masterfrom
nathanleclaire:upgrade_client_binary

Conversation

@nathanleclaire

Copy link
Copy Markdown
Contributor

Went ahead and implemented this, looking for feedback, how do those file permissions look to you?

ping @SvenDowideit@tianon

@SvenDowideit

Copy link
Copy Markdown
Contributor

mmm, a couple of things to consider
It'd be nice to only download if the version is different from the one you have.

On Linux, this is dangerous - I install my docker using the debs - so there it should probably (also?) be optional

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

It'd be nice to only download if the version is different from the one you have.

Agreed, however I'm not sure what the best way to test this would be. Perhaps with the Github API?

On Linux, this is dangerous - I install my docker using the debs - so there it should probably (also?) be optional

Were you thinking this would be optional as a flag, or something that should prompt the user?

@SvenDowideit

Copy link
Copy Markdown
Contributor

yup, same GH api request as we make to get the iso version number (and we can amend that one to ask the VM what its version is too..)
I'd make it option based on a flag for now :)

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

OK, I have added the requested changes:

  • only download client binary if user's version lags behind latest (non-RC) tag
  • skip client binary upgrade on Linux unless user manually sets --clobber flag

PTAL @SvenDowideit and @tianon 👍

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Capitalise Docker or you'll make James cry.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

;_;

@SvenDowideit

Copy link
Copy Markdown
Contributor

neat - do you want to do the same for the boot2docker binary? >:}

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docker, and go on, tell them the version they have

@SvenDowideit

Copy link
Copy Markdown
Contributor

this would close boot2docker/osx-installer#63

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

neat - do you want to do the same for the boot2docker binary? >:}

Yes - perhaps in a separate PR - this would over-write the existing (running) executable with the latest release if it is behind? And it would continue to be part of upgrade command, correct?

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

OK @SvenDowideit I have implemented the additional feedback! Let me know if I missed anything. One thing I had thought of is - should we move existing docker binary to docker.bak or something instead of just steamrolling over it if there is a later version?

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this blank line here for?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an artifact from vim-go (run goimports on save hook).

@SvenDowideit

Copy link
Copy Markdown
Contributor

@nathanleclaire darn - i presume this got lost in the busyness?

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Yes - finishing it is relatively low hanging fruit but it's too late for this release I'm afraid :( (well, unless the b2d release goes later than the docker 1.3 release)

SvenDowideit pushed a commit to SvenDowideit/boot2docker-cli that referenced this pull request Nov 10, 2014
If mount fails, let's "modprobe" the partition type and try again
@nathanleclaire
nathanleclaireforce-pushed the upgrade_client_binary branch 2 times, most recently from e852ac8 to 46ea9a9CompareDecember 13, 2014 04:11
@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Implemented some new stuff (boot2docker-cli binary upgrade) and code review feedback. @SvenDowideit when you get back from vacation and @tianon PTAL

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the random blank line here? 😄

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

goimports as an editor hook >_>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this doesn't make sense as a goimports change. It's not "remote stuff" being pushed below, it's just other random stdlib imports.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must've accidentally added it - I'll fix

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very wishful thinking, and will likely be very wrong (especially since it doesn't even account for GOARM, let alone the actual ARM version of the current system). Please remove and add a default: case that returns an error like was mentioned above. 😉

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a side note, this is where using uname -m as a URL component completely breaks down. For example, on my Pogoplug, I get armv5tel, but armv5el is also very much a thing (ie, the bits after the number mark supported features).

@tianon

Copy link
Copy Markdown
Contributor

Lots of little nits, but overall I'm a fan. 👍

@SvenDowideit

Copy link
Copy Markdown
Contributor

I'm a big fan :)

`boot2docker upgrade` will support the Docker client binary,
boot2docker-cli binary, and boot2docker ISO now.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@nathanleclaire
nathanleclaireforce-pushed the upgrade_client_binary branch 2 times, most recently from 69e84dd to 11c898cCompareDecember 16, 2014 21:33
@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Nice revised with the feedback from review. @SvenDowideit@tianon PTAL

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Comment threadREADME.md Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add console here so we get nice highlights? 👼

ie:

$ command hereoutput here

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely!

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@tianon

Copy link
Copy Markdown
Contributor

LGTM

1 similar comment
@daghack

Copy link
Copy Markdown
Contributor

LGTM

tianon added a commit that referenced this pull request Dec 16, 2014
@tianon
tianon merged commit d2f3a3b into boot2docker:masterDec 16, 2014
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@nathanleclaire@SvenDowideit@tianon@daghack
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Add support for client binary on upgrade by nathanleclaire · Pull Request #242 · boot2docker/boot2docker-cli · GitHub
Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Add support for client binary on upgrade - #242

Merged
tianon merged 5 commits into
boot2docker:masterfrom
nathanleclaire:upgrade_client_binary
Dec 16, 2014
Merged

Add support for client binary on upgrade#242
tianon merged 5 commits into
boot2docker:masterfrom
nathanleclaire:upgrade_client_binary

Conversation

@nathanleclaire

Copy link
Copy Markdown
Contributor

Went ahead and implemented this, looking for feedback, how do those file permissions look to you?

ping @SvenDowideit@tianon

@SvenDowideit

Copy link
Copy Markdown
Contributor

mmm, a couple of things to consider
It'd be nice to only download if the version is different from the one you have.

On Linux, this is dangerous - I install my docker using the debs - so there it should probably (also?) be optional

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

It'd be nice to only download if the version is different from the one you have.

Agreed, however I'm not sure what the best way to test this would be. Perhaps with the Github API?

On Linux, this is dangerous - I install my docker using the debs - so there it should probably (also?) be optional

Were you thinking this would be optional as a flag, or something that should prompt the user?

@SvenDowideit

Copy link
Copy Markdown
Contributor

yup, same GH api request as we make to get the iso version number (and we can amend that one to ask the VM what its version is too..)
I'd make it option based on a flag for now :)

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

OK, I have added the requested changes:

  • only download client binary if user's version lags behind latest (non-RC) tag
  • skip client binary upgrade on Linux unless user manually sets --clobber flag

PTAL @SvenDowideit and @tianon 👍

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Capitalise Docker or you'll make James cry.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

;_;

@SvenDowideit

Copy link
Copy Markdown
Contributor

neat - do you want to do the same for the boot2docker binary? >:}

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docker, and go on, tell them the version they have

@SvenDowideit

Copy link
Copy Markdown
Contributor

this would close boot2docker/osx-installer#63

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

neat - do you want to do the same for the boot2docker binary? >:}

Yes - perhaps in a separate PR - this would over-write the existing (running) executable with the latest release if it is behind? And it would continue to be part of upgrade command, correct?

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

OK @SvenDowideit I have implemented the additional feedback! Let me know if I missed anything. One thing I had thought of is - should we move existing docker binary to docker.bak or something instead of just steamrolling over it if there is a later version?

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this blank line here for?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an artifact from vim-go (run goimports on save hook).

@SvenDowideit

Copy link
Copy Markdown
Contributor

@nathanleclaire darn - i presume this got lost in the busyness?

@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Yes - finishing it is relatively low hanging fruit but it's too late for this release I'm afraid :( (well, unless the b2d release goes later than the docker 1.3 release)

SvenDowideit pushed a commit to SvenDowideit/boot2docker-cli that referenced this pull request Nov 10, 2014
If mount fails, let's "modprobe" the partition type and try again
@nathanleclaire
nathanleclaireforce-pushed the upgrade_client_binary branch 2 times, most recently from e852ac8 to 46ea9a9CompareDecember 13, 2014 04:11
@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Implemented some new stuff (boot2docker-cli binary upgrade) and code review feedback. @SvenDowideit when you get back from vacation and @tianon PTAL

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the random blank line here? 😄

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

goimports as an editor hook >_>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this doesn't make sense as a goimports change. It's not "remote stuff" being pushed below, it's just other random stdlib imports.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must've accidentally added it - I'll fix

Comment threadcmds.go Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very wishful thinking, and will likely be very wrong (especially since it doesn't even account for GOARM, let alone the actual ARM version of the current system). Please remove and add a default: case that returns an error like was mentioned above. 😉

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a side note, this is where using uname -m as a URL component completely breaks down. For example, on my Pogoplug, I get armv5tel, but armv5el is also very much a thing (ie, the bits after the number mark supported features).

@tianon

Copy link
Copy Markdown
Contributor

Lots of little nits, but overall I'm a fan. 👍

@SvenDowideit

Copy link
Copy Markdown
Contributor

I'm a big fan :)

`boot2docker upgrade` will support the Docker client binary,
boot2docker-cli binary, and boot2docker ISO now.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@nathanleclaire
nathanleclaireforce-pushed the upgrade_client_binary branch 2 times, most recently from 69e84dd to 11c898cCompareDecember 16, 2014 21:33
@nathanleclaire

Copy link
Copy Markdown
ContributorAuthor

Nice revised with the feedback from review. @SvenDowideit@tianon PTAL

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Comment threadREADME.md Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add console here so we get nice highlights? 👼

ie:

$ command hereoutput here

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely!

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@tianon

Copy link
Copy Markdown
Contributor

LGTM

1 similar comment
@daghack

Copy link
Copy Markdown
Contributor

LGTM

tianon added a commit that referenced this pull request Dec 16, 2014
@tianon
tianon merged commit d2f3a3b into boot2docker:masterDec 16, 2014
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@nathanleclaire@SvenDowideit@tianon@daghack