chore: Update docker images for testing (#237)

Co-authored-by: gadenbuie <[email protected]>
rstudio · Oct 31, 2023 · 35f8b59 · 35f8b59
1 parent 9fcb7b2
commit 35f8b59
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/apps-docker.yml b/.github/workflows/apps-docker.yml
@@ -44,9 +44,9 @@ jobs:
           # - workdir: inst/Docker/centos
           #   type: centos7
           - workdir: inst/Docker/ubuntu
-            type: focal
+            type: jammy
           - workdir: inst/Docker/ubuntu
-            type: bionic
+            type: focal
 
     steps:
       - name: Short R version and SHA

diff --git a/R/docker.R b/R/docker.R
@@ -23,7 +23,7 @@ docker_clean <- function(stopped_containers = TRUE, untagged_images = TRUE) {
 
 docker_run_server <- function(
   type = c("sso", "ssp"),
-  release = c("focal", "bionic", "centos7"),
+  release = c("jammy", "focal", "centos7"),
   license_file = NULL,
   port = switch(type,
                 sso = switch(release, "centos7" = 7878, 3838),

diff --git a/R/test-in-sso.R b/R/test-in-sso.R
@@ -31,7 +31,7 @@ test_in_sso <- function(
   apps = apps_manual,
   ...,
   user = github_user(),
-  release = c("focal", "bionic", "centos7"),
+  release = c("jammy", "focal", "centos7"),
   r_version = c("4.3", "4.2", "4.1", "4.0", "3.6"),
   tag = NULL,
   port = 8080,
@@ -62,7 +62,7 @@ test_in_ssp <- function(
   ...,
   license_file = NULL,
   user = github_user(),
-  release = c("focal", "bionic", "centos7"),
+  release = c("jammy", "focal", "centos7"),
   r_version = c("4.3", "4.2", "4.1", "4.0", "3.6"),
   tag = NULL,
   port = 8080,
@@ -94,7 +94,7 @@ test_in_ssossp <- function(
   app_name = apps[1],
   apps = apps_manual,
   type = c("sso", "ssp"),
-  release = c("focal", "bionic", "centos7"),
+  release = c("jammy", "focal", "centos7"),
   license_file = NULL,
   port_background = switch(type,
                 sso = switch(release, "centos7" = 7878, 3838),

diff --git a/man/test_in_ssossp.Rd b/man/test_in_ssossp.Rd