Merge pull request #611 from amulyavarote/feature/new_quickstarts

Merge conflicts fix

.github/workflows/build.yml

@@ -64,7 +64,6 @@ jobs:
       - name: Build docker image
         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}
@@ -77,7 +76,6 @@ jobs:
       - name: publish image to dockerhub
         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}
@@ -98,7 +96,6 @@ jobs:
       - name: create docker manifest
         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}
@@ -111,7 +108,6 @@ jobs:
       - name: publish manifest to dockerhub
         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}

tutorials/bindings/deploy/node.yaml

@@ -36,7 +36,7 @@ spec:
     spec:
       containers:
       - name: node
-        image: docker.io/dapriosamples/bindings-nodeapp:latest
+        image: ghcr.io/dapr/samples/bindings-nodeapp:latest
         ports:
         - containerPort: 3000
         imagePullPolicy: Always

tutorials/bindings/deploy/python.yaml

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

tutorials/bindings/docker-compose-single-kafka.yml

@@ -1,14 +1,14 @@
 version: '2'
 services:
   zookeeper:
-    image: wurstmeister/zookeeper:latest
+    image: ghcr.io/dapr/3rdparty/zookeeper:latest
     ports:
       - "2181:2181"
   kafka:
-    image: wurstmeister/kafka:latest
+    image: ghcr.io/dapr/3rdparty/kafka:latest
     ports:
       - "9092:9092"
     environment:
       KAFKA_ADVERTISED_HOST_NAME: 127.0.0.1
       KAFKA_CREATE_TOPICS: "sample:1:1"
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181

tutorials/distributed-calculator/deploy/dotnet-subtractor.yaml

@@ -21,7 +21,7 @@ spec:
     spec:
       containers:
       - name: subtract
-        image: dapriosamples/distributed-calculator-csharp:latest
+        image: ghcr.io/dapr/samples/distributed-calculator-csharp:latest
         ports:
         - containerPort: 80
         imagePullPolicy: Always

tutorials/distributed-calculator/deploy/go-adder.yaml

@@ -21,7 +21,7 @@ spec:
     spec:
       containers:
       - name: add
-        image: dapriosamples/distributed-calculator-go:latest
+        image: ghcr.io/dapr/samples/distributed-calculator-go:latest
         ports:
         - containerPort: 6000
         imagePullPolicy: Always

tutorials/distributed-calculator/deploy/node-divider.yaml

@@ -21,7 +21,7 @@ spec:
     spec:
       containers:
       - name: divide
-        image: dapriosamples/distributed-calculator-node:latest
+        image: ghcr.io/dapr/samples/distributed-calculator-node:latest
         ports:
         - containerPort: 4000
         imagePullPolicy: Always

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

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

tutorials/distributed-calculator/deploy/react-calculator.yaml

@@ -37,7 +37,7 @@ spec:
     spec:
       containers:
       - name: calculator-front-end
-        image: dapriosamples/distributed-calculator-react-calculator:latest
+        image: ghcr.io/dapr/samples/distributed-calculator-react-calculator:latest
         ports:
         - containerPort: 8080
         imagePullPolicy: Always

tutorials/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/hello-kubernetes/deploy/node.yaml

@@ -36,7 +36,7 @@ spec:
     spec:
       containers:
       - name: node
-        image: dapriosamples/hello-k8s-node:latest
+        image: ghcr.io/dapr/samples/hello-k8s-node:latest
         ports:
         - containerPort: 3000
         imagePullPolicy: Always

tutorials/hello-kubernetes/deploy/python.yaml

@@ -19,4 +19,4 @@ spec:
     spec:
       containers:
       - name: python
-        image: dapriosamples/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: dapriosamples/distributed-calculator-slow-python:latest
+        image: ghcr.io/dapr/samples/distributed-calculator-slow-python:latest
         ports:
         - containerPort: 5001
         imagePullPolicy: Always

tutorials/pub-sub/deploy/node-subscriber.yaml

@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
       - name: node-subscriber
-        image: dapriosamples/pubsub-node-subscriber:latest
+        image: ghcr.io/dapr/samples/pubsub-node-subscriber:latest
         ports:
         - containerPort: 3000
         imagePullPolicy: Always

tutorials/pub-sub/deploy/python-subscriber.yaml

@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
       - name: python-subscriber
-        image: dapriosamples/pubsub-python-subscriber:latest
+        image: ghcr.io/dapr/samples/pubsub-python-subscriber:latest
         ports:
         - containerPort: 5001
         imagePullPolicy: Always

tutorials/pub-sub/deploy/react-form.yaml

@@ -36,7 +36,7 @@ spec:
     spec:
       containers:
       - name: react-form
-        image: dapriosamples/pubsub-react-form:latest
+        image: ghcr.io/dapr/samples/pubsub-react-form:latest
         ports:
         - containerPort: 8080
         imagePullPolicy: Always

tutorials/secretstore/deploy/node.yaml

@@ -36,7 +36,7 @@ spec:
     spec:
       containers:
       - name: node
-        image: dapriosamples/secretstorenode:latest
+        image: ghcr.io/dapr/samples/secretstorenode:latest
         env:
         - name: SECRET_STORE
           value: "kubernetes"