Skip to content

Commit 0f2a6b9

Browse files
authored
Merge pull request #505 from RezaRahemtola/master
Typos fixed in docker & kubernetes cheatsheets
2 parents 6ab3067 + 05492f2 commit 0f2a6b9

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

advanced/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ description: collabnix | DockerLab | Docker - Advanced Track
1717
[How to protect the Docker daemon socket]<br>
1818
[How to build security into the container pipeline]<br>
1919
[Docker Security - An Easy Way](./security/README.md)<br>
20-
[How Docker bypasses Linux Auditing Mechnism?](./security/ByPassing-Linux-Security-Audit.md)
20+
[How Docker bypasses Linux Auditing Mechanism?](./security/ByPassing-Linux-Security-Audit.md)
2121

2222
## Docker Monitoring
2323

advanced/ci-cd/cicd-circleci.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
- circle-ci and github account
2828

2929

30-
## Continous Integration Pipeline - (Without Docker)
30+
## Continuous Integration Pipeline - (Without Docker)
3131

3232
For the purpose of virtualization, we uses virtual machine technology. This technology actually reduces concentration risk when deploy in the right configurations. You can always achieve more failures using fewer x physical machines and hosting more than x virtual machines that are networked to watch each other and take over in the event of partner machines failure.
3333

@@ -82,7 +82,7 @@ output:
8282

8383
As shown above, we can save key and value by clicking "Save" button.
8484

85-
## Integrating Cirecle-ci (Before Docker)
85+
## Integrating Circle-ci (Before Docker)
8686

8787
Make sure you add circle-ci config file under .circleci/... as shown under the example https://github.com/sangam14/dockerapp1/tree/master/.circleci
8888

@@ -122,16 +122,16 @@ jobs:
122122
```
123123

124124
As shown above, make sure to add environment variable like $DOCKER_HUB_EMAIL, $DOCKER_HUB_USER_ID,$DOCKER_HUB_PWD
125-
Once you get circleci job running sucessfully, it should automatically be deployed on DockerHub repository.
125+
Once you get circleci job running successfully, it should automatically be deployed on DockerHub repository.
126126

127-
Login to the circl-ci account https://circleci.com using github. Select project which you want to deploy.
127+
Login to the circle-ci account https://circleci.com using github. Select project which you want to deploy.
128128

129129
![add_project](https://github.com/sangam14/dockerapp1/blob/master/Screenshot%202018-10-26%20at%207.49.53%20AM.png)
130130

131-
Go to the setting of the project in circleci dashboard and add the environment veriable which declared in .circleci/config.yml file io.
131+
Go to the setting of the project in circleci dashboard and add the environment variable which declared in .circleci/config.yml file io.
132132
You can also provide Github SSH permission.
133133

134-
![envn_var](https://github.com/sangam14/dockerapp1/blob/master/Screenshot%202018-10-26%20at%207.50.31%20AM.png)
134+
![env_var](https://github.com/sangam14/dockerapp1/blob/master/Screenshot%202018-10-26%20at%207.50.31%20AM.png)
135135

136136
Next, Run the build and it will perform following steps one by one {if it encounter any error, you should see red-colored messages )
137137
<br>

advanced/live migration/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
Containers are just a linux processes running in the namespace of the underlying kernel and can be checkpointed in the form of images. Such images i.e. metadata of the checkpointed container can be copied into the another containers and can be restored there hence resuming the previously checkpointed task in the namespace of another container.
99
Docker comes with the inbuilt features of checkpointing the running containers which can be performed on play-on-docker platform with some modifications on the running docker daemon.
1010

11-
Docker checkpoint/restore features are backed by the seperate project called Checkpoint and Restore in Userspace and abbreviated as CRIU. This project deals with checkpoint and restore of the containers as well as container migration. CRIU implements various protocols for live migration of containers i.e. lazy migration, diskless migration, zero downtime migration, etc.
11+
Docker checkpoint/restore features are backed by the separate project called Checkpoint and Restore in Userspace and abbreviated as CRIU. This project deals with checkpoint and restore of the containers as well as container migration. CRIU implements various protocols for live migration of containers i.e. lazy migration, diskless migration, zero downtime migration, etc.
1212

13-
For more information regarding criu project, you can visit the following link and they have seperate mailing list if you want to contribute to it.
13+
For more information regarding criu project, you can visit the following link and they have separate mailing list if you want to contribute to it.
1414

1515
- [CRIU Project](https://criu.org/Main_Page) <br>
1616

@@ -59,7 +59,7 @@ Now if you check the log file of container you can see the integer incrementing
5959

6060

6161
Docker also has feature to migrate task form one containers to another containers form which we can checkpoint the currently running container.
62-
The checkpointed metadata of the container can be stored into specific location of contaienr with the help of --checkpoint-dir option. Later the stored metadata can be pointed form another contaienr and restore the task but unfortunately docker has removed this functionality and exported to the Moby project for further experimentation.
62+
The checkpointed metadata of the container can be stored into specific location of container with the help of --checkpoint-dir option. Later the stored metadata can be pointed form another container and restore the task but unfortunately docker has removed this functionality and exported to the Moby project for further experimentation.
6363

6464

6565

beginners/dockerfile/ADD-command.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
It is the usual requirement of a developer to copy a few files into the docker image so that every container spawned from this image has the required files.
44

5-
Docker allows us to do this using two isntructions in a Dockerfile:
5+
Docker allows us to do this using two instructions in a Dockerfile:
66

77
- ADD
88
- COPY
@@ -114,7 +114,7 @@ Also, when you need to keep the tar archive intact, use COPY instead of ADD.
114114

115115
Remote file downloading via ADD is also discouraged in best practices. It is recommended to use curl or wget commands using RUN instruction.
116116

117-
So, preferrably, ADD should be used only for auto-tar extraction capabilities.
117+
So, preferably, ADD should be used only for auto-tar extraction capabilities.
118118

119119
### Contributor
120120

beginners/dockerfile/Dockerfile-ENTRYPOINT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ Hi, your ENTRYPOINT instruction in Shell Form !
9696

9797
### Override the existing ENTRYPOINT
9898
```
99-
$ docker container run --entrypoint "/bin/echo" entrypoint:v2 "Hello, Welocme to Docker Meetup! "
100-
Hello, Welocme to Docker Meetup!
99+
$ docker container run --entrypoint "/bin/echo" entrypoint:v2 "Hello, Welcome to Docker Meetup! "
100+
Hello, Welcome to Docker Meetup!
101101
```
102102
## Contributor
103103
[Savio Mathew](https://www.linkedin.com/in/saviovettoor)

docker/cheatsheet/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Here's the list of Docker image transfer commands:
7575

7676
<br>
7777

78-
![Image Transfer Comnands](https://raw.githubusercontent.com/sangam14/dockercheatsheets/master/dockercheatsheet6.png)
78+
![Image Transfer Commands](https://raw.githubusercontent.com/sangam14/dockercheatsheets/master/dockercheatsheet6.png)
7979

8080

8181
## Builder Main Commands
@@ -505,8 +505,8 @@ services:
505505
- "somehost:192.168.1.100"
506506
```
507507
508-
### sevices
509-
To view list of all the services runnning in swarm
508+
### services
509+
To view list of all the services running in swarm
510510
511511
```
512512
docker service ls
@@ -550,7 +550,7 @@ docker stack rm stack_name
550550
```
551551
To kill all running containers
552552
```
553-
docker kill $(docekr ps -q )
553+
docker kill $(docker ps -q )
554554
```
555555

556556
## Docker Security
@@ -611,7 +611,7 @@ docker scout quickview redis:6.0
611611

612612
## Support and Community
613613

614-
If you do get enough interest to contributer to this Cheat Sheet, the community at Collabnix is available to support you.
614+
If you do get enough interest to contribute to this Cheat Sheet, the community at Collabnix is available to support you.
615615
Feel free to raise PR and get your favorite Cheat Sheet added to the list via [PR](https://github.com/collabnix/dockerlabs/pulls), or you can connect to us either on Slack or Discord server.
616616

617617

kubernetes/cheatsheets/kubectl.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ cat pod.json | kubectl create -f -
9696
# Edit the data in docker-registry.yaml in JSON using the v1 API format then create the resource using the edited data.
9797
kubectl create -f docker-registry.yaml --edit --output-version=v1 -o json
9898

99-
# Create all the resources avaibale in the folder
99+
# Create all the resources available in the folder
100100
kubeclt create -f <folder_name>
101101
```
102102

@@ -325,7 +325,7 @@ kubectl set sa -f nginx-deployment.yaml serviceaccount1 --local --dry-run -o yam
325325

326326
### Autoscale
327327

328-
Creates an autoscaler that automatically chooses and sets the number of pods that run in a kubernetes cluste
328+
Creates an autoscaler that automatically chooses and sets the number of pods that run in a kubernetes cluster
329329

330330
```bash
331331
# Auto scale a deployment "foo", with the number of pods between 2 and 10, no target CPU utilization specified so a default autoscaling policy will be used:

0 commit comments

Comments
 (0)