diff --git a/01-stacks/4.0.0.json b/01-stacks/4.0.0.json index 3b615e9..6d0a62b 100644 --- a/01-stacks/4.0.0.json +++ b/01-stacks/4.0.0.json @@ -77,9 +77,9 @@ "FROM": "docker.io/umr1283/r-ver:4.0.0", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -112,7 +112,7 @@ }, "FROM": "docker.io/umr1283/umr1283:4.0.0", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", diff --git a/01-stacks/4.0.1.json b/01-stacks/4.0.1.json index 4786a72..beff2d7 100644 --- a/01-stacks/4.0.1.json +++ b/01-stacks/4.0.1.json @@ -77,9 +77,9 @@ "FROM": "docker.io/umr1283/r-ver:4.0.1", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -112,7 +112,7 @@ }, "FROM": "docker.io/umr1283/umr1283:4.0.1", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", diff --git a/01-stacks/4.0.2.json b/01-stacks/4.0.2.json index 506a13a..c453878 100644 --- a/01-stacks/4.0.2.json +++ b/01-stacks/4.0.2.json @@ -77,9 +77,9 @@ "FROM": "docker.io/umr1283/r-ver:4.0.2", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -112,7 +112,7 @@ }, "FROM": "docker.io/umr1283/umr1283:4.0.2", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", diff --git a/01-stacks/4.0.3.json b/01-stacks/4.0.3.json index 5fc14c8..ffe32d5 100644 --- a/01-stacks/4.0.3.json +++ b/01-stacks/4.0.3.json @@ -77,9 +77,9 @@ "FROM": "docker.io/umr1283/r-ver:4.0.3", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -112,7 +112,7 @@ }, "FROM": "docker.io/umr1283/umr1283:4.0.3", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", diff --git a/01-stacks/4.0.4.json b/01-stacks/4.0.4.json index d10e187..be8f82c 100644 --- a/01-stacks/4.0.4.json +++ b/01-stacks/4.0.4.json @@ -77,9 +77,9 @@ "FROM": "docker.io/umr1283/r-ver:4.0.4", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -112,7 +112,7 @@ }, "FROM": "docker.io/umr1283/umr1283:4.0.4", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", diff --git a/01-stacks/4.0.5.json b/01-stacks/4.0.5.json index aa27c5b..eaaaef3 100644 --- a/01-stacks/4.0.5.json +++ b/01-stacks/4.0.5.json @@ -77,9 +77,9 @@ "FROM": "docker.io/umr1283/r-ver:4.0.5", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -112,7 +112,7 @@ }, "FROM": "docker.io/umr1283/umr1283:4.0.5", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", diff --git a/01-stacks/4.1.0.json b/01-stacks/4.1.0.json index f40eefe..6696367 100644 --- a/01-stacks/4.1.0.json +++ b/01-stacks/4.1.0.json @@ -77,9 +77,9 @@ "FROM": "docker.io/umr1283/r-ver:4.1.0", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -112,7 +112,7 @@ }, "FROM": "docker.io/umr1283/umr1283:4.1.0", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", diff --git a/01-stacks/4.1.1.json b/01-stacks/4.1.1.json index b09f53c..f6d15ee 100644 --- a/01-stacks/4.1.1.json +++ b/01-stacks/4.1.1.json @@ -77,9 +77,9 @@ "FROM": "docker.io/umr1283/r-ver:4.1.1", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -112,7 +112,7 @@ }, "FROM": "docker.io/umr1283/umr1283:4.1.1", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", diff --git a/01-stacks/4.1.2.json b/01-stacks/4.1.2.json index ea3e560..bcdef28 100644 --- a/01-stacks/4.1.2.json +++ b/01-stacks/4.1.2.json @@ -77,9 +77,9 @@ "FROM": "docker.io/umr1283/r-ver:4.1.2", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -112,7 +112,7 @@ }, "FROM": "docker.io/umr1283/umr1283:4.1.2", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", diff --git a/01-stacks/4.1.3.json b/01-stacks/4.1.3.json index f8e540a..202327d 100644 --- a/01-stacks/4.1.3.json +++ b/01-stacks/4.1.3.json @@ -77,9 +77,9 @@ "FROM": "docker.io/umr1283/r-ver:4.1.3", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -112,7 +112,7 @@ }, "FROM": "docker.io/umr1283/umr1283:4.1.3", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", diff --git a/01-stacks/4.2.0.json b/01-stacks/4.2.0.json index 0a34fd2..41a4054 100644 --- a/01-stacks/4.2.0.json +++ b/01-stacks/4.2.0.json @@ -77,9 +77,9 @@ "FROM": "docker.io/umr1283/r-ver:4.2.0", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -112,7 +112,7 @@ }, "FROM": "docker.io/umr1283/umr1283:4.2.0", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", diff --git a/01-stacks/4.2.1.json b/01-stacks/4.2.1.json index c6fd7cf..f026730 100644 --- a/01-stacks/4.2.1.json +++ b/01-stacks/4.2.1.json @@ -77,9 +77,9 @@ "FROM": "docker.io/umr1283/r-ver:4.2.1", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -112,7 +112,7 @@ }, "FROM": "docker.io/umr1283/umr1283:4.2.1", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", diff --git a/01-stacks/4.2.2.json b/01-stacks/4.2.2.json index 041acd7..157eb9c 100644 --- a/01-stacks/4.2.2.json +++ b/01-stacks/4.2.2.json @@ -77,9 +77,9 @@ "FROM": "docker.io/umr1283/r-ver:4.2.2", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -112,7 +112,7 @@ }, "FROM": "docker.io/umr1283/umr1283:4.2.2", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", diff --git a/01-stacks/4.2.3.json b/01-stacks/4.2.3.json index d591e59..245113a 100644 --- a/01-stacks/4.2.3.json +++ b/01-stacks/4.2.3.json @@ -77,9 +77,9 @@ "FROM": "docker.io/umr1283/r-ver:4.2.3", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -112,7 +112,7 @@ }, "FROM": "docker.io/umr1283/umr1283:4.2.3", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", diff --git a/01-stacks/4.3.0.json b/01-stacks/4.3.0.json index 037f854..a1e2602 100644 --- a/01-stacks/4.3.0.json +++ b/01-stacks/4.3.0.json @@ -77,9 +77,9 @@ "FROM": "docker.io/umr1283/r-ver:4.3.0", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -112,7 +112,7 @@ }, "FROM": "docker.io/umr1283/umr1283:4.3.0", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", diff --git a/01-stacks/4.3.1.json b/01-stacks/4.3.1.json index fc0ae9f..624677d 100644 --- a/01-stacks/4.3.1.json +++ b/01-stacks/4.3.1.json @@ -55,8 +55,7 @@ ], "CMD": "[\"R\"]", "tags": [ - "docker.io/umr1283/r-ver:4.3.1", - "docker.io/umr1283/r-ver:latest" + "docker.io/umr1283/r-ver:4.3.1" ], "platforms": [ "linux/amd64", @@ -78,9 +77,9 @@ "FROM": "docker.io/umr1283/r-ver:4.3.1", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -102,8 +101,7 @@ ], "CMD": "[\"R\"]", "tags": [ - "docker.io/umr1283/umr1283:4.3.1", - "docker.io/umr1283/umr1283:latest" + "docker.io/umr1283/umr1283:4.3.1" ] }, { @@ -114,15 +112,14 @@ }, "FROM": "docker.io/umr1283/umr1283:4.3.1", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", "CMD": "[\"/init\"]", "EXPOSE": 8787, "tags": [ - "docker.io/umr1283/rstudio:4.3.1", - "docker.io/umr1283/rstudio:latest" + "docker.io/umr1283/rstudio:4.3.1" ] }, { @@ -139,8 +136,7 @@ "CMD": "[\"/init\"]", "EXPOSE": 3838, "tags": [ - "docker.io/umr1283/shiny:4.3.1", - "docker.io/umr1283/shiny:latest" + "docker.io/umr1283/shiny:4.3.1" ] } ] diff --git a/01-stacks/4.3.2.json b/01-stacks/4.3.2.json new file mode 100644 index 0000000..f6f4ada --- /dev/null +++ b/01-stacks/4.3.2.json @@ -0,0 +1,147 @@ +{ + "ordered": true, + "TAG": "4.3.2", + "LABEL": "org.opencontainers.image.licenses=\"GPL-3.0\" \\\n org.opencontainers.image.source=\"https://github.com/umr1283/docker-versioned\" \\\n org.opencontainers.image.authors=\"Mickaël Canouil \"", + "group": [ + { + "default": [ + { + "targets": [ + "r-ver" + ] + } + ], + "umr": [ + { + "targets": [ + "umr1283" + ] + } + ], + "server": [ + { + "targets": [ + "rstudio", + "shiny" + ] + } + ] + } + ], + "stack": [ + { + "IMAGE": "r-ver", + "labels": { + "org.opencontainers.image.title": "umr1283/r-ver", + "org.opencontainers.image.description": "Reproducible builds with predefined version of R" + }, + "FROM": "docker.io/library/debian:bullseye", + "ENV": { + "R_VERSION": "4.3.2", + "R_HOME": "/usr/local/lib/R", + "CRAN": "https://cran.r-project.org", + "LANG": "en_GB.UTF-8", + "TZ": "Etc/UTC" + }, + "COPY": "assets /docker_scripts", + "RUN": [ + "chmod --recursive +x /docker_scripts", + "/docker_scripts/install_lang.sh", + "/docker_scripts/install_r.sh", + "/docker_scripts/install_git.sh", + "/docker_scripts/install_gitlfs.sh", + "/docker_scripts/install_python.sh", + "/docker_scripts/install_msfonts.sh" + ], + "CMD": "[\"R\"]", + "tags": [ + "docker.io/umr1283/r-ver:4.3.2", + "docker.io/umr1283/r-ver:latest" + ], + "platforms": [ + "linux/amd64", + "linux/arm64" + ], + "cache-from": [ + "docker.io/umr1283/r-ver:4.3.2" + ], + "cache-to": [ + "type=inline" + ] + }, + { + "IMAGE": "umr1283", + "labels": { + "org.opencontainers.image.title": "umr1283/umr1283", + "org.opencontainers.image.description": "Reproducible builds with predefined version of R and some (genetics) tools" + }, + "FROM": "docker.io/umr1283/r-ver:4.3.2", + "ENV": { + "UMR1283_VERSION": "1.10.4", + "PANDOC_VERSION": "3.1.9", + "BCFTOOLS_VERSION": "1.15.1", + "QUARTO_VERSION": "1.4.464", + "ODBC_VERSION": "8.0.27", + "S6_VERSION": "v2.2.0.3" + }, + "COPY": "assets /docker_scripts", + "RUN": [ + "chmod --recursive +x /docker_scripts", + "/docker_scripts/install_libs.sh", + "/docker_scripts/install_pandoc.sh", + "/docker_scripts/install_odbc.sh", + "/docker_scripts/install_s6v2.sh", + "/docker_scripts/install_crossmap.sh", + "/docker_scripts/install_bcftools.sh", + "/docker_scripts/install_vcftools.sh", + "/docker_scripts/install_qtltools.sh", + "/docker_scripts/install_r_packages.sh", + "/docker_scripts/install_r_umr1283.sh", + "/docker_scripts/install_quarto.sh", + "/docker_scripts/set_bash_default.sh" + ], + "CMD": "[\"R\"]", + "tags": [ + "docker.io/umr1283/umr1283:4.3.2", + "docker.io/umr1283/umr1283:latest" + ] + }, + { + "IMAGE": "rstudio", + "labels": { + "org.opencontainers.image.title": "umr1283/rstudio", + "org.opencontainers.image.description": "RStudio server for umr1283 image" + }, + "FROM": "docker.io/umr1283/umr1283:4.3.2", + "ENV": { + "RSTUDIO_VERSION": "2023.09.1+494", + "PATH": "/usr/lib/rstudio-server/bin:$PATH" + }, + "RUN": "/docker_scripts/install_rstudio.sh", + "CMD": "[\"/init\"]", + "EXPOSE": 8787, + "tags": [ + "docker.io/umr1283/rstudio:4.3.2", + "docker.io/umr1283/rstudio:latest" + ] + }, + { + "IMAGE": "shiny", + "labels": { + "org.opencontainers.image.title": "umr1283/shiny", + "org.opencontainers.image.description": "Shiny server for umr1283 image" + }, + "FROM": "docker.io/umr1283/umr1283:4.3.2", + "ENV": { + "SHINY_SERVER_VERSION": "latest" + }, + "RUN": "/docker_scripts/install_shiny_server.sh", + "CMD": "[\"/init\"]", + "EXPOSE": 3838, + "tags": [ + "docker.io/umr1283/shiny:4.3.2", + "docker.io/umr1283/shiny:latest" + ] + } + ] +} diff --git a/01-stacks/devel.json b/01-stacks/devel.json index fba3716..5dae898 100644 --- a/01-stacks/devel.json +++ b/01-stacks/devel.json @@ -64,9 +64,9 @@ "FROM": "docker.io/umr1283/r-ver:devel", "ENV": { "UMR1283_VERSION": "1.10.4", - "PANDOC_VERSION": "3.1.8", + "PANDOC_VERSION": "3.1.9", "BCFTOOLS_VERSION": "1.15.1", - "QUARTO_VERSION": "1.4.395", + "QUARTO_VERSION": "1.4.464", "ODBC_VERSION": "8.0.27", "S6_VERSION": "v2.2.0.3" }, @@ -96,7 +96,7 @@ }, "FROM": "docker.io/umr1283/umr1283:devel", "ENV": { - "RSTUDIO_VERSION": "2023.09.0+463", + "RSTUDIO_VERSION": "2023.09.1+494", "PATH": "/usr/lib/rstudio-server/bin:$PATH" }, "RUN": "/docker_scripts/install_rstudio.sh", diff --git a/02-dockerfiles/r-ver_4.3.2.Dockerfile b/02-dockerfiles/r-ver_4.3.2.Dockerfile new file mode 100644 index 0000000..3705e13 --- /dev/null +++ b/02-dockerfiles/r-ver_4.3.2.Dockerfile @@ -0,0 +1,24 @@ +FROM docker.io/library/debian:bullseye + +LABEL org.opencontainers.image.licenses="GPL-3.0" \ + org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ + org.opencontainers.image.authors="Mickaël Canouil " + +ENV R_VERSION=4.3.2 +ENV R_HOME=/usr/local/lib/R +ENV CRAN=https://cran.r-project.org +ENV LANG=en_GB.UTF-8 +ENV TZ=Etc/UTC + +COPY assets /docker_scripts + +RUN chmod --recursive +x /docker_scripts +RUN /docker_scripts/install_lang.sh +RUN /docker_scripts/install_r.sh +RUN /docker_scripts/install_git.sh +RUN /docker_scripts/install_gitlfs.sh +RUN /docker_scripts/install_python.sh +RUN /docker_scripts/install_msfonts.sh + +CMD ["R"] + diff --git a/02-dockerfiles/rstudio_4.0.0.Dockerfile b/02-dockerfiles/rstudio_4.0.0.Dockerfile index cc65f9b..dc1938a 100644 --- a/02-dockerfiles/rstudio_4.0.0.Dockerfile +++ b/02-dockerfiles/rstudio_4.0.0.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/rstudio_4.0.1.Dockerfile b/02-dockerfiles/rstudio_4.0.1.Dockerfile index 8dfd3b6..9cdfc6b 100644 --- a/02-dockerfiles/rstudio_4.0.1.Dockerfile +++ b/02-dockerfiles/rstudio_4.0.1.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/rstudio_4.0.2.Dockerfile b/02-dockerfiles/rstudio_4.0.2.Dockerfile index e96be43..68e26f2 100644 --- a/02-dockerfiles/rstudio_4.0.2.Dockerfile +++ b/02-dockerfiles/rstudio_4.0.2.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/rstudio_4.0.3.Dockerfile b/02-dockerfiles/rstudio_4.0.3.Dockerfile index 29e10ed..017f39a 100644 --- a/02-dockerfiles/rstudio_4.0.3.Dockerfile +++ b/02-dockerfiles/rstudio_4.0.3.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/rstudio_4.0.4.Dockerfile b/02-dockerfiles/rstudio_4.0.4.Dockerfile index 8e77976..8a9f072 100644 --- a/02-dockerfiles/rstudio_4.0.4.Dockerfile +++ b/02-dockerfiles/rstudio_4.0.4.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/rstudio_4.0.5.Dockerfile b/02-dockerfiles/rstudio_4.0.5.Dockerfile index 0487d34..55a67da 100644 --- a/02-dockerfiles/rstudio_4.0.5.Dockerfile +++ b/02-dockerfiles/rstudio_4.0.5.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/rstudio_4.1.0.Dockerfile b/02-dockerfiles/rstudio_4.1.0.Dockerfile index 6103b25..c6cbb1f 100644 --- a/02-dockerfiles/rstudio_4.1.0.Dockerfile +++ b/02-dockerfiles/rstudio_4.1.0.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/rstudio_4.1.1.Dockerfile b/02-dockerfiles/rstudio_4.1.1.Dockerfile index ca6a3da..ec490ab 100644 --- a/02-dockerfiles/rstudio_4.1.1.Dockerfile +++ b/02-dockerfiles/rstudio_4.1.1.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/rstudio_4.1.2.Dockerfile b/02-dockerfiles/rstudio_4.1.2.Dockerfile index 66547a7..ced175d 100644 --- a/02-dockerfiles/rstudio_4.1.2.Dockerfile +++ b/02-dockerfiles/rstudio_4.1.2.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/rstudio_4.1.3.Dockerfile b/02-dockerfiles/rstudio_4.1.3.Dockerfile index 1d21d85..ced67d7 100644 --- a/02-dockerfiles/rstudio_4.1.3.Dockerfile +++ b/02-dockerfiles/rstudio_4.1.3.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/rstudio_4.2.0.Dockerfile b/02-dockerfiles/rstudio_4.2.0.Dockerfile index 02faef9..494a485 100644 --- a/02-dockerfiles/rstudio_4.2.0.Dockerfile +++ b/02-dockerfiles/rstudio_4.2.0.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/rstudio_4.2.1.Dockerfile b/02-dockerfiles/rstudio_4.2.1.Dockerfile index 5887425..719eea5 100644 --- a/02-dockerfiles/rstudio_4.2.1.Dockerfile +++ b/02-dockerfiles/rstudio_4.2.1.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/rstudio_4.2.2.Dockerfile b/02-dockerfiles/rstudio_4.2.2.Dockerfile index 1d457d5..77e24b1 100644 --- a/02-dockerfiles/rstudio_4.2.2.Dockerfile +++ b/02-dockerfiles/rstudio_4.2.2.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/rstudio_4.2.3.Dockerfile b/02-dockerfiles/rstudio_4.2.3.Dockerfile index 1a5e6cf..ad09887 100644 --- a/02-dockerfiles/rstudio_4.2.3.Dockerfile +++ b/02-dockerfiles/rstudio_4.2.3.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/rstudio_4.3.0.Dockerfile b/02-dockerfiles/rstudio_4.3.0.Dockerfile index 9247541..e60e353 100644 --- a/02-dockerfiles/rstudio_4.3.0.Dockerfile +++ b/02-dockerfiles/rstudio_4.3.0.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/rstudio_4.3.1.Dockerfile b/02-dockerfiles/rstudio_4.3.1.Dockerfile index eff7f8b..dec4fe7 100644 --- a/02-dockerfiles/rstudio_4.3.1.Dockerfile +++ b/02-dockerfiles/rstudio_4.3.1.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/rstudio_4.3.2.Dockerfile b/02-dockerfiles/rstudio_4.3.2.Dockerfile new file mode 100644 index 0000000..a3ef0ac --- /dev/null +++ b/02-dockerfiles/rstudio_4.3.2.Dockerfile @@ -0,0 +1,15 @@ +FROM docker.io/umr1283/umr1283:4.3.2 + +LABEL org.opencontainers.image.licenses="GPL-3.0" \ + org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ + org.opencontainers.image.authors="Mickaël Canouil " + +ENV RSTUDIO_VERSION=2023.09.1+494 +ENV PATH=/usr/lib/rstudio-server/bin:$PATH + +RUN /docker_scripts/install_rstudio.sh + +EXPOSE 8787 + +CMD ["/init"] + diff --git a/02-dockerfiles/rstudio_devel.Dockerfile b/02-dockerfiles/rstudio_devel.Dockerfile index 4499c04..4759a0a 100644 --- a/02-dockerfiles/rstudio_devel.Dockerfile +++ b/02-dockerfiles/rstudio_devel.Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ org.opencontainers.image.authors="Mickaël Canouil " -ENV RSTUDIO_VERSION=2023.09.0+463 +ENV RSTUDIO_VERSION=2023.09.1+494 ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /docker_scripts/install_rstudio.sh diff --git a/02-dockerfiles/shiny_4.3.2.Dockerfile b/02-dockerfiles/shiny_4.3.2.Dockerfile new file mode 100644 index 0000000..17b30f8 --- /dev/null +++ b/02-dockerfiles/shiny_4.3.2.Dockerfile @@ -0,0 +1,14 @@ +FROM docker.io/umr1283/umr1283:4.3.2 + +LABEL org.opencontainers.image.licenses="GPL-3.0" \ + org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ + org.opencontainers.image.authors="Mickaël Canouil " + +ENV SHINY_SERVER_VERSION=latest + +RUN /docker_scripts/install_shiny_server.sh + +EXPOSE 3838 + +CMD ["/init"] + diff --git a/02-dockerfiles/umr1283_4.0.0.Dockerfile b/02-dockerfiles/umr1283_4.0.0.Dockerfile index 53c99ac..d5e6699 100644 --- a/02-dockerfiles/umr1283_4.0.0.Dockerfile +++ b/02-dockerfiles/umr1283_4.0.0.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/02-dockerfiles/umr1283_4.0.1.Dockerfile b/02-dockerfiles/umr1283_4.0.1.Dockerfile index 8d9466a..64d4097 100644 --- a/02-dockerfiles/umr1283_4.0.1.Dockerfile +++ b/02-dockerfiles/umr1283_4.0.1.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/02-dockerfiles/umr1283_4.0.2.Dockerfile b/02-dockerfiles/umr1283_4.0.2.Dockerfile index 81e7790..9be3273 100644 --- a/02-dockerfiles/umr1283_4.0.2.Dockerfile +++ b/02-dockerfiles/umr1283_4.0.2.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/02-dockerfiles/umr1283_4.0.3.Dockerfile b/02-dockerfiles/umr1283_4.0.3.Dockerfile index c5173a3..0a7d7b2 100644 --- a/02-dockerfiles/umr1283_4.0.3.Dockerfile +++ b/02-dockerfiles/umr1283_4.0.3.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/02-dockerfiles/umr1283_4.0.4.Dockerfile b/02-dockerfiles/umr1283_4.0.4.Dockerfile index 78e656d..10e40ac 100644 --- a/02-dockerfiles/umr1283_4.0.4.Dockerfile +++ b/02-dockerfiles/umr1283_4.0.4.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/02-dockerfiles/umr1283_4.0.5.Dockerfile b/02-dockerfiles/umr1283_4.0.5.Dockerfile index f68903b..4e19911 100644 --- a/02-dockerfiles/umr1283_4.0.5.Dockerfile +++ b/02-dockerfiles/umr1283_4.0.5.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/02-dockerfiles/umr1283_4.1.0.Dockerfile b/02-dockerfiles/umr1283_4.1.0.Dockerfile index f6a1677..6392075 100644 --- a/02-dockerfiles/umr1283_4.1.0.Dockerfile +++ b/02-dockerfiles/umr1283_4.1.0.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/02-dockerfiles/umr1283_4.1.1.Dockerfile b/02-dockerfiles/umr1283_4.1.1.Dockerfile index 039fcf2..42e9acf 100644 --- a/02-dockerfiles/umr1283_4.1.1.Dockerfile +++ b/02-dockerfiles/umr1283_4.1.1.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/02-dockerfiles/umr1283_4.1.2.Dockerfile b/02-dockerfiles/umr1283_4.1.2.Dockerfile index b9f0e03..513f76a 100644 --- a/02-dockerfiles/umr1283_4.1.2.Dockerfile +++ b/02-dockerfiles/umr1283_4.1.2.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/02-dockerfiles/umr1283_4.1.3.Dockerfile b/02-dockerfiles/umr1283_4.1.3.Dockerfile index b5060d2..974fffe 100644 --- a/02-dockerfiles/umr1283_4.1.3.Dockerfile +++ b/02-dockerfiles/umr1283_4.1.3.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/02-dockerfiles/umr1283_4.2.0.Dockerfile b/02-dockerfiles/umr1283_4.2.0.Dockerfile index 3ba2f55..52b5c7a 100644 --- a/02-dockerfiles/umr1283_4.2.0.Dockerfile +++ b/02-dockerfiles/umr1283_4.2.0.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/02-dockerfiles/umr1283_4.2.1.Dockerfile b/02-dockerfiles/umr1283_4.2.1.Dockerfile index 877ae80..2a3686d 100644 --- a/02-dockerfiles/umr1283_4.2.1.Dockerfile +++ b/02-dockerfiles/umr1283_4.2.1.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/02-dockerfiles/umr1283_4.2.2.Dockerfile b/02-dockerfiles/umr1283_4.2.2.Dockerfile index 48089f5..80d65fc 100644 --- a/02-dockerfiles/umr1283_4.2.2.Dockerfile +++ b/02-dockerfiles/umr1283_4.2.2.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/02-dockerfiles/umr1283_4.2.3.Dockerfile b/02-dockerfiles/umr1283_4.2.3.Dockerfile index 0cc9c60..ffea793 100644 --- a/02-dockerfiles/umr1283_4.2.3.Dockerfile +++ b/02-dockerfiles/umr1283_4.2.3.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/02-dockerfiles/umr1283_4.3.0.Dockerfile b/02-dockerfiles/umr1283_4.3.0.Dockerfile index a735ffd..6b24ef3 100644 --- a/02-dockerfiles/umr1283_4.3.0.Dockerfile +++ b/02-dockerfiles/umr1283_4.3.0.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/02-dockerfiles/umr1283_4.3.1.Dockerfile b/02-dockerfiles/umr1283_4.3.1.Dockerfile index 8bc0139..a404456 100644 --- a/02-dockerfiles/umr1283_4.3.1.Dockerfile +++ b/02-dockerfiles/umr1283_4.3.1.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/02-dockerfiles/umr1283_4.3.2.Dockerfile b/02-dockerfiles/umr1283_4.3.2.Dockerfile new file mode 100644 index 0000000..e1a740c --- /dev/null +++ b/02-dockerfiles/umr1283_4.3.2.Dockerfile @@ -0,0 +1,31 @@ +FROM docker.io/umr1283/r-ver:4.3.2 + +LABEL org.opencontainers.image.licenses="GPL-3.0" \ + org.opencontainers.image.source="https://github.com/umr1283/docker-versioned" \ + org.opencontainers.image.authors="Mickaël Canouil " + +ENV UMR1283_VERSION=1.10.4 +ENV PANDOC_VERSION=3.1.9 +ENV BCFTOOLS_VERSION=1.15.1 +ENV QUARTO_VERSION=1.4.464 +ENV ODBC_VERSION=8.0.27 +ENV S6_VERSION=v2.2.0.3 + +COPY assets /docker_scripts + +RUN chmod --recursive +x /docker_scripts +RUN /docker_scripts/install_libs.sh +RUN /docker_scripts/install_pandoc.sh +RUN /docker_scripts/install_odbc.sh +RUN /docker_scripts/install_s6v2.sh +RUN /docker_scripts/install_crossmap.sh +RUN /docker_scripts/install_bcftools.sh +RUN /docker_scripts/install_vcftools.sh +RUN /docker_scripts/install_qtltools.sh +RUN /docker_scripts/install_r_packages.sh +RUN /docker_scripts/install_r_umr1283.sh +RUN /docker_scripts/install_quarto.sh +RUN /docker_scripts/set_bash_default.sh + +CMD ["R"] + diff --git a/02-dockerfiles/umr1283_devel.Dockerfile b/02-dockerfiles/umr1283_devel.Dockerfile index b6d7bd7..b989abe 100644 --- a/02-dockerfiles/umr1283_devel.Dockerfile +++ b/02-dockerfiles/umr1283_devel.Dockerfile @@ -5,9 +5,9 @@ LABEL org.opencontainers.image.licenses="GPL-3.0" \ org.opencontainers.image.authors="Mickaël Canouil " ENV UMR1283_VERSION=1.10.4 -ENV PANDOC_VERSION=3.1.8 +ENV PANDOC_VERSION=3.1.9 ENV BCFTOOLS_VERSION=1.15.1 -ENV QUARTO_VERSION=1.4.395 +ENV QUARTO_VERSION=1.4.464 ENV ODBC_VERSION=8.0.27 ENV S6_VERSION=v2.2.0.3 diff --git a/04-bakefiles/4.3.1.docker-bake.json b/04-bakefiles/4.3.1.docker-bake.json index 15da035..627b206 100644 --- a/04-bakefiles/4.3.1.docker-bake.json +++ b/04-bakefiles/4.3.1.docker-bake.json @@ -35,8 +35,7 @@ "org.opencontainers.image.base.name": "docker.io/library/debian:bullseye" }, "tags": [ - "docker.io/umr1283/r-ver:4.3.1", - "docker.io/umr1283/r-ver:latest" + "docker.io/umr1283/r-ver:4.3.1" ], "platforms": [ "linux/amd64", @@ -58,8 +57,7 @@ "org.opencontainers.image.base.name": "docker.io/umr1283/r-ver:4.3.1" }, "tags": [ - "docker.io/umr1283/umr1283:4.3.1", - "docker.io/umr1283/umr1283:latest" + "docker.io/umr1283/umr1283:4.3.1" ], "platforms": [ "linux/amd64" @@ -80,8 +78,7 @@ "org.opencontainers.image.base.name": "docker.io/umr1283/umr1283:4.3.1" }, "tags": [ - "docker.io/umr1283/rstudio:4.3.1", - "docker.io/umr1283/rstudio:latest" + "docker.io/umr1283/rstudio:4.3.1" ], "platforms": [ "linux/amd64" @@ -102,8 +99,7 @@ "org.opencontainers.image.base.name": "docker.io/umr1283/umr1283:4.3.1" }, "tags": [ - "docker.io/umr1283/shiny:4.3.1", - "docker.io/umr1283/shiny:latest" + "docker.io/umr1283/shiny:4.3.1" ], "platforms": [ "linux/amd64" diff --git a/04-bakefiles/4.3.2.docker-bake.json b/04-bakefiles/4.3.2.docker-bake.json new file mode 100644 index 0000000..6ad3489 --- /dev/null +++ b/04-bakefiles/4.3.2.docker-bake.json @@ -0,0 +1,119 @@ +{ + "group": [ + { + "default": [ + { + "targets": [ + "r-ver" + ] + } + ], + "umr": [ + { + "targets": [ + "umr1283" + ] + } + ], + "server": [ + { + "targets": [ + "rstudio", + "shiny" + ] + } + ] + } + ], + "target": { + "r-ver": { + "context": "./", + "dockerfile": "02-dockerfiles/r-ver_4.3.2.Dockerfile", + "labels": { + "org.opencontainers.image.title": "umr1283/r-ver", + "org.opencontainers.image.description": "Reproducible builds with predefined version of R", + "org.opencontainers.image.base.name": "docker.io/library/debian:bullseye" + }, + "tags": [ + "docker.io/umr1283/r-ver:4.3.2", + "docker.io/umr1283/r-ver:latest" + ], + "platforms": [ + "linux/amd64", + "linux/arm64" + ], + "cache-from": [ + "docker.io/umr1283/r-ver:4.3.2" + ], + "cache-to": [ + "type=inline" + ] + }, + "umr1283": { + "context": "./", + "dockerfile": "02-dockerfiles/umr1283_4.3.2.Dockerfile", + "labels": { + "org.opencontainers.image.title": "umr1283/umr1283", + "org.opencontainers.image.description": "Reproducible builds with predefined version of R and some (genetics) tools", + "org.opencontainers.image.base.name": "docker.io/umr1283/r-ver:4.3.2" + }, + "tags": [ + "docker.io/umr1283/umr1283:4.3.2", + "docker.io/umr1283/umr1283:latest" + ], + "platforms": [ + "linux/amd64" + ], + "cache-from": [ + "" + ], + "cache-to": [ + "" + ] + }, + "rstudio": { + "context": "./", + "dockerfile": "02-dockerfiles/rstudio_4.3.2.Dockerfile", + "labels": { + "org.opencontainers.image.title": "umr1283/rstudio", + "org.opencontainers.image.description": "RStudio server for umr1283 image", + "org.opencontainers.image.base.name": "docker.io/umr1283/umr1283:4.3.2" + }, + "tags": [ + "docker.io/umr1283/rstudio:4.3.2", + "docker.io/umr1283/rstudio:latest" + ], + "platforms": [ + "linux/amd64" + ], + "cache-from": [ + "" + ], + "cache-to": [ + "" + ] + }, + "shiny": { + "context": "./", + "dockerfile": "02-dockerfiles/shiny_4.3.2.Dockerfile", + "labels": { + "org.opencontainers.image.title": "umr1283/shiny", + "org.opencontainers.image.description": "Shiny server for umr1283 image", + "org.opencontainers.image.base.name": "docker.io/umr1283/umr1283:4.3.2" + }, + "tags": [ + "docker.io/umr1283/shiny:4.3.2", + "docker.io/umr1283/shiny:latest" + ], + "platforms": [ + "linux/amd64" + ], + "cache-from": [ + "" + ], + "cache-to": [ + "" + ] + } + } +} diff --git a/05-matrix/github_action_matrix_all.json b/05-matrix/github_action_matrix_all.json index 1def80d..8b5db39 100644 --- a/05-matrix/github_action_matrix_all.json +++ b/05-matrix/github_action_matrix_all.json @@ -1,4 +1,4 @@ { - "r_version": ["4.0.0", "4.0.1", "4.0.2", "4.0.3", "4.0.4", "4.0.5", "4.1.0", "4.1.1", "4.1.2", "4.1.3", "4.2.0", "4.2.1", "4.2.2", "4.2.3", "4.3.0", "4.3.1"], + "r_version": ["4.0.0", "4.0.1", "4.0.2", "4.0.3", "4.0.4", "4.0.5", "4.1.0", "4.1.1", "4.1.2", "4.1.3", "4.2.0", "4.2.1", "4.2.2", "4.2.3", "4.3.0", "4.3.1", "4.3.2"], "group": ["default"] } diff --git a/05-matrix/github_action_matrix_all_server.json b/05-matrix/github_action_matrix_all_server.json index 8b8b44a..4368710 100644 --- a/05-matrix/github_action_matrix_all_server.json +++ b/05-matrix/github_action_matrix_all_server.json @@ -1,4 +1,4 @@ { - "r_version": ["4.0.0", "4.0.1", "4.0.2", "4.0.3", "4.0.4", "4.0.5", "4.1.0", "4.1.1", "4.1.2", "4.1.3", "4.2.0", "4.2.1", "4.2.2", "4.2.3", "4.3.0", "4.3.1"], + "r_version": ["4.0.0", "4.0.1", "4.0.2", "4.0.3", "4.0.4", "4.0.5", "4.1.0", "4.1.1", "4.1.2", "4.1.3", "4.2.0", "4.2.1", "4.2.2", "4.2.3", "4.3.0", "4.3.1", "4.3.2"], "group": ["server"] } diff --git a/05-matrix/github_action_matrix_all_umr.json b/05-matrix/github_action_matrix_all_umr.json index d6a4f82..7cce837 100644 --- a/05-matrix/github_action_matrix_all_umr.json +++ b/05-matrix/github_action_matrix_all_umr.json @@ -1,4 +1,4 @@ { - "r_version": ["4.0.0", "4.0.1", "4.0.2", "4.0.3", "4.0.4", "4.0.5", "4.1.0", "4.1.1", "4.1.2", "4.1.3", "4.2.0", "4.2.1", "4.2.2", "4.2.3", "4.3.0", "4.3.1"], + "r_version": ["4.0.0", "4.0.1", "4.0.2", "4.0.3", "4.0.4", "4.0.5", "4.1.0", "4.1.1", "4.1.2", "4.1.3", "4.2.0", "4.2.1", "4.2.2", "4.2.3", "4.3.0", "4.3.1", "4.3.2"], "group": ["umr"] } diff --git a/05-matrix/github_action_matrix_latest.json b/05-matrix/github_action_matrix_latest.json index 5149e21..f2b9122 100644 --- a/05-matrix/github_action_matrix_latest.json +++ b/05-matrix/github_action_matrix_latest.json @@ -1,4 +1,4 @@ { - "r_version": ["4.3.1"], + "r_version": ["4.3.2"], "group": ["default"] }