Skip to content

Commit

Permalink
docs(beginners/advanced): Fixed some typos
Browse files Browse the repository at this point in the history
  • Loading branch information
RezaRahemtola committed Apr 19, 2023
1 parent 1c0f464 commit 05492f2
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion advanced/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ description: collabnix | DockerLab | Docker - Advanced Track
[How to protect the Docker daemon socket]<br>
[How to build security into the container pipeline]<br>
[Docker Security - An Easy Way](./security/README.md)<br>
[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

Expand Down
12 changes: 6 additions & 6 deletions advanced/ci-cd/cicd-circleci.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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 )
<br>
Expand Down
6 changes: 3 additions & 3 deletions advanced/live migration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) <br>

Expand Down Expand Up @@ -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.



Expand Down
4 changes: 2 additions & 2 deletions beginners/dockerfile/ADD-command.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions beginners/dockerfile/Dockerfile-ENTRYPOINT.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 05492f2

Please sign in to comment.