diff --git a/advanced/README.md b/advanced/README.md index c0d0fc6b2..a56e3c475 100644 --- a/advanced/README.md +++ b/advanced/README.md @@ -17,7 +17,7 @@ description: collabnix | DockerLab | Docker - Advanced Track [How to protect the Docker daemon socket]
[How to build security into the container pipeline]
[Docker Security - An Easy Way](./security/README.md)
-[How Docker bypasses Linux Auditing Mechnism?](./security/ByPassing-Linux-Security-Audit.md) +[How Docker bypasses Linux Auditing Mechanism?](./security/ByPassing-Linux-Security-Audit.md) ## Docker Monitoring diff --git a/advanced/ci-cd/cicd-circleci.md b/advanced/ci-cd/cicd-circleci.md index 0e884f247..462d12579 100644 --- a/advanced/ci-cd/cicd-circleci.md +++ b/advanced/ci-cd/cicd-circleci.md @@ -27,7 +27,7 @@ - circle-ci and github account -## Continous Integration Pipeline - (Without Docker) +## Continuous Integration Pipeline - (Without Docker) 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. @@ -82,7 +82,7 @@ output: As shown above, we can save key and value by clicking "Save" button. -## Integrating Cirecle-ci (Before Docker) +## Integrating Circle-ci (Before Docker) Make sure you add circle-ci config file under .circleci/... as shown under the example https://github.com/sangam14/dockerapp1/tree/master/.circleci @@ -122,16 +122,16 @@ jobs: ``` As shown above, make sure to add environment variable like $DOCKER_HUB_EMAIL, $DOCKER_HUB_USER_ID,$DOCKER_HUB_PWD -Once you get circleci job running sucessfully, it should automatically be deployed on DockerHub repository. +Once you get circleci job running successfully, it should automatically be deployed on DockerHub repository. -Login to the circl-ci account https://circleci.com using github. Select project which you want to deploy. +Login to the circle-ci account https://circleci.com using github. Select project which you want to deploy. ![add_project](https://github.com/sangam14/dockerapp1/blob/master/Screenshot%202018-10-26%20at%207.49.53%20AM.png) -Go to the setting of the project in circleci dashboard and add the environment veriable which declared in .circleci/config.yml file io. +Go to the setting of the project in circleci dashboard and add the environment variable which declared in .circleci/config.yml file io. You can also provide Github SSH permission. -![envn_var](https://github.com/sangam14/dockerapp1/blob/master/Screenshot%202018-10-26%20at%207.50.31%20AM.png) +![env_var](https://github.com/sangam14/dockerapp1/blob/master/Screenshot%202018-10-26%20at%207.50.31%20AM.png) Next, Run the build and it will perform following steps one by one {if it encounter any error, you should see red-colored messages )
diff --git a/advanced/live migration/README.md b/advanced/live migration/README.md index 3878ed094..b63ff2f00 100644 --- a/advanced/live migration/README.md +++ b/advanced/live migration/README.md @@ -8,9 +8,9 @@ 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. 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. -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. +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. -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. +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. - [CRIU Project](https://criu.org/Main_Page)
@@ -59,7 +59,7 @@ Now if you check the log file of container you can see the integer incrementing Docker also has feature to migrate task form one containers to another containers form which we can checkpoint the currently running container. -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. +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. diff --git a/beginners/dockerfile/ADD-command.md b/beginners/dockerfile/ADD-command.md index d78ba0a82..3ae32a452 100644 --- a/beginners/dockerfile/ADD-command.md +++ b/beginners/dockerfile/ADD-command.md @@ -2,7 +2,7 @@ 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. -Docker allows us to do this using two isntructions in a Dockerfile: +Docker allows us to do this using two instructions in a Dockerfile: - ADD - COPY @@ -114,7 +114,7 @@ Also, when you need to keep the tar archive intact, use COPY instead of ADD. Remote file downloading via ADD is also discouraged in best practices. It is recommended to use curl or wget commands using RUN instruction. -So, preferrably, ADD should be used only for auto-tar extraction capabilities. +So, preferably, ADD should be used only for auto-tar extraction capabilities. ### Contributor diff --git a/beginners/dockerfile/Dockerfile-ENTRYPOINT.md b/beginners/dockerfile/Dockerfile-ENTRYPOINT.md index 70ba69479..764982a89 100644 --- a/beginners/dockerfile/Dockerfile-ENTRYPOINT.md +++ b/beginners/dockerfile/Dockerfile-ENTRYPOINT.md @@ -96,8 +96,8 @@ Hi, your ENTRYPOINT instruction in Shell Form ! ### Override the existing ENTRYPOINT ``` -$ docker container run --entrypoint "/bin/echo" entrypoint:v2 "Hello, Welocme to Docker Meetup! " -Hello, Welocme to Docker Meetup! +$ docker container run --entrypoint "/bin/echo" entrypoint:v2 "Hello, Welcome to Docker Meetup! " +Hello, Welcome to Docker Meetup! ``` ## Contributor [Savio Mathew](https://www.linkedin.com/in/saviovettoor) diff --git a/docker/cheatsheet/README.md b/docker/cheatsheet/README.md index eaa69c07f..6e9542faa 100644 --- a/docker/cheatsheet/README.md +++ b/docker/cheatsheet/README.md @@ -75,7 +75,7 @@ Here's the list of Docker image transfer commands:
- ![Image Transfer Comnands](https://raw.githubusercontent.com/sangam14/dockercheatsheets/master/dockercheatsheet6.png) + ![Image Transfer Commands](https://raw.githubusercontent.com/sangam14/dockercheatsheets/master/dockercheatsheet6.png) ## Builder Main Commands @@ -505,8 +505,8 @@ services: - "somehost:192.168.1.100" ``` -### sevices -To view list of all the services runnning in swarm +### services +To view list of all the services running in swarm ``` docker service ls @@ -550,7 +550,7 @@ docker stack rm stack_name ``` To kill all running containers ``` -docker kill $(docekr ps -q ) +docker kill $(docker ps -q ) ``` ## Docker Security @@ -611,7 +611,7 @@ docker scout quickview redis:6.0 ## Support and Community -If you do get enough interest to contributer to this Cheat Sheet, the community at Collabnix is available to support you. +If you do get enough interest to contribute to this Cheat Sheet, the community at Collabnix is available to support you. 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. diff --git a/kubernetes/cheatsheets/kubectl.md b/kubernetes/cheatsheets/kubectl.md index b767de83b..de19ed307 100644 --- a/kubernetes/cheatsheets/kubectl.md +++ b/kubernetes/cheatsheets/kubectl.md @@ -96,7 +96,7 @@ cat pod.json | kubectl create -f - # Edit the data in docker-registry.yaml in JSON using the v1 API format then create the resource using the edited data. kubectl create -f docker-registry.yaml --edit --output-version=v1 -o json -# Create all the resources avaibale in the folder +# Create all the resources available in the folder kubeclt create -f ``` @@ -325,7 +325,7 @@ kubectl set sa -f nginx-deployment.yaml serviceaccount1 --local --dry-run -o yam ### Autoscale -Creates an autoscaler that automatically chooses and sets the number of pods that run in a kubernetes cluste +Creates an autoscaler that automatically chooses and sets the number of pods that run in a kubernetes cluster ```bash # 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: