diff --git a/action.yml b/action.yml index 8e7c853f..0d78967a 100644 --- a/action.yml +++ b/action.yml @@ -456,7 +456,7 @@ runs: dockerRegistry: ${{ inputs.docker_registry }} dockerOrg: ${{ inputs.docker_org }} dockerUser: ${{ inputs.docker_user }} - dockerPass: ${{ inputs.DOCKER_TOKEN }} + DOCKER_TOKEN: ${{ inputs.DOCKER_TOKEN }} GITHUB_TOKEN: ${{ inputs.GITHUB_TOKEN }} run: | #### Docker repos must be lowercase (,,) #### @@ -475,7 +475,7 @@ runs: if [[ $dockerRegistry == "docker.io" ]]; then echo "dockerOrg=${dockerOrg,,}" >> $GITHUB_ENV echo "dockerUser=${dockerUser}" >> $GITHUB_ENV - echo "dockerPass=${dockerPass}" >> $GITHUB_ENV; + echo "dockerPass=${DOCKER_TOKEN}" >> $GITHUB_ENV; else echo "dockerOrg=${GITHUB_REPOSITORY_OWNER,,}" >> $GITHUB_ENV echo "dockerUser=${GITHUB_ACTOR}" >> $GITHUB_ENV diff --git a/inst/templates/Dockerfile b/inst/templates/Dockerfile index 844165a5..37ebd02f 100644 --- a/inst/templates/Dockerfile +++ b/inst/templates/Dockerfile @@ -49,5 +49,5 @@ RUN Rscript -e 'options(download.file.method="libcurl", crayon.enabled=TRUE, tim if(!require("BiocManager")) install.packages("BiocManager"); \ if(!require("remotes")) install.packages("remotes"); \ repos <- BiocManager::repositories(); \ - remotes::install_local(repos=repos, dependencies=TRUE, build_vignettes=FALSE, upgrade=TRUE, force=FALSE);' + remotes::install_local(repos=repos, dependencies=TRUE, build_vignettes=FALSE, upgrade=TRUE, force=TRUE);' RUN rm -rf /$PKG