dapr
/
docs
mirror of https://github.com/dapr/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v1.10' into update_static_web_apps_deploy_action 

Signed-off-by: greenie-msft <56556602+greenie-msft@users.noreply.github.com>
This commit is contained in:
greenie-msft 2023-05-09 10:36:39 -07:00 committed by GitHub
parent 0a362c8238 c94ae7ab97
commit 1a95da2bce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.github/workflows/website-root.yml vendored
View File

@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Build and Deploy Job name: Build and Deploy Job
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
fetch-depth: 0 fetch-depth: 0
@ -23,22 +23,18 @@ jobs:
run: cd daprdocs && git submodule update --init --recursive && sudo npm install -D --save autoprefixer && sudo npm install -D --save postcss-cli run: cd daprdocs && git submodule update --init --recursive && sudo npm install -D --save autoprefixer && sudo npm install -D --save postcss-cli
- name: Build And Deploy - name: Build And Deploy
id: builddeploy id: builddeploy
uses: Azure/static-web-apps-deploy@v0.0.1-preview uses: Azure/static-web-apps-deploy@v1
env: env:
HUGO_ENV: production HUGO_ENV: production
HUGO_VERSION: "0.100.2" HUGO_VERSION: "0.100.2"
with: with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }} azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
skip_deploy_on_missing_secrets: true
action: "upload" action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### app_location: "/daprdocs"
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig app_build_command: "git config --global --add safe.directory /github/workspace && hugo"
app_location: "/daprdocs" # App source code path output_location: "public"
api_location: "api" # Api source code path - optional skip_api_build: true
output_location: "public" # Built app content directory - optional
app_build_command: "hugo"
###### End of Repository/Build Configurations ######
close_pull_request_job: close_pull_request_job:
if: github.event_name == 'pull_request' && github.event.action == 'closed' if: github.event_name == 'pull_request' && github.event.action == 'closed'
@ -47,8 +43,7 @@ jobs:
steps: steps:
- name: Close Pull Request - name: Close Pull Request
id: closepullrequest id: closepullrequest
uses: Azure/static-web-apps-deploy@v0.0.1-preview uses: Azure/static-web-apps-deploy@v1
with: with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }} azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
skip_deploy_on_missing_secrets: true
action: "close" action: "close"

21
.github/workflows/website-v1-10.yml vendored
View File

@ -1,4 +1,4 @@
name: Azure Static Web App v1.9 name: Azure Static Web App Versioned
on: on:
push: push:
@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Build and Deploy Job name: Build and Deploy Job
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
fetch-depth: 0 fetch-depth: 0
@ -23,22 +23,18 @@ jobs:
run: cd daprdocs && git submodule update --init --recursive && sudo npm install -D --save autoprefixer && sudo npm install -D --save postcss-cli run: cd daprdocs && git submodule update --init --recursive && sudo npm install -D --save autoprefixer && sudo npm install -D --save postcss-cli
- name: Build And Deploy - name: Build And Deploy
id: builddeploy id: builddeploy
uses: Azure/static-web-apps-deploy@v0.0.1-preview uses: Azure/static-web-apps-deploy@v1
env: env:
HUGO_ENV: production HUGO_ENV: production
HUGO_VERSION: "0.100.2" HUGO_VERSION: "0.100.2"
with: with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_10 }} azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
skip_deploy_on_missing_secrets: true
action: "upload" action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### app_location: "/daprdocs"
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig app_build_command: "git config --global --add safe.directory /github/workspace && hugo"
app_location: "/daprdocs" # App source code path output_location: "public"
api_location: "api" # Api source code path - optional skip_api_build: true
output_location: "public" # Built app content directory - optional
app_build_command: "hugo"
###### End of Repository/Build Configurations ######
close_pull_request_job: close_pull_request_job:
if: github.event_name == 'pull_request' && github.event.action == 'closed' if: github.event_name == 'pull_request' && github.event.action == 'closed'
@ -50,5 +46,4 @@ jobs:
uses: Azure/static-web-apps-deploy@v1 uses: Azure/static-web-apps-deploy@v1
with: with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_10 }} azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_10 }}
skip_deploy_on_missing_secrets: true
action: "close" action: "close"

2
daprdocs/content/en/operations/hosting/self-hosted/self-hosted-with-podman.md
View File

@ -11,7 +11,7 @@ This article provides guidance on running Dapr with Podman on a Windows/Linux/ma
## Prerequisites ## Prerequisites
- [Dapr CLI]({{< ref install-dapr-cli.md >}}) - [Dapr CLI]({{< ref install-dapr-cli.md >}})
- [Podman](https://podman.io/docs/podman) - [Podman](https://podman.io/docs/tutorials/installation)
## Initialize Dapr environment ## Initialize Dapr environment