Try pushing to ghcr

.github/workflows/rworkflows_dev.yml

@@ -28,7 +28,7 @@ jobs:
         - os: ubuntu-latest
           r: devel
           bioc: devel
-          cont: bioconductor/bioconductor_docker:devel
+          cont:  ghcr.io/bioconductor/bioconductor_docker:devel
           rspm: https://packagemanager.rstudio.com/cran/__linux__/focal/release
         - os: macOS-latest
           r: latest

NEWS.md

@@ -19,6 +19,10 @@
 * *actions.yml*:
   - Add `force=TRUE` to the `remotes::install_local` steps. #86
   - Add `runforesight/workflow-telemetry-action` step.
+* `construct_cont`:
+  - Make registry explicit.
+  - New arg: `default_registry`
+  - New subfunction: `check_registry`
 
 ## Bug fixes
 

R/check_registry.R

@@ -0,0 +1,18 @@
+#' @title Check registry
+#' 
+#' @description Check that the registry is valid.
+#' @param registry A character vector of registry names.
+#' @returns A single registry name.
+#' 
+#' @keywords internal
+check_registry <- function(registry){
+  registry <- registry[1]
+  if(!is.null(registry)){
+    if(!grepl("/$",registry)){
+      registry <- paste0(registry,"/")
+    }
+    return(registry)
+  } else {
+    return(NULL)
+  }
+}

R/construct_cont.R

@@ -2,6 +2,12 @@
 #' 
 #' @param run_check_cont Check whether the requested container repo 
 #' (and the tag, if specified) exist using \link[rworkflows]{check_cont}.
+#' @param default_registry The default container registr to use.
+#' Options include:
+#' \itemize{
+#'  \item{"ghcr.io/" : }{\href{https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry}{GitHub Container Registry}}
+#'  \item{"docker.io/" : }{\href{https://hub.docker.com/}{DockerHub}}
+#' }
 #' @param default_cont The DockerHub container to default to.
 #' Used when it's detected that only the tag has been given in one or more 
 #' \code{cont} entry. 
@@ -13,7 +19,9 @@
 #' @importFrom stats setNames
 #' @examples
 #' cont <- construct_cont() 
-construct_cont <- function(default_cont = "bioconductor/bioconductor_docker",
+construct_cont <- function(default_registry = c("ghcr.io/",
+                                                "docker.io/"),
+                           default_cont = "bioconductor/bioconductor_docker",
                            default_tag = "devel",
                            cont = list(
                              paste(default_cont,default_tag,sep=":"),
@@ -24,6 +32,7 @@ construct_cont <- function(default_cont = "bioconductor/bioconductor_docker",
                            verbose = TRUE){
   # devoptera::args2vars(construct_cont)
 
+  default_registry <- check_registry(registry = default_registry)
   #### Remove any trailing : (e.g. when default_tag=NULL) ####
   cont <- lapply(cont, function(x){
     if(is.null(x)) NULL else trimws(x,whitespace = ":")
@@ -57,6 +66,19 @@ construct_cont <- function(default_cont = "bioconductor/bioconductor_docker",
     } 
     return(co)    
   })
+  #### Add registry ####
+  if(!is.null(default_registry)){
+    opts <- eval(formals(construct_cont)$default_registry)
+    cont2 <- lapply(cont2, function(co){
+      if(is.null(co)){
+        return(NULL)
+      } else if(!grepl(paste(paste0("^",opts),collapse = "|"),co)){
+        return(paste0(default_registry,co))
+      } else {
+        return(co)
+      }
+    })
+  } 
   #### Check that the Dockerhub repo exists ####
   if(isTRUE(run_check_cont)){
     check_cont(cont = cont2, 

action.yml

@@ -66,6 +66,13 @@ inputs:
     description: >
       Whether to build and push a Docker container to DockerHub.
     default: false
+  docker_registry: 
+    description: >
+      Docker container registry. 
+      Options include:
+      - ghcr.io/ : [GitHub Container Registry](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry}{GitHub Container Registry)
+      - docker.io/ : [DockerHub](https://hub.docker.com/) 
+    default: 'ghcr.io/'
   docker_user: 
     description: >
       DockerHub username. 
@@ -75,6 +82,8 @@ inputs:
   DOCKER_TOKEN:
     description: >
       DockerHub authentication token.
+    default:
+      '${{ secrets.DOCKER_TOKEN }}'
   GITHUB_TOKEN:
     description: >
       GitHub authentication token with permissions to push 
@@ -86,6 +95,8 @@ inputs:
       (e.g. {{ secrets.PAT_GITHUB }}) which allows access to private
       repositories. Read here for more details: 
       https://docs.github.com/en/actions/security-guides/automatic-token-authentication.
+    default:
+      '${{ secrets.GITHUB_TOKEN }}'
   cache_version: 
     description: >
       Which cache version to use. 
@@ -484,14 +495,14 @@ runs:
         path <- rworkflows::use_dockerfile()
       shell: Rscript {0} 
 
-    - name: Build and push to DockerHub 🐳 🚀
+    - name: Build and push to Docker registry 🐳 🚀
       if: |
         (!contains(github.event.head_commit.message, '/nodocker')) && inputs.run_docker == 'true' && runner.os == 'Linux'
       uses: docker/build-push-action@v1
       with:
         username: ${{ inputs.docker_user }}
         password: ${{ inputs.DOCKER_TOKEN }}
-        repository: ${{ inputs.docker_org }}/${{ env.packageName }}
+        repository: ${{ inputs.docker_registry }}/${{ inputs.docker_org }}/${{ env.packageName }}
         tag_with_ref: true
         tag_with_sha: false
         tags: ${{ env.packageVersion }},latest