From 5befac975c02d291044d4e8dcbaa755f6e15ed12 Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Sun, 30 Apr 2023 00:14:25 -0700 Subject: [PATCH 01/20] Update global.R --- inst/app/global.R | 2 ++ 1 file changed, 2 insertions(+) diff --git a/inst/app/global.R b/inst/app/global.R index 67bdc38..0d4aa45 100644 --- a/inst/app/global.R +++ b/inst/app/global.R @@ -1,3 +1,5 @@ +print(ShinyDocker::directory_settings()) + main_exists <- any(ls() == "main") if (main_exists) { From 5f25afb844452d06a806160c2a63a9f904c9e02c Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Sun, 30 Apr 2023 00:22:51 -0700 Subject: [PATCH 02/20] Update global.R --- inst/app/global.R | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/inst/app/global.R b/inst/app/global.R index 0d4aa45..31d197f 100644 --- a/inst/app/global.R +++ b/inst/app/global.R @@ -1,5 +1,3 @@ -print(ShinyDocker::directory_settings()) - main_exists <- any(ls() == "main") if (main_exists) { @@ -8,6 +6,7 @@ if (main_exists) { main <- ".." +global <- ShinyDocker::global_list(main = main) onStop(function( ) { rm(main, inherits = TRUE) From 2d758f3bca3395068b23f7a13f61e359d73d2b5c Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Sun, 30 Apr 2023 00:32:16 -0700 Subject: [PATCH 03/20] Update global.R --- inst/app/global.R | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/inst/app/global.R b/inst/app/global.R index 31d197f..e21dbf3 100644 --- a/inst/app/global.R +++ b/inst/app/global.R @@ -1,3 +1,4 @@ +global <- ShinyDocker::global_list(main = main) main_exists <- any(ls() == "main") if (main_exists) { @@ -6,8 +7,6 @@ if (main_exists) { main <- ".." -global <- ShinyDocker::global_list(main = main) - onStop(function( ) { rm(main, inherits = TRUE) if (main_exists) { From 42e4bebc292ef49afa5bbea76eae37b2955bc61a Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Sun, 30 Apr 2023 00:40:26 -0700 Subject: [PATCH 04/20] n --- R/webapp_ui.R | 2 +- inst/app/global.R | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/R/webapp_ui.R b/R/webapp_ui.R index 01c1d0d..2e6252b 100644 --- a/R/webapp_ui.R +++ b/R/webapp_ui.R @@ -26,7 +26,7 @@ NULL #' app_ui <- function ( ) { - fluidPage(titlePanel("Hi how are you?"), + fluidPage(titlePanel("Hi, how are you?"), title = "ShinyDocker", theme = app_theme( )) diff --git a/inst/app/global.R b/inst/app/global.R index e21dbf3..3ae89ec 100644 --- a/inst/app/global.R +++ b/inst/app/global.R @@ -1,4 +1,3 @@ -global <- ShinyDocker::global_list(main = main) main_exists <- any(ls() == "main") if (main_exists) { From f0a224f062733f570d29d4d4e058541cccd3a383 Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Mon, 1 May 2023 14:03:10 -0700 Subject: [PATCH 05/20] v --- .Rbuildignore | 2 +- .github/workflows/docker-publish.yml | 29 ++++++++++++++-------------- docker/Dockerfile => Dockerfile | 0 docker/README.md | 7 ------- 4 files changed, 15 insertions(+), 23 deletions(-) rename docker/Dockerfile => Dockerfile (100%) delete mode 100644 docker/README.md diff --git a/.Rbuildignore b/.Rbuildignore index da9b4c3..762b29e 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -12,7 +12,7 @@ ^inst/WORDLIST$ ^codecov\.yml$ ^docs$ -^docker$ +Dockerfile ^\.github$ ^pkgdown$ ^codemeta\.json$ \ No newline at end of file diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 7eaa2e5..283b199 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -18,13 +18,9 @@ jobs: matrix: include: - - dockerfile: docker/Dockerfile - image: dapperstats/shinydocker - image_name: base + - image_name: base tag_prefix: '' - - dockerfile: docker/Dockerfile - image: dapperstats/shinydocker - image_name: app + - image_name: app tag_prefix: app_ runs-on: ubuntu-latest @@ -40,15 +36,19 @@ jobs: packages: write steps: - - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v3 - - uses: r-lib/actions/setup-pandoc@v2 + - name: Set up pandoc + uses: r-lib/actions/setup-pandoc@v2 - - uses: r-lib/actions/setup-r@v2 + - name: Set up R from public RSPM + uses: r-lib/actions/setup-r@v2 with: use-public-rspm: true - - uses: r-lib/actions/setup-r-dependencies@v2 + - name: Install R package and external library dependnencies + uses: r-lib/actions/setup-r-dependencies@v2 with: extra-packages: any::rcmdcheck needs: check @@ -67,7 +67,7 @@ jobs: id: meta uses: docker/metadata-action@v4 with: - images: ${{ matrix.image }} + images: dapperstats/shinydocker tags: | type=raw,value=${{ matrix.tag_prefix }}latest type=semver,pattern={{raw}},prefix=${{ matrix.tag_prefix }} @@ -79,7 +79,6 @@ jobs: push: ${{ github.event_name == 'release' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - file: ${{ matrix.dockerfile }} load: true build-args: | "event_sha=${{ github.sha }}" @@ -89,8 +88,8 @@ jobs: "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" - name: Deploy app - if: ${{ matrix.image_name == 'app' }} + if: ${{ matrix.image_name == 'app' }} +# if: ${{ matrix.image_name == 'app' && github.event_name == 'release'}} run: | docker run --rm dapperstats/shinydocker:app_latest - - +# docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" \ No newline at end of file diff --git a/docker/Dockerfile b/Dockerfile similarity index 100% rename from docker/Dockerfile rename to Dockerfile diff --git a/docker/README.md b/docker/README.md deleted file mode 100644 index a4ef086..0000000 --- a/docker/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# `ShinyDocker` - -[![License](http://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/dapperstats/ShinyDocker/main/LICENSE) -[![Lifecycle:maturing](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing) - - -Images are built using the `Docker` GitHub Action \ No newline at end of file From aa696060f90f7e0822b92fe74d03b7d773d9067f Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Mon, 1 May 2023 14:10:08 -0700 Subject: [PATCH 06/20] m --- .github/workflows/docker-publish.yml | 4 ++-- R/webapp_ui.R | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 283b199..a2d372d 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -91,5 +91,5 @@ jobs: if: ${{ matrix.image_name == 'app' }} # if: ${{ matrix.image_name == 'app' && github.event_name == 'release'}} run: | - docker run --rm dapperstats/shinydocker:app_latest -# docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" \ No newline at end of file +# docker run --rm dapperstats/shinydocker:app_latest + docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" \ No newline at end of file diff --git a/R/webapp_ui.R b/R/webapp_ui.R index 2e6252b..d048344 100644 --- a/R/webapp_ui.R +++ b/R/webapp_ui.R @@ -26,7 +26,7 @@ NULL #' app_ui <- function ( ) { - fluidPage(titlePanel("Hi, how are you?"), + fluidPage(titlePanel("Hi, how are you? -DJ"), title = "ShinyDocker", theme = app_theme( )) From ec6ba63ff91919dab61696150bbd076b7e9fdc34 Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Mon, 1 May 2023 14:11:53 -0700 Subject: [PATCH 07/20] Update docker-publish.yml --- .github/workflows/docker-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index a2d372d..283b199 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -91,5 +91,5 @@ jobs: if: ${{ matrix.image_name == 'app' }} # if: ${{ matrix.image_name == 'app' && github.event_name == 'release'}} run: | -# docker run --rm dapperstats/shinydocker:app_latest - docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" \ No newline at end of file + docker run --rm dapperstats/shinydocker:app_latest +# docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" \ No newline at end of file From 3288310e82021d3e45d2664b76d9afbeaa6e9852 Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Mon, 1 May 2023 14:12:39 -0700 Subject: [PATCH 08/20] Update docker-publish.yml --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 283b199..9722356 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -91,5 +91,5 @@ jobs: if: ${{ matrix.image_name == 'app' }} # if: ${{ matrix.image_name == 'app' && github.event_name == 'release'}} run: | - docker run --rm dapperstats/shinydocker:app_latest + docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" # docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" \ No newline at end of file From 865b73289fa1f7d5446c72e4f70a6af69909896e Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Mon, 1 May 2023 14:13:46 -0700 Subject: [PATCH 09/20] Update docker-publish.yml --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 9722356..86dec49 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -91,5 +91,5 @@ jobs: if: ${{ matrix.image_name == 'app' }} # if: ${{ matrix.image_name == 'app' && github.event_name == 'release'}} run: | - docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" + docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" # docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" \ No newline at end of file From d344fc6fee908ad8b5d419ed93fff23e95c8b4e9 Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Mon, 1 May 2023 14:14:33 -0700 Subject: [PATCH 10/20] Update docker-publish.yml --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 86dec49..6e7c40b 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -91,5 +91,5 @@ jobs: if: ${{ matrix.image_name == 'app' }} # if: ${{ matrix.image_name == 'app' && github.event_name == 'release'}} run: | - docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" + docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" # docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" \ No newline at end of file From 3ece2e96773998b5468b91dfef0e9509c3098524 Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Mon, 1 May 2023 14:16:18 -0700 Subject: [PATCH 11/20] Update docker-publish.yml --- .github/workflows/docker-publish.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 6e7c40b..1134e8a 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -91,5 +91,4 @@ jobs: if: ${{ matrix.image_name == 'app' }} # if: ${{ matrix.image_name == 'app' && github.event_name == 'release'}} run: | - docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" -# docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" \ No newline at end of file + docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" \ No newline at end of file From 9f22efe0eef5e4c5ef98a601b6a4e0ee19cd52ad Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Mon, 1 May 2023 14:17:48 -0700 Subject: [PATCH 12/20] j --- .github/workflows/docker-publish.yml | 3 --- Dockerfile | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 1134e8a..17824f8 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -83,9 +83,6 @@ jobs: build-args: | "event_sha=${{ github.sha }}" "image_name=${{ matrix.image_name }}" - "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" - "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" - "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" - name: Deploy app if: ${{ matrix.image_name == 'app' }} diff --git a/Dockerfile b/Dockerfile index e2b67b9..b7ad9de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,9 +21,9 @@ ARG SHINY_ACCOUNT "" ARG SHINY_TOKEN "" ARG SHINY_SECRET "" -ENV SHINY_ACCOUNT=$SHINY_ACCOUNT -ENV SHINY_TOKEN=$SHINY_TOKEN -ENV SHINY_SECRET=$SHINY_SECRET +ENV SHINY_ACCOUNT="" +ENV SHINY_TOKEN="" +ENV SHINY_SECRET="" From 8a45cb1a016e94590600c3d9925b4c932328dd6c Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Mon, 1 May 2023 14:24:39 -0700 Subject: [PATCH 13/20] Update docker-publish.yml --- .github/workflows/docker-publish.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 17824f8..b992eb7 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -88,4 +88,6 @@ jobs: if: ${{ matrix.image_name == 'app' }} # if: ${{ matrix.image_name == 'app' && github.event_name == 'release'}} run: | - docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" \ No newline at end of file + docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" + +# -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" \ No newline at end of file From f21049e0cddf9d52db62a09107acf3d4898202b8 Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Mon, 1 May 2023 14:26:47 -0700 Subject: [PATCH 14/20] Update docker-publish.yml --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index b992eb7..9f895ac 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -88,6 +88,6 @@ jobs: if: ${{ matrix.image_name == 'app' }} # if: ${{ matrix.image_name == 'app' && github.event_name == 'release'}} run: | - docker run --rm dapperstats/shinydocker:app_latest -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" + docker run -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" --rm dapperstats/shinydocker:app_latest # -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" \ No newline at end of file From d0a49d26ce541d134ec72306e30a4f02a5fcb826 Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Mon, 1 May 2023 14:32:30 -0700 Subject: [PATCH 15/20] Update docker-publish.yml --- .github/workflows/docker-publish.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 9f895ac..773f305 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -88,6 +88,4 @@ jobs: if: ${{ matrix.image_name == 'app' }} # if: ${{ matrix.image_name == 'app' && github.event_name == 'release'}} run: | - docker run -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" --rm dapperstats/shinydocker:app_latest - -# -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" \ No newline at end of file + docker run -e "SHINY_ACCOUNT=${{ secrets.SHINY_ACCOUNT }}" -e "SHINY_TOKEN=${{ secrets.SHINY_TOKEN }}" -e "SHINY_SECRET=${{ secrets.SHINY_SECRET }}" --rm dapperstats/shinydocker:app_latest \ No newline at end of file From 757bcaeb2c60c430bb2763c478662f8122a676a2 Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Mon, 1 May 2023 14:38:14 -0700 Subject: [PATCH 16/20] Update webapp.R --- R/webapp.R | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/R/webapp.R b/R/webapp.R index 49828f7..ba9fbab 100644 --- a/R/webapp.R +++ b/R/webapp.R @@ -36,6 +36,11 @@ deploy_app <- function(main = ".") { token = Sys.getenv("SHINY_TOKEN"), secret = Sys.getenv("SHINY_SECRET"), server = "shinyapps.io") +messageq(break_lines(5)) +print(list.files()) +messageq(break_lines()) +print(list.files("..")) + deployApp(appDir = app_path(main = main), forceUpdate = TRUE, appName = "ShinyDocker") From aa23fdc2f8c8f13878cd4cfa475d06f8707597ac Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Mon, 1 May 2023 14:48:57 -0700 Subject: [PATCH 17/20] g --- R/webapp.R | 5 ----- R/webapp_server.R | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/R/webapp.R b/R/webapp.R index ba9fbab..49828f7 100644 --- a/R/webapp.R +++ b/R/webapp.R @@ -36,11 +36,6 @@ deploy_app <- function(main = ".") { token = Sys.getenv("SHINY_TOKEN"), secret = Sys.getenv("SHINY_SECRET"), server = "shinyapps.io") -messageq(break_lines(5)) -print(list.files()) -messageq(break_lines()) -print(list.files("..")) - deployApp(appDir = app_path(main = main), forceUpdate = TRUE, appName = "ShinyDocker") diff --git a/R/webapp_server.R b/R/webapp_server.R index b494231..ccda5f7 100644 --- a/R/webapp_server.R +++ b/R/webapp_server.R @@ -36,6 +36,11 @@ app_server <- function (input, output <- initial_output(rv = rv, output = output) +messageq(break_lines(5)) +print(list.files()) +messageq(break_lines()) +print(list.files("..")) + } From 10612af36a8e2b024de4978db435c0b9a658a7b9 Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Mon, 1 May 2023 14:57:07 -0700 Subject: [PATCH 18/20] Update webapp.R --- R/webapp.R | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/R/webapp.R b/R/webapp.R index 49828f7..843f19b 100644 --- a/R/webapp.R +++ b/R/webapp.R @@ -37,7 +37,10 @@ deploy_app <- function(main = ".") { secret = Sys.getenv("SHINY_SECRET"), server = "shinyapps.io") - deployApp(appDir = app_path(main = main), forceUpdate = TRUE, appName = "ShinyDocker") + deployApp(appDir = app_path(main = main), + forceUpdate = TRUE, + appName = "ShinyDocker", + image = "dapperstats/shinydocker") } From 60995b870d7f86ab34b00e9e8aa448009c029acd Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Mon, 1 May 2023 15:04:38 -0700 Subject: [PATCH 19/20] c --- R/webapp.R | 3 +-- R/webapp_ui.R | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/R/webapp.R b/R/webapp.R index 843f19b..a0dcb6a 100644 --- a/R/webapp.R +++ b/R/webapp.R @@ -39,8 +39,7 @@ deploy_app <- function(main = ".") { deployApp(appDir = app_path(main = main), forceUpdate = TRUE, - appName = "ShinyDocker", - image = "dapperstats/shinydocker") + appName = "ShinyDocker") } diff --git a/R/webapp_ui.R b/R/webapp_ui.R index d048344..2e6252b 100644 --- a/R/webapp_ui.R +++ b/R/webapp_ui.R @@ -26,7 +26,7 @@ NULL #' app_ui <- function ( ) { - fluidPage(titlePanel("Hi, how are you? -DJ"), + fluidPage(titlePanel("Hi, how are you?"), title = "ShinyDocker", theme = app_theme( )) From de86d7f1d865e75700cbfb426a8c636b619ae34a Mon Sep 17 00:00:00 2001 From: Juniper Simonis Date: Tue, 2 May 2023 13:32:06 -0700 Subject: [PATCH 20/20] Update webapp.R --- R/webapp.R | 1 + 1 file changed, 1 insertion(+) diff --git a/R/webapp.R b/R/webapp.R index a0dcb6a..b34acfd 100644 --- a/R/webapp.R +++ b/R/webapp.R @@ -38,6 +38,7 @@ deploy_app <- function(main = ".") { server = "shinyapps.io") deployApp(appDir = app_path(main = main), + appFiles = "..", forceUpdate = TRUE, appName = "ShinyDocker")