Skip to content

Commit f7a129d

Browse files
author
Christopher Prener
committed
clarify container and image language
1 parent 01fce88 commit f7a129d

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

setup.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,9 @@ Option B involves downloading an Docker image that contains an installation of `
190190
>~~~
191191
>{: .bash}
192192
>
193-
> Once the pull command is executed, the image needs to be run to become accessible. When `docker run` is used, you can specify a folder on your computer to become accessible inside your RStudio Server instance. The following `docker run` command exposes Jane's `GitHub` directory to RStudio Server:
193+
> Once the pull command is executed, the image needs to be run to become accessible as a container. In the following example, the image is named `rocker/geospatial` and the container is named `gis`. The [image](https://docs.docker.com/glossary/?term=image) contains the software you've downloaded, and the [container](https://docs.docker.com/glossary/?term=container) is the run-time instance of that image. New Docker users should need only one named container per image.
194+
>
195+
> When `docker run` is used, you can specify a folder on your computer to become accessible inside your RStudio Server instance. The following `docker run` command exposes Jane's `GitHub` directory to RStudio Server:
194196
>
195197
>~~~
196198
>$ docker run -d -P --name gis /Users/jane/GitHub:/home/rstudio/GitHub rocker/geospatial
@@ -199,9 +201,7 @@ Option B involves downloading an Docker image that contains an installation of `
199201
>
200202
> When she opens her RStudio instance below, she will see a `GitHub` folder in her file table in the lower righthand corner of the screen. Windows and Linux users will have to adapt the file path above to follow the standards of their operating systems. More details are available on [rocker's Wiki](https://github.com/rocker-org/rocker/wiki/Sharing-files-with-host-machine).
201203
>
202-
> Each Docker image can be run via multiple containers. In this example, the image is named `rocker/geospatial` and the container is named `gis`. For example, Jane could also create a separate container based off the `rocker/geospatial` image named `geospatial`. New Docker users should need only one named container based on an image.
203-
>
204-
> The last step before launching your browser is to identify the port that your Docker container is running in:
204+
> The last step before launching your container in a browser is to identify the port that your Docker container is running in:
205205
>
206206
>~~~
207207
>$ docker port gis
@@ -211,22 +211,22 @@ Option B involves downloading an Docker image that contains an installation of `
211211
> An output, for example, of `8787/tcp -> 0.0.0.0:32768` would indicate that you should point your browser to `http://localhost:32768/`. If prompted, enter `rstudio` for both the username and the password.
212212
>
213213
> #### Stopping a Container
214-
> When you are done with a Docker session, make sure all of your files are saved locally on your computer **before closing Docker**. Once you have ensured all of your files are available (they should be saved at the file path designated in `docker run` above), you can stop your Docker image in the terminal:
214+
> When you are done with a Docker session, make sure all of your files are saved locally on your computer **before closing your browser and Docker**. Once you have ensured all of your files are available (they should be saved at the file path designated in `docker run` above), you can stop your Docker container in the terminal:
215215
>
216216
>~~~
217217
>$ docker stop gis
218218
>~~~
219219
>{: .bash}
220220
>
221221
> #### Re-starting a Container
222-
> Once an image has been downloaded, named, and created, you cannot create an image with the same name again using `docker run`. Instead, you can restart it:
222+
> Once a container has been named and created, you cannot create a container with the same name again using `docker run`. Instead, you can restart it:
223223
>
224224
>~~~
225225
>$ docker start gis
226226
>~~~
227227
>{: .bash}
228228
>
229-
> If you cannot remember the name of the image you created, you can use the following command to print a list of all named containers:
229+
> If you cannot remember the name of the container you created, you can use the following command to print a list of all named containers:
230230
>
231231
>~~~
232232
>$ docker ps -a
@@ -235,7 +235,7 @@ Option B involves downloading an Docker image that contains an installation of `
235235
>
236236
{: .solution}
237237
238-
> ## Managing Docker Resources
238+
> ## Managing Docker Containers and Images
239239
> To obtain a list of all of your current Docker containers:
240240
>
241241
>~~~

0 commit comments

Comments
 (0)