From d648188546a66507008b6e0519e687ffecc9199a Mon Sep 17 00:00:00 2001 From: CodeLionX Date: Thu, 30 Nov 2023 15:16:26 +0100 Subject: [PATCH 1/4] fix/r4-base): use remotes packages to install specific version of packages --- 0-base-images/r4-base/Dockerfile | 21 ++++++++++++++------- 0-base-images/r4-base/Rprofile.site | 3 +++ 0-base-images/r4-base/version.txt | 2 +- dbstream/Dockerfile | 17 ----------------- 4 files changed, 18 insertions(+), 25 deletions(-) delete mode 100644 dbstream/Dockerfile diff --git a/0-base-images/r4-base/Dockerfile b/0-base-images/r4-base/Dockerfile index b6cedde..b12ff7e 100644 --- a/0-base-images/r4-base/Dockerfile +++ b/0-base-images/r4-base/Dockerfile @@ -16,6 +16,7 @@ RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ ENV LC_ALL en_US.UTF-8 ENV LANG en_US.UTF-8 +ENV R_VERSION=4.2.0 RUN set -eux; \ apt-get update; \ @@ -25,17 +26,22 @@ RUN set -eux; \ # Install R RUN set -eux; \ - echo "deb http://cloud.r-project.org/bin/linux/debian buster-cran40/" >> /etc/apt/sources.list; \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-key 95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7; \ apt-get update; \ - apt-get install -y --no-install-recommends -t buster-cran40 r-base r-base-dev; \ + apt-get install -y --no-install-recommends gdebi; \ + wget https://cdn.rstudio.com/r/debian-10/pkgs/r-${R_VERSION}_1_amd64.deb; \ + gdebi -n r-${R_VERSION}_1_amd64.deb; \ + ln -s /opt/R/${R_VERSION}/bin/R /usr/local/bin/R; \ + ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/local/bin/Rscript; \ + /opt/R/${R_VERSION}/bin/R --version; \ + rm -f r-${R_VERSION}_1_amd64.deb; \ + apt-get purge -y gdebi && apt-get autoremove -y --purge; \ apt-get clean; \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/R/doc/*; \ - find /usr/lib/R/library -depth \ + find /opt/R/${R_VERSION}/lib/R/library -depth \ \( \ -type d -a \( -name doc -o -name html \) \ \) -exec rm -rf '{}' +; \ - find /usr/lib/R/library/translations/* -type d \ + find /opt/R/${R_VERSION}/lib/R/library/translations/* -type d \ \( \ -name en -prune \ -o -name de -prune \ @@ -43,12 +49,13 @@ RUN set -eux; \ \) -o -exec rm -rf '{}' +; # Set default CRAN mirror -COPY Rprofile.site /etc/R/Rprofile.site +COPY Rprofile.site /opt/R/${R_VERSION}/lib/R/etc/Rprofile.site # Install common dependencies RUN set -eux; \ R -e 'install.packages("jsonlite")'; \ - find /usr/lib/R/library -depth \ + R -e 'install.packages("remotes")'; \ + find /opt/R/${R_VERSION}/lib/R/library -depth \ \( \ -type d -a \( -name doc -o -name html \) \ \) -exec rm -rf '{}' +; \ diff --git a/0-base-images/r4-base/Rprofile.site b/0-base-images/r4-base/Rprofile.site index 870e221..6bf0cff 100644 --- a/0-base-images/r4-base/Rprofile.site +++ b/0-base-images/r4-base/Rprofile.site @@ -3,3 +3,6 @@ local({ r["CRAN"] <- "http://cran.r-project.org" options(repos=r) }) +if(length(find.package("remotes", quiet=TRUE)) != 0) { + library("remotes") +} diff --git a/0-base-images/r4-base/version.txt b/0-base-images/r4-base/version.txt index 0d91a54..9e11b32 100644 --- a/0-base-images/r4-base/version.txt +++ b/0-base-images/r4-base/version.txt @@ -1 +1 @@ -0.3.0 +0.3.1 diff --git a/dbstream/Dockerfile b/dbstream/Dockerfile deleted file mode 100644 index 205bde3..0000000 --- a/dbstream/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM registry.gitlab.hpi.de/akita/i/r4-base:0.2.5 - -LABEL maintainer="richard.schulz@student.hpi.de" - -# install stream and other libraries and cleanup afterwards -RUN set -eux; \ - R -e 'install.packages("BBmisc")';\ - R -e 'install.packages("stream")';\ - find /usr/lib/R/library -depth \ - \( \ - -type d -a \( -name doc -o -name html \) \ - \) -exec rm -rf '{}' +; \ - rm -rf /tmp/* /var/tmp/* - -ENV ALGORITHM_MAIN="/app/algorithm.r" - -COPY . /app/ From 1f516987d56944573c36e3af95a23b14eab8acc4 Mon Sep 17 00:00:00 2001 From: CodeLionX Date: Thu, 30 Nov 2023 15:43:30 +0100 Subject: [PATCH 2/4] feat: remove r-base image for R version 3 --- 0-base-images/r-base/Dockerfile | 59 ------------------------------ 0-base-images/r-base/LICENSE | 21 ----------- 0-base-images/r-base/Rprofile.site | 5 --- 0-base-images/r-base/entrypoint.sh | 44 ---------------------- 0-base-images/r-base/version.txt | 1 - README.md | 12 +++--- 6 files changed, 6 insertions(+), 136 deletions(-) delete mode 100644 0-base-images/r-base/Dockerfile delete mode 100644 0-base-images/r-base/LICENSE delete mode 100644 0-base-images/r-base/Rprofile.site delete mode 100755 0-base-images/r-base/entrypoint.sh delete mode 100644 0-base-images/r-base/version.txt diff --git a/0-base-images/r-base/Dockerfile b/0-base-images/r-base/Dockerfile deleted file mode 100644 index 88c810e..0000000 --- a/0-base-images/r-base/Dockerfile +++ /dev/null @@ -1,59 +0,0 @@ -FROM debian:buster-slim - -LABEL maintainer="sebastian.schmidl@hpi.de" - -RUN set -eux; \ - apt-get update; \ - apt-get upgrade -y; \ - apt-get install -y --no-install-recommends less wget locales ca-certificates fonts-texgyre; \ - apt-get clean; \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -# Configure default locale -RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen en_US.utf8 \ - && /usr/sbin/update-locale LANG=en_US.UTF-8 - -ENV LC_ALL en_US.UTF-8 -ENV LANG en_US.UTF-8 - -# Install R -ENV R_BASE_VERSION 3.5.2-1 - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends build-essential libopenblas-base r-base=${R_BASE_VERSION}; \ - apt-get clean; \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/R/doc/*; \ - find /usr/lib/R/library -depth \ - \( \ - -type d -a \( -name doc -o -name html \) \ - \) -exec rm -rf '{}' +; \ - find /usr/lib/R/library/translations/* -type d \ - \( \ - -name en -prune \ - -o -name de -prune \ - -o -name en@quot -prune \ - \) -o -exec rm -rf '{}' +; - -# Set default CRAN mirror -COPY Rprofile.site /etc/R/Rprofile.site - -# Install common dependencies -RUN set -eux; \ - R -e 'install.packages("jsonlite")'; \ - find /usr/lib/R/library -depth \ - \( \ - -type d -a \( -name doc -o -name html \) \ - \) -exec rm -rf '{}' +; \ - rm -rf /tmp/* /var/tmp/* - -# Setup TimeEval integration -VOLUME ["/data", "/results"] - -WORKDIR /app - -COPY entrypoint.sh /entrypoint.sh - -ENTRYPOINT [ "/entrypoint.sh" ] -CMD [ "execute-algorithm" ] diff --git a/0-base-images/r-base/LICENSE b/0-base-images/r-base/LICENSE deleted file mode 100644 index 739212c..0000000 --- a/0-base-images/r-base/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2020-2023 Phillip Wenig and Sebastian Schmidl - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/0-base-images/r-base/Rprofile.site b/0-base-images/r-base/Rprofile.site deleted file mode 100644 index 870e221..0000000 --- a/0-base-images/r-base/Rprofile.site +++ /dev/null @@ -1,5 +0,0 @@ -local({ - r <- getOption("repos") - r["CRAN"] <- "http://cran.r-project.org" - options(repos=r) -}) diff --git a/0-base-images/r-base/entrypoint.sh b/0-base-images/r-base/entrypoint.sh deleted file mode 100755 index d1ceb21..0000000 --- a/0-base-images/r-base/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -e - -# Check for algorithm main file -if [[ -z "$ALGORITHM_MAIN" ]]; then - echo 'No algorithm main file specified. Environment variable $ALGORITHM_MAIN is empty!' >&2 - echo "Add the following to your Dockerfile: 'ENV ALGORITHM_MAIN=/app/'" >&2 - exit 1 -fi - -# Create user with the supplied user ID and group ID to use the correct privileges on the mounted volumes -# -- more information at the end of the file. -Z_UID=0 -Z_GID=0 -if [[ ! -z "$LOCAL_UID" ]] && [[ ! -z "$LOCAL_GID" ]]; then - addgroup --quiet --gid "${LOCAL_GID}" group - adduser --quiet --gid "${LOCAL_GID}" --uid "${LOCAL_UID}" --no-create-home --disabled-password --disabled-login --gecos "" user - Z_UID=$LOCAL_UID - Z_GID=$LOCAL_GID - - # Reset owner:group of working directory - chown -R "$Z_UID:$Z_GID" . -fi - -# check and execute command -if [[ "$1" == "manifest" ]]; then - # output the algorithm manifest - cat /app/manifest.json - -elif [[ "$1" = "execute-algorithm" ]]; then - # run algorithm - shift - exec setpriv --reuid=$Z_UID --regid=$Z_GID --init-groups -- Rscript "$ALGORITHM_MAIN" "$@" - -else - # just run supplied command inside container - exec setpriv --reuid=$Z_UID --regid=$Z_GID --init-groups -- "$@" -fi - -# To forward the GID of the group "akita" and the UID of the current user to the docker container run: -# LOCAL_GID=$(getent group akita | cut -d ':' -f 3) -# LOCAL_UID=$(id -u) -# docker run -e LOCAL_GID -e LOCAL_UID this-image:latest id diff --git a/0-base-images/r-base/version.txt b/0-base-images/r-base/version.txt deleted file mode 100644 index 0d91a54..0000000 --- a/0-base-images/r-base/version.txt +++ /dev/null @@ -1 +0,0 @@ -0.3.0 diff --git a/README.md b/README.md index b55a757..cc7d96b 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ The namespace prefix (repository) for the built Docker images is `registry.gitla | [copod](./copod) | `registry.gitlab.hpi.de/akita/i/copod` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/pyod`](./1-intermediate-images/pyod) -> [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | unsupervised | multivariate | | [dae](./dae) (DeNoising Autoencoder) | `registry.gitlab.hpi.de/akita/i/dae` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | semi-supervised | multivariate | | [damp](./damp) | `registry.gitlab.hpi.de/akita/i/damp` | Python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | unsupervised | multivariate | -| [dbstream](./dbstream) | `registry.gitlab.hpi.de/akita/i/dbstream` | R 4.0.5 | [`registry.gitlab.hpi.de/akita/i/r4-base`](./0-base-images/r4-base) | unsupervised | multivariate +| [dbstream](./dbstream) | `registry.gitlab.hpi.de/akita/i/dbstream` | R 4.2.0 | [`registry.gitlab.hpi.de/akita/i/r4-base`](./0-base-images/r4-base) | unsupervised | multivariate | [deepant](./deepant) | `registry.gitlab.hpi.de/akita/i/deepant` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-torch`](./0-base-images/python3-torch) -> [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | semi-supervised | multivariate | | [deepnap](./deepnap) | `registry.gitlab.hpi.de/akita/i/deepnap` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-torch`](./0-base-images/python3-torch) -> [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | semi-supervised | multivariate | | [donut](./donut) | `registry.gitlab.hpi.de/akita/i/donut` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | semi-supervised | univariate | @@ -66,7 +66,7 @@ The namespace prefix (repository) for the built Docker images is `registry.gitla | [multi_hmm](./multi_hmm) | `registry.gitlab.hpi.de/akita/i/multi_hmm` | Python 3.7 |[`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | supervised | multivariate | | [multi_norma](./multi_norma) (_restricted access_) | `registry.gitlab.hpi.de/akita/i/multi_norma` | Python 3.7 |[`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | unsupervised | multivariate | | [multi_subsequence_lof](./multi_subsquence_lof) | `registry.gitlab.hpi.de/akita/i/multi_subsequence_lof` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/pyod`](./1-intermediate-images/pyod) -> [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | unsupervised | multivariate | -| [mvalmod](./mvalmod) | `registry.gitlab.hpi.de/akita/i/mvalmod` | R 3.5.2 | [`registry.gitlab.hpi.de/akita/i/tsmp`](./1-intermediate-images/tsmp) -> [`registry.gitlab.hpi.de/akita/i/r-base`](./0-base-images/r-base) | unsupervised | multivariate | +| [mvalmod](./mvalmod) | `registry.gitlab.hpi.de/akita/i/mvalmod` | R 4.2.0 | [`registry.gitlab.hpi.de/akita/i/tsmp`](./1-intermediate-images/tsmp) -> [`registry.gitlab.hpi.de/akita/i/r4-base`](./0-base-images/r4-base) | unsupervised | multivariate | | [norma](./norma) (_restricted access_) | `registry.gitlab.hpi.de/akita/i/norma` | Python 3.7 |[`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | unsupervised | univariate | | [normalizing_flows](./normalizing_flows) | `registry.gitlab.hpi.de/akita/i/normalizing_flows` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-torch`](./0-base-images/python3-torch) -> [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | supervised | multivariate | | [novelty_svr](./novelty_svr) | `registry.gitlab.hpi.de/akita/i/novelty_svr` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | unsupervised | univariate | @@ -76,7 +76,7 @@ The namespace prefix (repository) for the built Docker images is `registry.gitla | [pcc](./pcc) | `registry.gitlab.hpi.de/akita/i/pcc` | Python 3.7 | [`registry.gitlab.hpi.de/akita/i/pyod`](./1-intermediate-images/pyod) -> [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | unsupervised | multivariate | | [pci](./pci) | `registry.gitlab.hpi.de/akita/i/pci` | Python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | unsupervised | univariate | | [phasespace_svm](./phasespace_svm) | `registry.gitlab.hpi.de/akita/i/phasespace_svm` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | unsupervised | univariate | -| [pst](./pst) | `registry.gitlab.hpi.de/akita/i/pst` | R 3.5.2 | [`registry.gitlab.hpi.de/akita/i/r-base`](./0-base-images/r-base) | | +| [pst](./pst) | `registry.gitlab.hpi.de/akita/i/pst` | R 4.2.0 | [`registry.gitlab.hpi.de/akita/i/r4-base`](./0-base-images/r4-base) | | | [random_black_forest](./random_black_forest) | `registry.gitlab.hpi.de/akita/i/random_black_forest` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | semi-supervised | multivariate | | [robust_pca](./robust_pca) | `registry.gitlab.hpi.de/akita/i/robust_pca` | Python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | semi-supervised | multivariate | | [sand](./sand) (_restricted access_) | `registry.gitlab.hpi.de/akita/i/sand` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | unsupervised | univariate | @@ -86,8 +86,8 @@ The namespace prefix (repository) for the built Docker images is `registry.gitla | [sr](./sr) | `registry.gitlab.hpi.de/akita/i/sr` | Python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | unsupervised | univariate | | [sr_cnn](./sr_cnn) | `registry.gitlab.hpi.de/akita/i/sr_cnn` | Python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-torch`](./0-base-images/python3-base) | semi-supervised | univariate | | [ssa](./ssa) (_restricted access_) | `registry.gitlab.hpi.de/akita/i/ssa` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | semi-supervised | univariate | -| [stamp](./stamp) | `registry.gitlab.hpi.de/akita/i/stamp` | R 3.5.2 | [`registry.gitlab.hpi.de/akita/i/tsmp`](./1-intermediate-images/tsmp) -> [`registry.gitlab.hpi.de/akita/i/r-base`](./0-base-images/r-base) | unsupervised | univariate | -| [stomp](./stomp) | `registry.gitlab.hpi.de/akita/i/stomp` | R 3.5.2 | [`registry.gitlab.hpi.de/akita/i/tsmp`](./1-intermediate-images/tsmp) -> [`registry.gitlab.hpi.de/akita/i/r-base`](./0-base-images/r-base) | unsupervised | univariate | +| [stamp](./stamp) | `registry.gitlab.hpi.de/akita/i/stamp` | R 4.2.0 | [`registry.gitlab.hpi.de/akita/i/tsmp`](./1-intermediate-images/tsmp) -> [`registry.gitlab.hpi.de/akita/i/r4-base`](./0-base-images/r4-base) | unsupervised | univariate | +| [stomp](./stomp) | `registry.gitlab.hpi.de/akita/i/stomp` | R 4.2.0 | [`registry.gitlab.hpi.de/akita/i/tsmp`](./1-intermediate-images/tsmp) -> [`registry.gitlab.hpi.de/akita/i/r4-base`](./0-base-images/r4-base) | unsupervised | univariate | | [subsequence_fast_mcd](./subsequence_fast_mcd) | `registry.gitlab.hpi.de/akita/i/subsequence_fast_mcd` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | semi-supervised | univariate | | [subsequence_knn](./subsequence_knn) | `registry.gitlab.hpi.de/akita/i/subsequence_knn` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/pyod`](./1-intermediate-images/pyod) -> [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | unsupervised | multivariate | | [subsequence_if](./subsequence_if) | `registry.gitlab.hpi.de/akita/i/subsequence_if` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/pyod`](./1-intermediate-images/pyod) -> [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | unsupervised | univariate | @@ -98,7 +98,7 @@ The namespace prefix (repository) for the built Docker images is `registry.gitla | [torsk](./torsk) | `registry.gitlab.hpi.de/akita/i/torsk` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | unsupervised | multivariate | | [triple_es](./triple_es) | `registry.gitlab.hpi.de/akita/i/triple_es` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | unsupervised | univariate | | [ts_bitmap](./ts_bitmap) | `registry.gitlab.hpi.de/akita/i/ts_bitmap` | python 3.7 | [`registry.gitlab.hpi.de/akita/i/python3-base`](./0-base-images/python3-base) | unsupervised | univariate | -| [valmod](./valmod) | `registry.gitlab.hpi.de/akita/i/valmod` | R 3.5.2 | [`registry.gitlab.hpi.de/akita/i/tsmp`](./1-intermediate-images/tsmp) -> [`registry.gitlab.hpi.de/akita/i/r-base`](./0-base-images/r-base) | unsupervised | univariate | +| [valmod](./valmod) | `registry.gitlab.hpi.de/akita/i/valmod` | R 4.2.0 | [`registry.gitlab.hpi.de/akita/i/tsmp`](./1-intermediate-images/tsmp) -> [`registry.gitlab.hpi.de/akita/i/r4-base`](./0-base-images/r4-base) | unsupervised | univariate | ## Usage From 280ce7b5ad9e0387ec3c52a1b923a318268d2951 Mon Sep 17 00:00:00 2001 From: CodeLionX Date: Thu, 30 Nov 2023 15:48:11 +0100 Subject: [PATCH 3/4] chore: restore dbstream Dockerfile --- dbstream/Dockerfile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 dbstream/Dockerfile diff --git a/dbstream/Dockerfile b/dbstream/Dockerfile new file mode 100644 index 0000000..205bde3 --- /dev/null +++ b/dbstream/Dockerfile @@ -0,0 +1,17 @@ +FROM registry.gitlab.hpi.de/akita/i/r4-base:0.2.5 + +LABEL maintainer="richard.schulz@student.hpi.de" + +# install stream and other libraries and cleanup afterwards +RUN set -eux; \ + R -e 'install.packages("BBmisc")';\ + R -e 'install.packages("stream")';\ + find /usr/lib/R/library -depth \ + \( \ + -type d -a \( -name doc -o -name html \) \ + \) -exec rm -rf '{}' +; \ + rm -rf /tmp/* /var/tmp/* + +ENV ALGORITHM_MAIN="/app/algorithm.r" + +COPY . /app/ From efabb546d00406bc80fb2969fd0d6ffb9b41e5ab Mon Sep 17 00:00:00 2001 From: CodeLionX Date: Thu, 30 Nov 2023 15:44:29 +0100 Subject: [PATCH 4/4] feat: use r4-base for tsmp --- 1-intermediate-images/tsmp/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/1-intermediate-images/tsmp/Dockerfile b/1-intermediate-images/tsmp/Dockerfile index 2603bb0..2139251 100644 --- a/1-intermediate-images/tsmp/Dockerfile +++ b/1-intermediate-images/tsmp/Dockerfile @@ -1,11 +1,11 @@ -FROM ghcr.io/timeeval/r-base:0.3.0 +FROM ghcr.io/timeeval/r4-base:0.3.1 LABEL maintainer="sebastian.schmidl@hpi.de" # install tsmp library and cleanup afterwards RUN set -eux; \ - R -e 'install.packages("tsmp")'; \ - find /usr/lib/R/library -depth \ + R -e 'install_version("tsmp", version="0.4.15"); library("tsmp")'; \ + find /opt/R/${R_VERSION}/lib/R/library -depth \ \( \ -type d -a \( -name doc -o -name html \) \ \) -exec rm -rf '{}' +; \