Merge pull request #13455 from docker/master

Publish updates from master

_data/toc.yaml

@@ -1348,8 +1348,6 @@ manuals:
     title: Docker ID accounts
   - path: /docker-hub/repos/
     title: Repositories
-  - path: /docker-hub/service-accounts/
-    title: Service accounts
   - path: /docker-hub/official_images/
     title: Docker Official images
   - sectiontitle: Automated builds

_scss/_content.scss

@@ -59,17 +59,26 @@ code {
  */
 
 .component-container {
-    padding: 0;
+  padding:  0;
-    margin: 0 0 50px;
+  margin:   0 0 50px;
-    width: 100%;
+  width:    100%;
-}
 
-.component {
+  .row {
-    padding: 15px 25px 5px 15px;
+    display: flex;
+    flex-wrap: wrap;
+  }
+
+  // "get-docker" tiles
+  .row > .block {
+    display: flex;
+    flex-direction: column;
+    padding: 10px;
+  }
+
+  .component {
+    padding: 15px 25px 15px 15px;
     text-align: center;
-    margin: 0 8px 15px;
+    height: 100%;
-    float: left;
-    height: 250px;
     width: 100%;
     background: $bg-component;
     img {
@@ -80,11 +89,12 @@ code {
       justify-content: center;
     }
     h2 {
-      font-size: 22px;
+      font-size: 18px;
     }
     h2, h3, p {
       margin: 0;
     }
+  }
 }
 
 a.anchorLink {

_scss/_utilities.scss

@@ -67,11 +67,6 @@ i.fa.fa-outdent {
     opacity: 0.5;
 }
 
-.block {
-    padding: 0 15px 10px 15px;
-}
-
-
 /* Inline graphics and icons (like the whale menu icon in d4mac, d4win) */
 img.inline {
     display: inline;

desktop/faqs.md

@@ -18,11 +18,9 @@ For information about Docker Desktop system requirements, see [Docker Desktop fo
 ### Do I need to pay to use Docker Desktop?
 
 Docker Desktop remains free for small businesses (fewer than 250 employees AND less than $10 million in revenue), personal use, education, and non-commercial open-source projects. It requires a paid subscription for professional use in larger enterprises.
-The effective date of these terms is August 31, 2021. There is a grace period until January 31, 2022, for those that will require a paid subscription to use Docker Desktop.
+The effective date of these terms is August 31, 2021. There is a grace period until January 31, 2022, for those that will require a paid subscription to use Docker Desktop. When downloading and installing Docker Desktop, you will be asked to agree to the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_"}.
 
-When downloading and installing Docker Desktop, you will be asked to agree to the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_"}.
+Read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} and [FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} to learn how companies using Docker Desktop may be affected. For information about Docker Desktop licensing, see [Docker Desktop License Agreement](../subscription/index.md#docker-desktop-license-agreement).
-
-[Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}.
 
 
 ### What is an experimental feature?

docker-hub/access-tokens.md

@@ -2,6 +2,8 @@
 title: Managing access tokens
 description: Learn how to create and manage your personal Docker Hub access tokens to securely push and pull images programmatically.
 keywords: docker hub, hub, security, PAT, personal access token
+redirect_from:
+- /docker-hub/service-accounts/
 ---
 
 Docker Hub lets you create personal access tokens as alternatives to your password. You can use tokens to access Hub images from the Docker CLI.

docker-hub/service-accounts.md

@@ -1,55 +0,0 @@
----
-description: Docker Service accounts
-keywords: Docker, service, accounts, Docker Hub
-title: Service accounts
----
-
-A service account is a Docker ID used for automated management of container images or containerized applications. Service accounts are typically used in automated workflows, and do not share Docker IDs with the members in the Team plan. Common use cases for service accounts include mirroring content on Docker Hub, or tying in image pulls from your CI/CD process.
-
-> **Note**
->
-> Service accounts included with the Team plan are limited to 5,000 pulls per day. If you require a higher number of pulls, you can purchase an Enhanced Service Account add-on.
-
-## Enhanced Service Account add-on pricing
-
-Refer to the following table for details on the Enhanced Service Account add-on pricing:
-
-| Tier | Pull Rates Per Day* | Annual Fee |
-| ------ | ------ | ------ |
-| 1 | 5,000-10,000 | $9,950/yr |
-| 2 | 10,000-25,000 | $17,950/yr |
-| 3 | 25,000-50,000 | $32,950/yr |
-| 4 | 50,000-100,000 | $58,950/yr |
-| 5 | 100,000+ | [Contact Sales](https://www.docker.com/pricing/questions){:target="_blank" rel="noopener" class="_"} |
-
-<sub>*Once the initial Tier is established, that is the minimum fee for the year.  Annual commitment required.  The service account may exceed Pulls by up to 25% for up to 20 days during the year without incurring additional fees.  Reports on consumption will be provided upon request.  At the end of the initial 1-year term, the appropriate Tier will be established for the following year.<sub>
-
-## How a pull is defined
-
-- A pull request is defined as up to two `GET` requests on registry manifest URLs (`/v2/*/manifests/*`).
-- A normal image pull makes a single manifest request.
-- A pull request for a multi-arch image makes two manifest requests.
-- `HEAD` requests are not counted.
-- Limits are applied based on the user doing the pull, and not based on the image being pulled or its owner.
-
-## Creating a new service account
-
-To create a new service account for your Team account:
-
-1. Create a new Docker ID.
-2. Create a [team](orgs.md#create-a-team) in your organization and grant it read-only access to your private repositories.
-3. Add the new Docker ID to your [organization](orgs.md#working-with-organizations).
-4. Add the new Docker ID  to the [team](orgs.md#add-a-member-to-a-team) you created earlier.
-5. Create a new [personal access token (PAT)](/access-tokens.md) from the user account and use it for CI.
-
-> **Note**
->
-> If you want a read-only PAT just for your open-source repos, or to access
-official images and other public images, you do not have to grant any access permissions to the new Docker ID.
-
-## Additional information
-
-Refer to the following topics for additional information:
-
-- [Mirroring Docker Hub](../registry/recipes/mirror.md)
-- [Resource Consumption Updates FAQ](https://www.docker.com/pricing/resource-consumption-updates){:target="_blank" rel="noopener" class="_"}

get-docker.md

@@ -22,7 +22,7 @@ section and choose the best installation path for you.
 <div class="component-container">
     <!--start row-->
     <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-4 block">
+        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-4 block">
             <div class="component">
                 <div class="component-icon">
                     <a href="/desktop/mac/install/"><img src="/images/apple_48.svg" alt="Docker Desktop for Mac" width="70" height="70"></a>
@@ -31,7 +31,7 @@ section and choose the best installation path for you.
                 <p>A native application using the macOS sandbox security model which delivers all Docker tools to your Mac.</p>
             </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-4 block">
+        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-4 block">
             <div class="component">
                 <div class="component-icon">
                     <a href="/desktop/windows/install/"><img src="/images/windows_48.svg" alt="Docker Desktop for Windows" width="70" height="70"></a>
@@ -40,7 +40,7 @@ section and choose the best installation path for you.
                 <p>A native Windows application which delivers all Docker tools to your Windows computer.</p>
             </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-4 block">
+        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-4 block">
             <div class="component">
                 <div class="component-icon">
                     <a href="/engine/install/"><img src="/images/linux_48.svg" alt="Docker for Linux" width="70" height="70"></a>

language/index.md

@@ -23,28 +23,18 @@ Learn how to set up your Docker environment and start containerizing your applic
 
 <div class="component-container">
     <!--start row-->
-    <div class="row" style="display: flex; align-items: center">
+    <div class="row" style="display: flex; align-items: center; flex-wrap: nowrap;">
-        <div class="col-sm-12 col-md-12 col-lg-4 block" style="margin: 0 10px;box-shadow: 0 3px 6px #0b214a17, 0 -2px 2px #0b214a08; height: 140px; display: flex; align-items: center">
+        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-4" style="margin: 0 10px;box-shadow: 0 3px 6px #0b214a17, 0 -2px 2px #0b214a08; height: 140px; display: flex; align-items: center">
-                <div class="component-icon">
+            <a href="/language/nodejs/"><img src="/language/images/nodejs.png" alt="Develop with Node"></a>
-                    <a href="/language/nodejs/"><img src="/language/images/nodejs.png" alt="Develop with Node"></a>
-                </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-4 block" style="margin: 0 10px;box-shadow: 0 3px 6px #0b214a17, 0 -2px 2px #0b214a08; height: 140px; display: flex; align-items: center">
+        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-4" style="margin: 0 10px;box-shadow: 0 3px 6px #0b214a17, 0 -2px 2px #0b214a08; height: 140px; display: flex; align-items: center">
-        <a href="/language/python/">
+            <a href="/language/python/"><img src="/language/images/python.png" alt="Develop with Python"></a>
-                <div class="component-icon">
-                    <img src="/language/images/python.png" alt="Develop with Python">
-                </div>
-            </a>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-4 block" style="margin: 0 10px;box-shadow: 0 3px 6px #0b214a17, 0 -2px 2px #0b214a08; height: 140px; display: flex; align-items: center">
+        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-4" style="margin: 0 10px;box-shadow: 0 3px 6px #0b214a17, 0 -2px 2px #0b214a08; height: 140px; display: flex; align-items: center">
-                <div class="component-icon">
+            <a href="/language/java/"><img src="/language/images/java.png" alt="Develop with Java"></a>
-                    <a href="/language/java/"><img src="/language/images/java.png" alt="Develop with Java"></a>
-                </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-4 block" style="margin: 0 10px;box-shadow: 0 3px 6px #0b214a17, 0 -2px 2px #0b214a08; height: 140px; display: flex; align-items: center">
+        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-4" style="margin: 0 10px;box-shadow: 0 3px 6px #0b214a17, 0 -2px 2px #0b214a08; height: 140px; display: flex; align-items: center">
-                <div class="component-icon">
+            <a href="/language/golang/"><img src="/language/images/golang.png" alt="Develop with Go"></a>
-                    <a href="/language/golang/"><img src="/language/images/golang.png" alt="Develop with Go"></a>
-                </div>
         </div>
     </div>
 </div>

language/nodejs/develop.md

@@ -92,11 +92,7 @@ Let’s test that our application is connected to the database and is able to ad
 $ curl --request POST \
   --url http://localhost:8000/notes \
   --header 'content-type: application/json' \
-  --data '{
+  --data '{"name": "this is a note", "text": "this is a note that I wanted to take while I was working on writing a blog post.", "owner": "peter"}'
-"name": "this is a note",
-"text": "this is a note that I wanted to take while I was working on writing a blog post.",
-"owner": "peter"
-}'
 ```
 
 You should receive the following json back from our service.

registry/recipes/mirror.md

@@ -76,10 +76,6 @@ Multiple registry caches can be deployed over the same back-end. A single
 registry cache ensures that concurrent requests do not pull duplicate data,
 but this property does not hold true for a registry cache cluster.
 
-> **Note**
->
-> Service accounts included in the Team plan are limited to 5,000 pulls per day. See [Service Accounts](/docker-hub/service-accounts/) for more details.
-
 ### Configure the cache
 
 To configure a Registry to run as a pull through cache, the addition of a