Merge remote-tracking branch 'upstream/master' into upstream_quickstarts

Signed-off-by: Artur Souza <artursouza.ms@outlook.com>

.github/workflows/build.yml

@@ -82,6 +82,36 @@ jobs:
             make push
             popd
           done
+      - name: GitHub container registry login
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build docker image
+        env:
+          SAMPLE_REGISTRY: ghcr.io/dapr/samples
+        run: | 
+          SAMPLE_LIST=(tutorials/hello-kubernetes tutorials/distributed-calculator tutorials/pub-sub tutorials/bindings tutorials/observability tutorials/secretstore)
+          for sample in "${SAMPLE_LIST[@]}"; do
+            echo "Building image for ${sample}..."
+            pushd ${sample}
+            make build
+            popd
+          done
+      - name: publish image to ghcr
+        if: github.event_name != 'pull_request'
+        env:
+          SAMPLE_REGISTRY: ghcr.io/dapr/samples
+        run: |
+          SAMPLE_LIST=(tutorials/hello-kubernetes tutorials/distributed-calculator tutorials/pub-sub tutorials/bindings tutorials/observability tutorials/secretstore)
+          for sample in "${SAMPLE_LIST[@]}"; do
+            echo "Push image for ${sample}..."
+            pushd ${sample}
+            make push
+            popd
+          done
   publish:
     name: Publish docker manifest
     needs: build
@@ -114,3 +144,34 @@ jobs:
             make manifest-push
             popd
           done
+      - name: GitHub container registry login
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: create ghcr manifest
+        if: github.event_name != 'pull_request'
+        env: 
+          SAMPLE_REGISTRY: ghcr.io/dapr/samples
+        run: |
+          SAMPLE_LIST=(tutorials/hello-kubernetes tutorials/distributed-calculator tutorials/pub-sub tutorials/bindings tutorials/observability tutorials/secretstore)
+          for sample in "${SAMPLE_LIST[@]}"; do
+            echo "Building image for ${sample}..."
+            pushd ${sample}
+            make manifest-create
+            popd
+          done
+      - name: publish manifest to ghcr
+        if: github.event_name != 'pull_request'
+        env: 
+          SAMPLE_REGISTRY: ghcr.io/dapr/samples
+        run: |
+          SAMPLE_LIST=(tutorials/hello-kubernetes tutorials/distributed-calculator tutorials/pub-sub tutorials/bindings tutorials/observability tutorials/secretstore)
+          for sample in "${SAMPLE_LIST[@]}"; do
+            echo "Push image for ${sample}..."
+            pushd ${sample}
+            make manifest-push
+            popd
+          done

docker.mk

@@ -84,4 +84,4 @@ manifest-push-$(1):
 endef
 
 # Generate docker manifest create
-$(foreach ITEM,$(APPS),$(eval $(call genDockerManifestPush,$(ITEM))))
+$(foreach ITEM,$(APPS),$(eval $(call genDockerManifestPush,$(ITEM))))

tutorials/bindings/deploy/python.yaml

@@ -19,4 +19,4 @@ spec:
     spec:
       containers:
       - name: python
-        image: ghcr.io/dapr/samples/bindings-pythonapp:latest
+        image: ghcr.io/dapr/samples/bindings-pythonapp:latest

tutorials/distributed-calculator/deploy/python-multiplier.yaml

@@ -21,7 +21,7 @@ spec:
     spec:
       containers:
       - name: multiply
-        image: ghcr.io/dapr/samples/distributed-calculator-python:latest
+        image: ghcr.io/dapr/samples/distributed-calculator-slow-python:latest
         ports:
         - containerPort: 5001
         imagePullPolicy: Always

tutorials/distributed-calculator/react-calculator/server.js

@@ -13,7 +13,7 @@ const daprPort = process.env.DAPR_HTTP_PORT ?? 3500;
 const daprUrl = `http://localhost:${daprPort}/v1.0/invoke`;
 
 // The name of the state store is specified in the components yaml file. 
-// For this sample, state store name is specified in the file at: https://github.com/dapr/quickstarts/blob/master/tutorials/hello-kubernetes/deploy/redis.yaml#L4
+// For this sample, state store name is specified in the file at: https://github.com/dapr/quickstarts/blob/master/hello-kubernetes/deploy/redis.yaml#L4
 const stateStoreName = `statestore`;
 const stateUrl = `http://localhost:${daprPort}/v1.0/state/${stateStoreName}`;
 

tutorials/hello-kubernetes/deploy/python.yaml

@@ -19,4 +19,4 @@ spec:
     spec:
       containers:
       - name: python
-        image: ghcr.io/dapr/samples/hello-k8s-python:latest
+        image: ghcr.io/dapr/samples/hello-k8s-python:latest

tutorials/observability/deploy/python-multiplier.yaml

@@ -21,7 +21,7 @@ spec:
     spec:
       containers:
       - name: multiply
-        image: ghcr.io/dapr/samples/distributed-calculator-slow-python:latest
+        image: ghcr.io/dapr/samples/distributed-calculator-python:latest
         ports:
         - containerPort: 5001
         imagePullPolicy: Always