Update Dockerfile
Browse files- Dockerfile +7 -5
Dockerfile
CHANGED
|
@@ -1,4 +1,4 @@
|
|
| 1 |
-
FROM rocker/
|
| 2 |
|
| 3 |
ENV DEBIAN_FRONTEND=noninteractive \
|
| 4 |
TZ=Etc/UTC \
|
|
@@ -31,9 +31,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
| 31 |
libtiff5-dev \
|
| 32 |
libharfbuzz-dev \
|
| 33 |
libfribidi-dev \
|
|
|
|
|
|
|
|
|
|
|
|
|
| 34 |
&& rm -rf /var/lib/apt/lists/*
|
| 35 |
|
| 36 |
-
ARG DOCKERFILE_REV=2026-03-04-
|
| 37 |
|
| 38 |
RUN echo "asa-api docker revision: ${DOCKERFILE_REV}"; \
|
| 39 |
set -eux; \
|
|
@@ -51,9 +55,7 @@ RUN echo "asa-api docker revision: ${DOCKERFILE_REV}"; \
|
|
| 51 |
/opt/conda/bin/conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r; \
|
| 52 |
/opt/conda/bin/conda update -n base -c defaults conda
|
| 53 |
|
| 54 |
-
RUN R -q -e "
|
| 55 |
-
|
| 56 |
-
RUN R -q -e "gate <- c('plumber','jsonlite','reticulate'); missing <- gate[!vapply(gate, function(p) requireNamespace(p, quietly = TRUE), logical(1))]; if (length(missing)) stop(sprintf('Runtime gate failed; missing: %s', paste(missing, collapse = ', ')), call. = FALSE)"
|
| 57 |
|
| 58 |
ARG ASA_SOFTWARE_REPO=https://github.com/cjerzak/asa-software
|
| 59 |
ARG ASA_SOFTWARE_REF=main
|
|
|
|
| 1 |
+
FROM rocker/r2u:22.04
|
| 2 |
|
| 3 |
ENV DEBIAN_FRONTEND=noninteractive \
|
| 4 |
TZ=Etc/UTC \
|
|
|
|
| 31 |
libtiff5-dev \
|
| 32 |
libharfbuzz-dev \
|
| 33 |
libfribidi-dev \
|
| 34 |
+
r-cran-plumber \
|
| 35 |
+
r-cran-jsonlite \
|
| 36 |
+
r-cran-reticulate \
|
| 37 |
+
r-cran-remotes \
|
| 38 |
&& rm -rf /var/lib/apt/lists/*
|
| 39 |
|
| 40 |
+
ARG DOCKERFILE_REV=2026-03-04-r2u-binary-1
|
| 41 |
|
| 42 |
RUN echo "asa-api docker revision: ${DOCKERFILE_REV}"; \
|
| 43 |
set -eux; \
|
|
|
|
| 55 |
/opt/conda/bin/conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r; \
|
| 56 |
/opt/conda/bin/conda update -n base -c defaults conda
|
| 57 |
|
| 58 |
+
RUN R -q -e "gate <- c('remotes','plumber','jsonlite','reticulate'); missing <- gate[!vapply(gate, function(p) requireNamespace(p, quietly = TRUE), logical(1))]; if (length(missing)) stop(sprintf('Binary package gate failed; missing: %s', paste(missing, collapse = ', ')), call. = FALSE); cat('Binary R package gate passed:', paste(gate, collapse = ', '), '\n'); cat('R library paths:', paste(.libPaths(), collapse = ' | '), '\n'); cat('plumber version:', as.character(packageVersion('plumber')), '\n')"
|
|
|
|
|
|
|
| 59 |
|
| 60 |
ARG ASA_SOFTWARE_REPO=https://github.com/cjerzak/asa-software
|
| 61 |
ARG ASA_SOFTWARE_REF=main
|