Skip to content

Commit 1b0befe

Browse files
authored
Merge pull request #83 from revbayes/phylodocker_fix_250722
add change from slim to full image
2 parents d0fc8d9 + cc9ff3e commit 1b0befe

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

tutorials/docker/index.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Create and run a new Docker container, and start with an interactive shell sessi
3030
~ $ # create and run new Docker container
3131
~ $ docker run --name phylodocker_demo \
3232
--volume /Users/mlandis/projects/docker_test:/docker_test \
33-
-it sswiston/phylo_docker:slim_amd64 \
33+
-it sswiston/phylo_docker:full_amd64 \
3434
/bin/sh
3535
```
3636

@@ -75,7 +75,7 @@ new_file.txt test.Rev
7575
~ $ # show active Docker containers
7676
~ docker ps -a
7777
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
78-
fb19b94184ac sswiston/phylo_docker:slim_amd64 "/bin/sh" 5 minutes ago Exited (0) 4 minutes ago phylodocker_demo
78+
fb19b94184ac sswiston/phylo_docker:full_amd64 "/bin/sh" 5 minutes ago Exited (0) 4 minutes ago phylodocker_demo
7979
8080
~ $ # resume active Docker container using start
8181
~ $ docker start -ai phylodocker_demo
@@ -139,24 +139,24 @@ A Docker image containing RevBayes, TensorPhylo, Python, R, and other dependenci
139139

140140
First, open Docker Desktop. This starts the Docker daemon so that you can run `docker` commands. If you do not open Docker Desktop first, you will receive an error when you try to run a `docker` command. Then, in the desktop app, sign into your Docker Hub account.
141141

142-
Next, you will need to pull a `phylo_docker` image with a tag that matches your computer's hardware architecture. The two tagged versions currently supported are `phylo_docker:slim_amd64` and `phylo_docker:slim_arm64`. Consult the table below if you are unsure which tagged image to use.
142+
Next, you will need to pull a `phylo_docker` image with a tag that matches your computer's hardware architecture. The two tagged versions currently supported are `phylo_docker:full_amd64` and `phylo_docker:full_arm64`. Consult the table below if you are unsure which tagged image to use.
143143

144144

145145
| OS | CPU | Manufacture date | Tagged image |
146146
|------------------|-----|------------------|--------------|
147-
| Windows or Linux | Intel or AMD | -- | `phylo_docker:slim_amd64` |
148-
| Mac OS X | Intel | 2019 or earlier | `phylo_docker:slim_amd64` |
149-
| Mac OS X | Silicon M1, M2, etc. | after 2019 | `phylo_docker:slim_arm64` |
147+
| Windows or Linux | Intel or AMD | -- | `phylo_docker:full_amd64` |
148+
| Mac OS X | Intel | 2019 or earlier | `phylo_docker:full_amd64` |
149+
| Mac OS X | Silicon M1, M2, etc. | after 2019 | `phylo_docker:full_arm64` |
150150

151151

152152
Next, open your command line and enter the appropriate pull command:
153153

154154
```
155155
# For Intel/AMD computers
156-
docker pull sswiston/phylo_docker:slim_amd64
156+
docker pull sswiston/phylo_docker:full_amd64
157157
158158
# For Apple Silicon (M1, M2, etc.) computers
159-
docker pull sswiston/phylo_docker:slim_arm64
159+
docker pull sswiston/phylo_docker:full_arm64
160160
```
161161

162162
Docker will automatically store the image on your computer in a directory reserved for Docker images. You will not have to manually locate this image; Docker will be able to find it.
@@ -183,10 +183,10 @@ You can also run the RevBayes Docker image directly from command line. This will
183183

184184
```
185185
# For Intel/AMD computers
186-
docker run --name [my_container] --volume [local_directory]:[container_directory] -it sswiston/phylo_docker:slim_amd64 /bin/sh
186+
docker run --name [my_container] --volume [local_directory]:[container_directory] -it sswiston/phylo_docker:full_amd64 /bin/sh
187187
188188
# For Apple Silicon (M1, M2, etc.) computers
189-
docker run --name [my_container] --volume [local_directory]:[container_directory] -it sswiston/phylo_docker:slim_arm64 /bin/sh
189+
docker run --name [my_container] --volume [local_directory]:[container_directory] -it sswiston/phylo_docker:full_arm64 /bin/sh
190190
```
191191
192192
Some parts of this command are directly analogous to the optional settings from the RevBayes GUI.
@@ -199,7 +199,7 @@ You can also run the RevBayes Docker image directly from command line. This will
199199
200200
- `-it` is for opening an interactive container. Docker containers can also be used to automatically run scripts and terminate when they are completed, but you will need an interactive container for this tutorial.
201201
202-
- `sswiston/phylo_docker:slim_amd64` or `sswiston/phylo_docker:slim_arm64` (hardware-dependent, see above) is the name of the Docker image you want to use.
202+
- `sswiston/phylo_docker:full_amd64` or `sswiston/phylo_docker:full_arm64` (hardware-dependent, see above) is the name of the Docker image you want to use.
203203
204204
- `/bin/sh` tells the Docker container to open a new terminal (shell) session when it starts.
205205
@@ -277,7 +277,7 @@ bsub \
277277
-cwd $PROJECTDIR \
278278
-J $NAME \
279279
-o $OUTDIR$NAME.stdout.txt \
280-
-a 'docker(sswiston/phylo_docker:slim_amd64)' /bin/bash /project/rev_shell.sh
280+
-a 'docker(sswiston/phylo_docker:full_amd64)' /bin/bash /project/rev_shell.sh
281281
```
282282
283283
Let's pick apart the elements of this script. There is a section at the top for defining variables, and then a `bsub` command using those variables.
@@ -306,7 +306,7 @@ After defining important variables, there is a multi-line `bsub` command that ac
306306
307307
- `-a` is the most important part of the `bsub` command. There are 3 parts.
308308
309-
- `'docker(sswiston/phylo_docker:slim_amd64)'` is the Docker image being used. The image will be pulled from Docker Hub.
309+
- `'docker(sswiston/phylo_docker:full_amd64)'` is the Docker image being used. The image will be pulled from Docker Hub.
310310
311311
- `/bin/bash` is the initial command that will run once the container is open.
312312

0 commit comments

Comments
 (0)