Merge pull request #87 from coreos-inc/tutfix

Add to the login section of tutorial when encrypted passwords are required
This commit is contained in:
Jimmy Zelinskie 2015-06-04 13:42:24 -04:00
commit 973acddd59

View file

@ -1,6 +1,6 @@
<div class="container"> <div>
<div class="alert alert-info" style="padding: 4px;"> <div class="co-alert co-alert-info">
<div class="checkbox"> <div class="checkbox" style="margin: 0px;">
<input name="showSudo" type="checkbox" ng-model="tour.tourScope.showSudo" style="display: inline-block; margin-left: 10px; margin-right: 10px;"> <input name="showSudo" type="checkbox" ng-model="tour.tourScope.showSudo" style="display: inline-block; margin-left: 10px; margin-right: 10px;">
<label for="showSudo" style="padding-left: 30px;"> <label for="showSudo" style="padding-left: 30px;">
My OS requires me to run all <code>docker</code> commands with <code>sudo</code> My OS requires me to run all <code>docker</code> commands with <code>sudo</code>
@ -9,9 +9,16 @@
</div> </div>
<p>The first step when using <span class="registry-name"></span> is to login via the <code>docker login</code> command.</p> <p>The first step when using <span class="registry-name"></span> is to login via the <code>docker login</code> command.</p>
<p>Enter your <span class="registry-name"></span> username and your password when prompted.</p>
<p>Enter your <span class="registry-name"></span> username and your <strong quay-show="Features.REQUIRE_ENCRYPTED_BASIC_AUTH">encrypted</strong> password when prompted.</p>
<div quay-show="Features.REQUIRE_ENCRYPTED_BASIC_AUTH" class="co-alert co-alert-warning">
This installation requires encrypted passwords to be used on the Docker command line. To generate an encrypted
password, visit the <a href="/user/{{ tour.tourScope.username }}?tab=settings">settings tab under your user page.</a>
</div>
<pre class="command"><code ng-show="tour.tourScope.showSudo">sudo </code>docker login {{ tour.tourScope.domainName }} <pre class="command"><code ng-show="tour.tourScope.showSudo">sudo </code>docker login {{ tour.tourScope.domainName }}
Username: {{ tour.tourScope.username }} Username: {{ tour.tourScope.username }}
Password: (password here) Password: (<strong quay-show="Features.REQUIRE_ENCRYPTED_BASIC_AUTH">encrypted</strong> password here)
Email: {{ tour.tourScope.email }}</pre> Email: {{ tour.tourScope.email }}</pre>
</div> </div>