From ac8d54d878ad6043d9d3e42e548c97f9a0dcf2cd Mon Sep 17 00:00:00 2001
From: Greg Lin <glin@rstudio.com>
Date: Fri, 4 Feb 2022 12:40:45 -0600
Subject: [PATCH] Update serverless.yml and docker-compose.yml for jammy

---
 builder/docker-compose.yml | 11 +++++++++++
 serverless.yml             |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/builder/docker-compose.yml b/builder/docker-compose.yml
index ac9fc22..4b77fe5 100644
--- a/builder/docker-compose.yml
+++ b/builder/docker-compose.yml
@@ -34,6 +34,17 @@ services:
     image: r-builds:ubuntu-2004
     volumes:
       - ./integration/tmp:/tmp/output
+  ubuntu-2204:
+    command: ./build.sh
+    environment:
+      - R_VERSION=${R_VERSION}
+      - LOCAL_STORE=/tmp/output
+    build:
+      context: .
+      dockerfile: Dockerfile.ubuntu-2204
+    image: r-builds:ubuntu-2204
+    volumes:
+      - ./integration/tmp:/tmp/output
   debian-9:
     command: ./build.sh
     environment:
diff --git a/serverless.yml b/serverless.yml
index 09c787b..f268b38 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -41,6 +41,8 @@ provider:
       Ref: rBuildsBatchJobDefinitionUbuntu1804
     JOB_DEFINITION_ARN_ubuntu_2004:
       Ref: rBuildsBatchJobDefinitionUbuntu2004
+    JOB_DEFINITION_ARN_ubuntu_2204:
+      Ref: rBuildsBatchJobDefinitionUbuntu2204
     JOB_DEFINITION_ARN_debian_9:
       Ref: rBuildsBatchJobDefinitionDebian9
     JOB_DEFINITION_ARN_debian_10:
@@ -57,7 +59,7 @@ provider:
       Ref: rBuildsBatchJobDefinitionOpensuse152
     JOB_DEFINITION_ARN_opensuse_153:
       Ref: rBuildsBatchJobDefinitionOpensuse153
-    SUPPORTED_PLATFORMS: ubuntu-1604,ubuntu-1804,ubuntu-2004,debian-9,debian-10,centos-7,centos-8,opensuse-42,opensuse-15,opensuse-152,opensuse-153
+    SUPPORTED_PLATFORMS: ubuntu-1604,ubuntu-1804,ubuntu-2004,ubuntu-2204,debian-9,debian-10,centos-7,centos-8,opensuse-42,opensuse-15,opensuse-152,opensuse-153
 
 functions:
   queueBuilds: