From 899562d2769237973d32fe8fec899062a4ce31f7 Mon Sep 17 00:00:00 2001 From: Rita Silva <55759937+ritamtbsilva@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:20:05 +0100 Subject: [PATCH 01/14] Update Dockerfile --- Dockerfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6c59362..743fd7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,14 @@ FROM r-base:4.1.0 MAINTAINER Disease Transcriptomics Lab -RUN apt-get update && apt-get -y upgrade && apt-get -y autoremove +RUN apt-get update && \ + apt-get -y install --no-install-recommends \ + curl \ + git \ + build-essential && \ + apt-get -y autoremove && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* RUN apt-get install -y curl RUN apt-get install -y libcurl4-openssl-dev RUN apt-get install -y libssl-dev From fd5d8384f8ecded499a493ab54b946fccb52b1f9 Mon Sep 17 00:00:00 2001 From: Rita Silva Date: Tue, 22 Oct 2024 17:25:09 +0100 Subject: [PATCH 02/14] Revert "Update Dockerfile" This reverts commit 899562d2769237973d32fe8fec899062a4ce31f7. --- Dockerfile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 743fd7d..6c59362 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,7 @@ FROM r-base:4.1.0 MAINTAINER Disease Transcriptomics Lab -RUN apt-get update && \ - apt-get -y install --no-install-recommends \ - curl \ - git \ - build-essential && \ - apt-get -y autoremove && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get -y upgrade && apt-get -y autoremove RUN apt-get install -y curl RUN apt-get install -y libcurl4-openssl-dev RUN apt-get install -y libssl-dev From dcc18cc94e3b38aa8fb7b633f44410628be84b42 Mon Sep 17 00:00:00 2001 From: Rita Silva <55759937+ritamtbsilva@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:27:37 +0100 Subject: [PATCH 03/14] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6c59362..cd5d239 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM r-base:4.1.0 +FROM r-base:4.1.2 MAINTAINER Disease Transcriptomics Lab RUN apt-get update && apt-get -y upgrade && apt-get -y autoremove From 6b8af878ecf7cdee7e1a16d9c2dbf4faee7d9234 Mon Sep 17 00:00:00 2001 From: Rita Silva <55759937+ritamtbsilva@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:31:29 +0100 Subject: [PATCH 04/14] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cd5d239..ac1a811 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM r-base:4.1.2 MAINTAINER Disease Transcriptomics Lab -RUN apt-get update && apt-get -y upgrade && apt-get -y autoremove +RUN apt-get update && apt-get -y dist-upgrade && apt-get -y autoremove RUN apt-get install -y curl RUN apt-get install -y libcurl4-openssl-dev RUN apt-get install -y libssl-dev From 70c87621e9177a59e0aa5a0616ffddcdd5571d9a Mon Sep 17 00:00:00 2001 From: Rita Silva <55759937+ritamtbsilva@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:35:18 +0100 Subject: [PATCH 05/14] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ac1a811..cf62347 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ FROM r-base:4.1.2 MAINTAINER Disease Transcriptomics Lab -RUN apt-get update && apt-get -y dist-upgrade && apt-get -y autoremove +RUN sed -i 's|http://deb.debian.org|http://ftp.us.debian.org|g' /etc/apt/sources.list && \ + apt-get update && apt-get -y upgrade && apt-get -y autoremove RUN apt-get install -y curl RUN apt-get install -y libcurl4-openssl-dev RUN apt-get install -y libssl-dev From c0392725dd63ee9cca0a9549af09ce0d9dbf8187 Mon Sep 17 00:00:00 2001 From: Rita Silva <55759937+ritamtbsilva@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:40:30 +0100 Subject: [PATCH 06/14] Update Dockerfile --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cf62347..6121fe0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,7 @@ FROM r-base:4.1.2 MAINTAINER Disease Transcriptomics Lab -RUN sed -i 's|http://deb.debian.org|http://ftp.us.debian.org|g' /etc/apt/sources.list && \ - apt-get update && apt-get -y upgrade && apt-get -y autoremove +RUN apt-get update && apt-get -y --fix-broken install && apt-get -y upgrade && apt-get -y autoremove RUN apt-get install -y curl RUN apt-get install -y libcurl4-openssl-dev RUN apt-get install -y libssl-dev From 14367674be8b5cfa908ff7f22b030d7bf9fa52de Mon Sep 17 00:00:00 2001 From: Rita Silva <55759937+ritamtbsilva@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:43:49 +0100 Subject: [PATCH 07/14] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6121fe0..7ec1a62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM r-base:4.1.2 MAINTAINER Disease Transcriptomics Lab -RUN apt-get update && apt-get -y --fix-broken install && apt-get -y upgrade && apt-get -y autoremove +RUN apt-get update && apt-get install -y usrmerge && apt-get -y upgrade && apt-get -y autoremove RUN apt-get install -y curl RUN apt-get install -y libcurl4-openssl-dev RUN apt-get install -y libssl-dev From 756497a6e7b3386190e8980ca3e6f6cf76b79b6b Mon Sep 17 00:00:00 2001 From: Rita Silva <55759937+ritamtbsilva@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:45:25 +0100 Subject: [PATCH 08/14] Update Dockerfile --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7ec1a62..3f9b4a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,12 @@ FROM r-base:4.1.2 MAINTAINER Disease Transcriptomics Lab -RUN apt-get update && apt-get install -y usrmerge && apt-get -y upgrade && apt-get -y autoremove +# Use a pre-configured debian base image that supports merged-/usr +FROM debian:bookworm-slim + +# Continue with your installation and upgrade steps +RUN apt-get update && apt-get -y upgrade && apt-get -y autoremove + RUN apt-get install -y curl RUN apt-get install -y libcurl4-openssl-dev RUN apt-get install -y libssl-dev From ce36ef3ec9127908a80d05be9b0dfca8075b51a9 Mon Sep 17 00:00:00 2001 From: Rita Silva <55759937+ritamtbsilva@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:46:30 +0100 Subject: [PATCH 09/14] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3f9b4a2..7be4543 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM r-base:4.1.2 +FROM r-base:4.1.0 MAINTAINER Disease Transcriptomics Lab # Use a pre-configured debian base image that supports merged-/usr From 50ce5f17fdafd01679a0ff8992935c15f0ec71af Mon Sep 17 00:00:00 2001 From: Rita Silva <55759937+ritamtbsilva@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:49:06 +0100 Subject: [PATCH 10/14] Update Dockerfile --- Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7be4543..26029a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,8 @@ +FROM debian:bookworm-slim FROM r-base:4.1.0 MAINTAINER Disease Transcriptomics Lab - -# Use a pre-configured debian base image that supports merged-/usr -FROM debian:bookworm-slim - -# Continue with your installation and upgrade steps + RUN apt-get update && apt-get -y upgrade && apt-get -y autoremove - RUN apt-get install -y curl RUN apt-get install -y libcurl4-openssl-dev RUN apt-get install -y libssl-dev From 01dd84ac414f1450e3ac6580b82d3fa9fba33b83 Mon Sep 17 00:00:00 2001 From: Rita Silva <55759937+ritamtbsilva@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:50:45 +0100 Subject: [PATCH 11/14] Update Dockerfile --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 26029a8..6baac74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ -FROM debian:bookworm-slim FROM r-base:4.1.0 MAINTAINER Disease Transcriptomics Lab - + +FROM debian:bookworm-slim +RUN which R RUN apt-get update && apt-get -y upgrade && apt-get -y autoremove RUN apt-get install -y curl RUN apt-get install -y libcurl4-openssl-dev From 5fb6c78b23eae1e72f69266933cebb2943f87fa6 Mon Sep 17 00:00:00 2001 From: Rita Silva <55759937+ritamtbsilva@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:52:36 +0100 Subject: [PATCH 12/14] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6baac74..5fdfa8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM r-base:4.1.0 MAINTAINER Disease Transcriptomics Lab -FROM debian:bookworm-slim +FROM debian:bullseye-slim RUN which R RUN apt-get update && apt-get -y upgrade && apt-get -y autoremove RUN apt-get install -y curl From 457a4d3b6212a4a678e05d73984f280d3b73c96c Mon Sep 17 00:00:00 2001 From: Rita Silva <55759937+ritamtbsilva@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:53:57 +0100 Subject: [PATCH 13/14] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5fdfa8e..1842cd1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM r-base:4.1.0 MAINTAINER Disease Transcriptomics Lab FROM debian:bullseye-slim -RUN which R +RUN R --version RUN apt-get update && apt-get -y upgrade && apt-get -y autoremove RUN apt-get install -y curl RUN apt-get install -y libcurl4-openssl-dev From 0854a71de84af1f191b5d3122beea9f5af13421a Mon Sep 17 00:00:00 2001 From: Rita Silva <55759937+ritamtbsilva@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:54:48 +0100 Subject: [PATCH 14/14] Update Dockerfile --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1842cd1..bdac976 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,6 @@ -FROM r-base:4.1.0 +FROM rocker/r-ver:4.1.0 MAINTAINER Disease Transcriptomics Lab -FROM debian:bullseye-slim -RUN R --version RUN apt-get update && apt-get -y upgrade && apt-get -y autoremove RUN apt-get install -y curl RUN apt-get install -y libcurl4-openssl-dev