From 30c9d7c9b042afa40c3e9c3f50d069846b53e988 Mon Sep 17 00:00:00 2001 From: Alan O'Callaghan Date: Mon, 29 Jan 2024 15:37:51 +0000 Subject: [PATCH 1/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 07a89aa..72474c6 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This workflows runs using the docker image [alanocallaghan/bocker](https://hub.docker.com/repository/docker/alanocallaghan/bocker). To use the latest build of the docker ```bash -docker pull alanocallaghan/bocker +docker pull alanocallaghan/basicsworkflow2020-docker ``` To run the docker image via Rstudio server. The code below ensures that the files in From 7f0748c59f2e1b692a60d9c4701491bf7f74e52d Mon Sep 17 00:00:00 2001 From: Alan O'Callaghan Date: Mon, 29 Jan 2024 15:38:56 +0000 Subject: [PATCH 2/3] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 72474c6..d98507b 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ To run the docker image via Rstudio server. The code below ensures that the file /home/rstudio/mycode are available within the docker. ```bash -docker run -p 8787:8787 -v $(pwd):/home/rstudio/mycode -e PASSWORD=bioc alanocallaghan/bocker +make server ``` > NOTE: for Macbook users with an M1 chip, the following WARNING will be returned: @@ -33,5 +33,5 @@ Username: rstudio, password = bioc. Equivalently, to launch bash: ```bash -docker run -v $(pwd):/home/rstudio/mycode -it alanocallaghan/bocker /bin/bash +make run ``` From 57b3fec953dd0a96db57f7d7523df46e55e0408f Mon Sep 17 00:00:00 2001 From: Alan O'Callaghan Date: Mon, 29 Jan 2024 15:39:14 +0000 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d98507b..945bd0d 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ make server > To avoid that a `--platform=linux/amd64` can be added: > > ```bash -> docker run --platform=linux/amd64 -p 8787:8787 -v $(pwd):/home/rstudio/mycode -e PASSWORD=bioc alanocallaghan/bocker +> docker run --platform=linux/amd64 -p 8787:8787 -v $(pwd):/home/rstudio/mycode -e PASSWORD=bioc alanocallaghan/basicsworkflow2020-docker > ``` > > This issue has been documented by others e.g. [here](https://stackoverflow.com/questions/66662820/m1-docker-preview-and-keycloak-images-platform-linux-amd64-does-not-match-th)