Skip to content

Commit 7023b92

Browse files
KelvinAkpobomeTim Bannister
andauthored
[en] Updated the page to be more docker specific (#31421)
* Update: Updated to be more docker specific * Update content/en/docs/tasks/configure-pod-container/pull-image-private-registry.md Co-authored-by: Tim Bannister <[email protected]> * Update content/en/docs/tasks/configure-pod-container/pull-image-private-registry.md Co-authored-by: Tim Bannister <[email protected]> * Update pull-image-private-registry.md * Update pull-image-private-registry.md * Update: fixes issue #31422 Co-authored-by: Tim Bannister <[email protected]>
1 parent f89e0ba commit 7023b92

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

content/en/docs/tasks/configure-pod-container/assign-memory-resource.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ The output shows that the Container was killed because it is out of memory (OOM)
174174
```shell
175175
lastState:
176176
terminated:
177-
containerID: docker://65183c1877aaec2e8427bc95609cc52677a454b56fcb24340dbd22917c23b10f
177+
containerID: 65183c1877aaec2e8427bc95609cc52677a454b56fcb24340dbd22917c23b10f
178178
exitCode: 137
179179
finishedAt: 2017-06-20T20:52:19Z
180180
reason: OOMKilled

content/en/docs/tasks/configure-pod-container/pull-image-private-registry.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ weight: 100
77
<!-- overview -->
88

99
This page shows how to create a Pod that uses a
10-
{{< glossary_tooltip text="Secret" term_id="secret" >}} to pull an image from a
11-
private container image registry or repository.
10+
{{< glossary_tooltip text="Secret" term_id="secret" >}} to pull an image
11+
from a private container image registry or repository. There are many private
12+
registries in use. This task uses [Docker Hub](https://www.docker.com/products/docker-hub)
13+
as an example registry.
1214

1315
{{% thirdparty-content single="true" %}}
1416

@@ -18,6 +20,8 @@ private container image registry or repository.
1820

1921
* To do this exercise, you need the `docker` command line tool, and a
2022
[Docker ID](https://docs.docker.com/docker-id/) for which you know the password.
23+
* If you are using a different private container registry, you need the command
24+
line tool for that registry and any login information for the registry.
2125

2226
<!-- steps -->
2327

@@ -59,12 +63,13 @@ The output contains a section similar to this:
5963
If you use a Docker credentials store, you won't see that `auth` entry but a `credsStore` entry with the name of the store as value.
6064
{{< /note >}}
6165

62-
## Create a Secret based on existing Docker credentials {#registry-secret-existing-credentials}
66+
## Create a Secret based on existing credentials {#registry-secret-existing-credentials}
6367

6468
A Kubernetes cluster uses the Secret of `kubernetes.io/dockerconfigjson` type to authenticate with
6569
a container registry to pull a private image.
6670

67-
If you already ran `docker login`, you can copy that credential into Kubernetes:
71+
If you already ran `docker login`, you can copy
72+
that credential into Kubernetes:
6873

6974
```shell
7075
kubectl create secret generic regcred \
@@ -77,7 +82,7 @@ secret) then you can customise the Secret before storing it.
7782
Be sure to:
7883

7984
- set the name of the data item to `.dockerconfigjson`
80-
- base64 encode the docker file and paste that string, unbroken
85+
- base64 encode the Docker configuration file and then paste that string, unbroken
8186
as the value for field `data[".dockerconfigjson"]`
8287
- set `type` to `kubernetes.io/dockerconfigjson`
8388

@@ -213,4 +218,3 @@ kubectl get pod private-reg
213218
* Learn more about [adding image pull secrets to a service account](/docs/tasks/configure-pod-container/configure-service-account/#add-imagepullsecrets-to-a-service-account).
214219
* See [kubectl create secret docker-registry](/docs/reference/generated/kubectl/kubectl-commands/#-em-secret-docker-registry-em-).
215220
* See the `imagePullSecrets` field within the [container definitions](/docs/reference/kubernetes-api/workload-resources/pod-v1/#containers) of a Pod
216-

0 commit comments

Comments
 (0)