Skip to content

Commit

Permalink
factor out az, upgrade muggle
Browse files Browse the repository at this point in the history
  • Loading branch information
maxheld83 committed Nov 23, 2020
1 parent 836b501 commit 558daf1
Show file tree
Hide file tree
Showing 27 changed files with 255 additions and 1,320 deletions.
15 changes: 6 additions & 9 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
^shinycaas\.Rproj$
^\.Rproj\.user$
^LICENSE\.md$
[.]code-workspace$
^codecov\.yml$
^.*\.Rproj$
^\.github$
^CODE_OF_CONDUCT\.md$
^_pkgdown\.yml$
^LICENSE\.md$
^builder_img$
Dockerfile
.dockerignore
^docs$
^pkgdown$
Dockerfile
^codecov\.yml$
^vignettes/
^\.azure$
man-roxygen
47 changes: 0 additions & 47 deletions .github/CONTRIBUTING.md

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
shell: Rscript {0}
container:
# this needs to be the same as in Dockerfile
image: subugoe/muggle-buildtime-onbuild:a94fcb785886af96d440b4bcd7f47c01162d7f5e
image: subugoe/muggle-buildtime-onbuild:f7fb6146d8712c4bffb024f4d4f40c40ffab5598
env:
MUGGLE_PKG_NAME: ${{ github.event.repository.name }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Test Coverage
run: covr::codecov()
- name: Build Package Website
run: pkgdown::build_site(override = list(new_process = FALSE))
run: muggle::build_site2(new_process = FALSE)
- uses: docker/build-push-action@v1
name: Build Buildtime Image
with:
Expand Down
36 changes: 34 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,37 @@
.Rproj.user
# History files
.Rhistory
.Rapp.history

# Session Data files
.RData

# User-specific files
.Ruserdata

# Example code in package build process
*-Ex.R

# Output files from R CMD build
/*.tar.gz

# Output files from R CMD check
/*.Rcheck/

# RStudio files
.Rproj.user/

# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3
.httr-oauth

# knitr and R markdown default cache directories
*_cache/
/cache/

# Temporary files created by R markdown
*.utf8.md
*.knit.md

# R Environment Variables
.Renviron
docs
.azure/config
.Rproj.user
128 changes: 0 additions & 128 deletions CODE_OF_CONDUCT.md

This file was deleted.

35 changes: 18 additions & 17 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@ Package: shinycaas
Title: Deploy shiny applications to container as a service (CaaS)
Version: 0.0.0.9000
Authors@R:
c(person(given = "Maximilian",
family = "Held",
role = c("aut", "cre"),
email = "[email protected]",
comment = c(ORCID = "0000-0002-4703-5388")),
person(given = c(subugoe = "Göttingen State and University Library"),
role = c("cph", "fnd"))
c(
person(
given = "Maximilian",
family = "Held",
role = c("aut", "cre"),
email = "[email protected]",
comment = c(ORCID = "0000-0002-4703-5388")
),
person(
given = "Göttingen State and University Library",
role = c("cph", "fnd")
)
)
Description: Deploying shiny apps to container as a service (CaaS) products on public cloud vendors.
License: MIT + file LICENSE
Expand All @@ -19,18 +24,14 @@ RoxygenNote: 7.1.1
URL: https://subugoe.github.io/shinycaas, https://github.com/subugoe/shinycaas
BugReports: https://github.com/subugoe/shinycaas/issues
Suggests:
testthat,
withr,
testthat (>= 3.0.0),
shiny (>= 1.5.0),
subugoetheme,
fs
subugoetheme
Imports:
processx (>= 3.4.3),
cli (>= 2.0.2),
AzureAppService,
checkmate (>= 2.0.0),
htmltools (>= 0.5.0),
jsonlite (>= 1.7.0)
cli (>= 2.2.0)
Remotes:
subugoe/[email protected]
SystemRequirements:
Azure CLI (>= 2.9) (https://docs.microsoft.com/en-us/cli/azure/install-azure-cli)
subugoe/[email protected],
subugoe/AzureAppService@fd3d0795ece511c4ffe054e774bf3784f226dbc4
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG MUGGLE_TAG=a94fcb785886af96d440b4bcd7f47c01162d7f5e
ARG MUGGLE_TAG=f7fb6146d8712c4bffb024f4d4f40c40ffab5598
FROM subugoe/muggle-buildtime-onbuild:${MUGGLE_TAG} as buildtime
FROM subugoe/muggle-runtime-onbuild:${MUGGLE_TAG} as runtime
CMD shinycaas::az_webapp_shiny_opts(); shinycaas::runOldFaithful()
8 changes: 3 additions & 5 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
# Generated by roxygen2: do not edit by hand

export(az_account)
export(az_cli_run)
export(az_configure)
export(az_login)
export(az_webapp)
export(getenv2)
export(include_app2)
export(include_app2_az)
export(is_github_actions)
export(runOldFaithful)
export(shiny_deploy_az)
export(shiny_opts_az)
importFrom(AzureAppService,az_configure)
importFrom(AzureAppService,az_webapp)
Loading

0 comments on commit 558daf1

Please sign in to comment.