Skip to content

Commit

Permalink
Upgraded r-4-minimal flavor to R 4.3
Browse files Browse the repository at this point in the history
- Upgraded base image to Ubuntu 22.04
- Updated packages to Ubuntu 22.04 compatible versions
- Adapted R UDF implementation to work with R 4.3 change
  "Calling if() or while() with a condition of length greater
  than one gives an error rather than a warning."
- Fixed R test network.py, because after upgrading to R 4.3
  putting a column from the UDFContext directly into
  the require function doesn't work.
  • Loading branch information
tkilias committed Jul 27, 2023
1 parent 60d36c4 commit 176bfc6
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion exaudfclient/extension/rcontainer/exascript_r_wrap.R
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ INTERNAL_CLEANUP_WRAPPER__ <- function() {
}

INTERNAL_SINGLE_CALL_WRAPPER__ <- function(name, argDTO=NA) {
if (is.na(argDTO)) {
if (any(is.na(argDTO))) {
return(do.call(name,list()))
} else {
return(do.call(name,list(argDTO)))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
gdb|8.1.1-0ubuntu1
valgrind|1:3.13.0-2ubuntu2.3
gdbserver|8.1.1-0ubuntu1
binutils|2.30-21ubuntu1~18.04.9
patchelf|0.9-1
chrpath|0.16-2
strace|4.21-1ubuntu1
gdb|12.1-0ubuntu1~22.04
valgrind|1:3.18.1-1ubuntu2
gdbserver|12.1-0ubuntu1~22.04
binutils|2.38-4ubuntu2.2
patchelf|0.14.3-1
strace|5.16-0ubuntu3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:22.04
ENV DEBIAN_FRONTEND=noninteractive

ENV ARCHIVE_UBUNTU_PREFIX=""
Expand All @@ -14,7 +14,7 @@ ENV BAZEL_PACKAGE_VERSION="5.2.0"
ENV BAZEL_PACKAGE_FILE="bazel_$BAZEL_PACKAGE_VERSION-linux-x86_64.deb"
ENV BAZEL_PACKAGE_URL="https://github.com/bazelbuild/bazel/releases/download/$BAZEL_PACKAGE_VERSION/$BAZEL_PACKAGE_FILE"

RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/build_deps/apt_get_packages
RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/build_deps/apt_get_packages --with-versions

RUN apt-get -y update && \
curl -L --output "$BAZEL_PACKAGE_FILE" "$BAZEL_PACKAGE_URL" && \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
coreutils|8.28-1ubuntu1
locales|2.27-3ubuntu1.6
tar|1.29b-2ubuntu0.4
curl|7.58.0-2ubuntu3.24
openjdk-11-jdk|11.0.19+7~us1-0ubuntu1~18.04.1
build-essential|12.4ubuntu1
libpcre3-dev|2:8.39-9
protobuf-compiler|3.0.0-9.1ubuntu1
coreutils|8.32-4.1ubuntu1
locales|2.35-0ubuntu3.1
tar|1.34+dfsg-1ubuntu0.1.22.04.1
curl|7.81.0-1ubuntu1.10
openjdk-11-jdk|11.0.19+7~us1-0ubuntu1~22.04.1
build-essential|12.9ubuntu3
libpcre3-dev|2:8.39-13ubuntu0.22.04.1
protobuf-compiler|3.12.4-1ubuntu7.22.04.1
chrpath|0.16-2
python3|3.10.6-1~22.04
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
coreutils|8.28-1ubuntu1
locales|2.27-3ubuntu1.6
unzip|6.0-21ubuntu1.2
wget|1.19.4-1ubuntu2.2
git|1:2.17.1-1ubuntu0.18
coreutils|8.32-4.1ubuntu1
locales|2.35-0ubuntu3.1
unzip|6.0-26ubuntu3.1
wget|1.21.2-2ubuntu1
git|1:2.34.1-1ubuntu1.9
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ COPY language_deps/packages /build_info/packages/language_deps

RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/language_deps/apt_get_packages --with-versions
RUN /scripts/install_scripts/install_key.pl --key-server hkp://keyserver.ubuntu.com:80 --key E298A3A825C0D65DFD57CBB651716619E084DAB9 && \
/scripts/install_scripts/install_ppa.pl --ppa 'deb https://cloud.r-project.org/bin/linux/ubuntu bionic-cran40/' --out-file 'bionic-cran40'
/scripts/install_scripts/install_ppa.pl --ppa 'deb https://cloud.r-project.org/bin/linux/ubuntu jammy-cran40/' --out-file 'jammy-cran40'
RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/language_deps/apt_get_packages_r --with-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ca-certificates|20230311ubuntu0.18.04.1
curl|7.58.0-2ubuntu3.24
ca-certificates|20230311ubuntu0.22.04.1
curl|7.81.0-1ubuntu1.10
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
r-base-core|4.1.2-1.1804.0
r-base-dev|4.1.2-1.1804.0
r-base-core|4.3.0-1.2204.0
r-base-dev|4.3.0-1.2204.0
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:22.04
RUN mkdir /conf /buckets

COPY --from={{language_deps}} /usr /usr
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:22.04
ENV DEBIAN_FRONTEND=noninteractive

ENV ARCHIVE_UBUNTU_PREFIX=""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
coreutils|8.28-1ubuntu1
locales|2.27-3ubuntu1.6
libnss-db|2.2.3pre1-6build2
libzmq3-dev|4.2.5-1ubuntu0.2
libprotobuf-dev|3.0.0-9.1ubuntu1.1
libssl-dev|1.1.1-1ubuntu2.1~18.04.23
coreutils|8.32-4.1ubuntu1
locales|2.35-0ubuntu3.1
libnss-db|2.2.3pre1-6ubuntu3
libzmq3-dev|4.3.4-2
libprotobuf-dev|3.12.4-1ubuntu7.22.04.1
libssl-dev|3.0.2-0ubuntu1.9
2 changes: 1 addition & 1 deletion script-languages

0 comments on commit 176bfc6

Please sign in to comment.