enable app from container #40

NAMESPACE

@@ -2,4 +2,5 @@
 
 export(az_webapp_config)
 export(az_webapp_shiny_opts)
+export(get_tag)
 export(runOldFaithful)

R/azure.R

@@ -63,7 +63,7 @@ az_webapp_config <- function(name,
                              restart = FALSE) {
   checkmate::assert_string(name)
   checkmate::assert_string(deployment_container_image_name)
-  checkmate::assert_string(startup_file, )
+  checkmate::assert_string(startup_file, null.ok = TRUE)
   checkmate::assert_string(subscription)
   checkmate::assert_string(resource_group)
   checkmate::assert_string(docker_registry_server_url, null.ok = TRUE)
@@ -95,7 +95,21 @@ az_webapp_config <- function(name,
     "webapp", "create",
     "--name", name,
     "--plan", plan,
+    # az webapp create, though undocumented, requires either an image name or a runtime
+    # other container settings are set below
     "--deployment-container-image-name", deployment_container_image_name,
+    if (!is.null(startup_file)) {
+      c("--startup-file", startup_file)
+    }
+    # todo also pass on tags #25
+  ))
+
+  cli::cli_alert_info("Setting web app container settings")
+  az_cli_run(args = c(
+    "webapp", "config", "container", "set",
+    # redundant, container is already set above, but safer\
+    # otherwise command might be called with no args
+    "--docker-custom-image-name", deployment_container_image_name,
     if (!is.null(docker_registry_server_url)) {
       c("--docker-registry-server-url", docker_registry_server_url)
     },
@@ -104,11 +118,7 @@ az_webapp_config <- function(name,
     },
     if (!is.null(docker_registry_server_password)) {
       c("--docker-registry-server-password", docker_registry_server_password)
-    },
-    if (!is.null(startup_file)) {
-      c("--startup-file", startup_file)
     }
-    # todo also pass on tags #25
   ))
 
   cli::cli_alert_info("Setting web app tags ...")

R/helpers.R

@@ -0,0 +1,20 @@
+#' Use `github.sha` environment variable or `"latest"` as docker image tag
+#'
+#' Retrieves the current git commit SHA from the [`github.sha`](https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions) environment variable set on GitHub Actions.
+#' Returns `latest`, if the environment variable is an empty string.
+#' Internal function used to retrieve the appropriate docker image tag for a shiny app.
+#'
+#' @return character string
+#'
+#' @export
+#'
+#' @keywords internal
+get_tag <- function() {
+  sha <- Sys.getenv("gihub.sha")
+  if (sha == "") {
+    tag <- "latest"
+  } else {
+    tag <- sha
+  }
+  tag
+}

tests/testthat/setup-azure.R

@@ -1,3 +1,9 @@
+# hoad credentials used for testing
+# authentication happens outside of r, see github actions main.yaml
+plan <- "hoad"
+resource_group <- "hoad"
+subscription <- "f0dd3a37-0a4e-4e7f-9c9b-cb9f60146edc"
+
 # deploy shiny app using rocker image
 az_webapp_config(
   name = "hello-shiny",
@@ -15,18 +21,22 @@ az_webapp_config(
     "-e shiny::runExample('01_hello',port=getOption('shiny.port'))"
   ),
   # replace below with your own credentials
-  plan = "hoad",
-  resource_group = "hoad",
-  subscription = "f0dd3a37-0a4e-4e7f-9c9b-cb9f60146edc"
+  plan = plan,
+  resource_group = resource_group,
+  subscription = subscription
 )
 
 # deploy shiny app using muggle image
-# az_webapp_config(
-#   name = "old-faithful",
-#   deployment_container_image_name = "docker.pkg.github.com/subugoe/shinycaas/oldfaithful",
-#   plan = "hoad",
-#   resource_group = "hoad",
-#   subscription = "f0dd3a37-0a4e-4e7f-9c9b-cb9f60146edc",
-#   docker_registry_server_url = "https://docker.pkg.github.com",
-#   docker_registry_server_user = "maxheld83"
-# )
+az_webapp_config(
+  name = "old-faithful",
+  deployment_container_image_name = paste0(
+    "docker.pkg.github.com/subugoe/shinycaas/oldfaithful:",
+    get_tag()
+  ),
+  plan = plan,
+  resource_group = resource_group,
+  subscription = subscription,
+  docker_registry_server_url = "https://docker.pkg.github.com",
+  docker_registry_server_user = "maxheld83"
+  # docker password is a GITHUB PAT, pasted directly into portal.azure.com
+)