From 35f8b59762d89595704d2d25fb733ad237c86746 Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Tue, 31 Oct 2023 14:05:55 -0400 Subject: [PATCH] chore: Update docker images for testing (#237) Co-authored-by: gadenbuie --- .github/workflows/apps-docker.yml | 4 ++-- R/docker.R | 2 +- R/test-in-sso.R | 6 +++--- man/test_in_ssossp.Rd | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/apps-docker.yml b/.github/workflows/apps-docker.yml index eba87dae63..0fab9283af 100644 --- 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 index 66ae06367e..73acde3f62 100644 --- 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 index 9801fc92d5..5ef8aa0887 100644 --- 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 index 88eaef640d..4acb29a9f2 100644 --- a/man/test_in_ssossp.Rd +++ b/man/test_in_ssossp.Rd @@ -10,7 +10,7 @@ test_in_sso( 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, @@ -24,7 +24,7 @@ test_in_ssp( ..., 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,