Merge pull request #76 from rstudio/need-newer-ubuntu-for-rcheckserver

Add ubuntu 22.04 (jammy) support
glin · Apr 21, 2022 · 5c059fe · 5c059fe
2 parents 33c52b4 + 625305c
commit 5c059fe
Show file tree

Hide file tree

Showing 31 changed files with 378 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -71,6 +71,10 @@ jobs:
     <<: *build-images
     environment:
       VARIANTS: focal
+  jammy:
+    <<: *build-images
+    environment:
+      VARIANTS: jammy
   centos7:
     <<: *build-images
     environment:
@@ -97,6 +101,8 @@ workflows:
           <<: *branch-default
       - focal:
           <<: *branch-default
+      - jammy:
+          <<: *branch-default
       - centos7:
           <<: *branch-default
       - rockylinux8:
@@ -111,6 +117,8 @@ workflows:
           <<: *branch-main
       - focal:
           <<: *branch-main
+      - jammy:
+          <<: *branch-main
       - centos7:
           <<: *branch-main
       - rockylinux8:
@@ -132,6 +140,8 @@ workflows:
           <<: *r-devel
       - focal:
           <<: *r-devel
+      - jammy:
+          <<: *r-devel
       - centos7:
           <<: *r-devel
       - rockylinux8:
@@ -153,6 +163,8 @@ workflows:
           <<: *r-patch-versions
       - focal:
           <<: *r-patch-versions
+      - jammy:
+          <<: *r-patch-versions
       - centos7:
           <<: *r-patch-versions
       - rockylinux8:

diff --git a/3.1/jammy/Dockerfile b/3.1/jammy/Dockerfile
@@ -0,0 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=rstudio/r-base
+FROM ${BASE_IMAGE}:jammy
+
+ARG R_VERSION=3.1.3
+ARG OS_IDENTIFIER=ubuntu-2204
+
+# Install R
+RUN wget https://cdn.rstudio.com/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_amd64.deb && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -f -y ./r-${R_VERSION}_1_amd64.deb && \
+    ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \
+    ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \
+    ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
+    rm r-${R_VERSION}_1_amd64.deb && \
+    rm -rf /var/lib/apt/lists/*
+
+CMD ["R"]
diff --git a/3.1/jammy/docker-compose.test.yml b/3.1/jammy/docker-compose.test.yml
@@ -0,0 +1,5 @@
+sut:
+  build: .
+  volumes:
+    - ../../test:/test
+  command: /test/test.sh
diff --git a/3.1/jammy/hooks/post_push b/3.1/jammy/hooks/post_push
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+function add_tag() {
+    docker tag $IMAGE_NAME $DOCKER_REPO:$1
+    docker push $DOCKER_REPO:$1
+}
+
+add_tag 3.1.3-jammy
diff --git a/3.2/jammy/Dockerfile b/3.2/jammy/Dockerfile
@@ -0,0 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=rstudio/r-base
+FROM ${BASE_IMAGE}:jammy
+
+ARG R_VERSION=3.2.5
+ARG OS_IDENTIFIER=ubuntu-2204
+
+# Install R
+RUN wget https://cdn.rstudio.com/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_amd64.deb && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -f -y ./r-${R_VERSION}_1_amd64.deb && \
+    ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \
+    ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \
+    ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
+    rm r-${R_VERSION}_1_amd64.deb && \
+    rm -rf /var/lib/apt/lists/*
+
+CMD ["R"]
diff --git a/3.2/jammy/docker-compose.test.yml b/3.2/jammy/docker-compose.test.yml
@@ -0,0 +1,5 @@
+sut:
+  build: .
+  volumes:
+    - ../../test:/test
+  command: /test/test.sh
diff --git a/3.2/jammy/hooks/post_push b/3.2/jammy/hooks/post_push
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+function add_tag() {
+    docker tag $IMAGE_NAME $DOCKER_REPO:$1
+    docker push $DOCKER_REPO:$1
+}
+
+add_tag 3.2.5-jammy
diff --git a/3.3/jammy/Dockerfile b/3.3/jammy/Dockerfile
@@ -0,0 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=rstudio/r-base
+FROM ${BASE_IMAGE}:jammy
+
+ARG R_VERSION=3.3.3
+ARG OS_IDENTIFIER=ubuntu-2204
+
+# Install R
+RUN wget https://cdn.rstudio.com/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_amd64.deb && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -f -y ./r-${R_VERSION}_1_amd64.deb && \
+    ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \
+    ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \
+    ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
+    rm r-${R_VERSION}_1_amd64.deb && \
+    rm -rf /var/lib/apt/lists/*
+
+CMD ["R"]
diff --git a/3.3/jammy/docker-compose.test.yml b/3.3/jammy/docker-compose.test.yml
@@ -0,0 +1,5 @@
+sut:
+  build: .
+  volumes:
+    - ../../test:/test
+  command: /test/test.sh
diff --git a/3.3/jammy/hooks/post_push b/3.3/jammy/hooks/post_push
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+function add_tag() {
+    docker tag $IMAGE_NAME $DOCKER_REPO:$1
+    docker push $DOCKER_REPO:$1
+}
+
+add_tag 3.3.3-jammy
diff --git a/3.4/jammy/Dockerfile b/3.4/jammy/Dockerfile
@@ -0,0 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=rstudio/r-base
+FROM ${BASE_IMAGE}:jammy
+
+ARG R_VERSION=3.4.4
+ARG OS_IDENTIFIER=ubuntu-2204
+
+# Install R
+RUN wget https://cdn.rstudio.com/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_amd64.deb && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -f -y ./r-${R_VERSION}_1_amd64.deb && \
+    ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \
+    ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \
+    ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
+    rm r-${R_VERSION}_1_amd64.deb && \
+    rm -rf /var/lib/apt/lists/*
+
+CMD ["R"]
diff --git a/3.4/jammy/docker-compose.test.yml b/3.4/jammy/docker-compose.test.yml
@@ -0,0 +1,5 @@
+sut:
+  build: .
+  volumes:
+    - ../../test:/test
+  command: /test/test.sh
diff --git a/3.4/jammy/hooks/post_push b/3.4/jammy/hooks/post_push
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+function add_tag() {
+    docker tag $IMAGE_NAME $DOCKER_REPO:$1
+    docker push $DOCKER_REPO:$1
+}
+
+add_tag 3.4.4-jammy
diff --git a/3.5/jammy/Dockerfile b/3.5/jammy/Dockerfile
@@ -0,0 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=rstudio/r-base
+FROM ${BASE_IMAGE}:jammy
+
+ARG R_VERSION=3.5.3
+ARG OS_IDENTIFIER=ubuntu-2204
+
+# Install R
+RUN wget https://cdn.rstudio.com/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_amd64.deb && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -f -y ./r-${R_VERSION}_1_amd64.deb && \
+    ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \
+    ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \
+    ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
+    rm r-${R_VERSION}_1_amd64.deb && \
+    rm -rf /var/lib/apt/lists/*
+
+CMD ["R"]
diff --git a/3.5/jammy/docker-compose.test.yml b/3.5/jammy/docker-compose.test.yml
@@ -0,0 +1,5 @@
+sut:
+  build: .
+  volumes:
+    - ../../test:/test
+  command: /test/test.sh
diff --git a/3.5/jammy/hooks/post_push b/3.5/jammy/hooks/post_push
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+function add_tag() {
+    docker tag $IMAGE_NAME $DOCKER_REPO:$1
+    docker push $DOCKER_REPO:$1
+}
+
+add_tag 3.5.3-jammy
diff --git a/3.6/jammy/Dockerfile b/3.6/jammy/Dockerfile
@@ -0,0 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=rstudio/r-base
+FROM ${BASE_IMAGE}:jammy
+
+ARG R_VERSION=3.6.3
+ARG OS_IDENTIFIER=ubuntu-2204
+
+# Install R
+RUN wget https://cdn.rstudio.com/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_amd64.deb && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -f -y ./r-${R_VERSION}_1_amd64.deb && \
+    ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \
+    ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \
+    ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
+    rm r-${R_VERSION}_1_amd64.deb && \
+    rm -rf /var/lib/apt/lists/*
+
+CMD ["R"]
diff --git a/3.6/jammy/docker-compose.test.yml b/3.6/jammy/docker-compose.test.yml
@@ -0,0 +1,5 @@
+sut:
+  build: .
+  volumes:
+    - ../../test:/test
+  command: /test/test.sh
diff --git a/3.6/jammy/hooks/post_push b/3.6/jammy/hooks/post_push
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+function add_tag() {
+    docker tag $IMAGE_NAME $DOCKER_REPO:$1
+    docker push $DOCKER_REPO:$1
+}
+
+add_tag 3.6.3-jammy
diff --git a/4.0/jammy/Dockerfile b/4.0/jammy/Dockerfile
@@ -0,0 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=rstudio/r-base
+FROM ${BASE_IMAGE}:jammy
+
+ARG R_VERSION=4.0.5
+ARG OS_IDENTIFIER=ubuntu-2204
+
+# Install R
+RUN wget https://cdn.rstudio.com/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_amd64.deb && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -f -y ./r-${R_VERSION}_1_amd64.deb && \
+    ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \
+    ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \
+    ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
+    rm r-${R_VERSION}_1_amd64.deb && \
+    rm -rf /var/lib/apt/lists/*
+
+CMD ["R"]
diff --git a/4.0/jammy/docker-compose.test.yml b/4.0/jammy/docker-compose.test.yml
@@ -0,0 +1,5 @@
+sut:
+  build: .
+  volumes:
+    - ../../test:/test
+  command: /test/test.sh
diff --git a/4.0/jammy/hooks/post_push b/4.0/jammy/hooks/post_push
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+function add_tag() {
+    docker tag $IMAGE_NAME $DOCKER_REPO:$1
+    docker push $DOCKER_REPO:$1
+}
+
+add_tag 4.0.5-jammy
diff --git a/4.1/jammy/Dockerfile b/4.1/jammy/Dockerfile
@@ -0,0 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=rstudio/r-base
+FROM ${BASE_IMAGE}:jammy
+
+ARG R_VERSION=4.1.2
+ARG OS_IDENTIFIER=ubuntu-2204
+
+# Install R
+RUN wget https://cdn.rstudio.com/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_amd64.deb && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -f -y ./r-${R_VERSION}_1_amd64.deb && \
+    ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \
+    ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \
+    ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
+    rm r-${R_VERSION}_1_amd64.deb && \
+    rm -rf /var/lib/apt/lists/*
+
+CMD ["R"]
diff --git a/4.1/jammy/docker-compose.test.yml b/4.1/jammy/docker-compose.test.yml
@@ -0,0 +1,5 @@
+sut:
+  build: .
+  volumes:
+    - ../../test:/test
+  command: /test/test.sh
diff --git a/4.1/jammy/hooks/post_push b/4.1/jammy/hooks/post_push
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+function add_tag() {
+    docker tag $IMAGE_NAME $DOCKER_REPO:$1
+    docker push $DOCKER_REPO:$1
+}
+
+add_tag 4.1.2-jammy
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 BASE_IMAGE ?= rstudio/r-base
 VERSIONS ?= 3.1 3.2 3.3 3.4 3.5 3.6 4.0 4.1 devel
-VARIANTS ?= bionic focal centos7 rockylinux8 opensuse42 opensuse153
+VARIANTS ?= bionic focal jammy centos7 rockylinux8 opensuse42 opensuse153
 
 # PATCH_VERSIONS defines all actively maintained R patch versions.
 PATCH_VERSIONS ?= 3.1.3 3.2.5 3.3.3 3.4.4 3.5.3 \

diff --git a/README.md b/README.md
@@ -46,6 +46,7 @@ The following distributions are supported:
 | ------------- |-----------|
 | bionic        | Ubuntu 18.04 |
 | focal         | Ubuntu 20.04 |
+| jammy         | Ubuntu 22.04 |
 | centos7       | CentOS 7 |
 | rockylinux8   | Rocky Linux 8 |
 | opensuse42    | openSUSE 42.3 |