diff --git a/README.md b/README.md index 657b0a2c5..995d6350f 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ Dapr is currently under community development with preview releases. The master | Dapr Quickstart Version | Dapr Runtime Version | |:--------------------:|:--------------------:| +| [v1.6.0](https://github.com/dapr/quickstarts/tree/v1.6.0) | [v1.6.0](https://github.com/dapr/dapr/tree/v1.6.0) | | [v1.5.0](https://github.com/dapr/quickstarts/tree/v1.5.0) | [v1.5.0](https://github.com/dapr/dapr/tree/v1.5.0) | | [v1.4.0](https://github.com/dapr/quickstarts/tree/v1.4.0) | [v1.4.0](https://github.com/dapr/dapr/tree/v1.4.0) | | [v1.3.0](https://github.com/dapr/quickstarts/tree/v1.3.0) | [v1.3.0](https://github.com/dapr/dapr/tree/v1.3.0) | diff --git a/distributed-calculator/.vscode/tasks.json b/distributed-calculator/.vscode/tasks.json index f86e87c2e..ffc11002f 100644 --- a/distributed-calculator/.vscode/tasks.json +++ b/distributed-calculator/.vscode/tasks.json @@ -57,7 +57,7 @@ }, { "appId": "subtractapp", - "appPort": 7000, + "appPort": 7001, "httpPort": 3504, "metricsPort": 9091, "grpcPort": 50015, @@ -85,7 +85,7 @@ }, { "appId": "multiplyapp", - "appPort": 5000, + "appPort": 5001, "httpPort": 3501, "metricsPort": 9093, "grpcPort": 50003, diff --git a/distributed-calculator/README.md b/distributed-calculator/README.md index d335e6b4e..09027cc55 100644 --- a/distributed-calculator/README.md +++ b/distributed-calculator/README.md @@ -80,15 +80,15 @@ sleep: 2 2. Subtract App - Open a terminal window and navigate to the csharp directory and follow the steps below: -- Set environment variable to use non-default app port 7000 +- Set environment variable to use non-default app port 7001 ```bash #Linux/Mac OS: - export ASPNETCORE_URLS="http://localhost:7000" + export ASPNETCORE_URLS="http://localhost:7001" ``` ```bash #Windows: - set ASPNETCORE_URLS=http://localhost:7000 + set ASPNETCORE_URLS=http://localhost:7001 ``` - Navigate to ./bin/Debug/netcoreapp3.1 and start Dapr using command: ```bash - dapr run --app-id subtractapp --app-port 7000 --dapr-http-port 3504 dotnet Subtract.dll + dapr run --app-id subtractapp --app-port 7001 --dapr-http-port 3504 dotnet Subtract.dll ``` @@ -179,10 +179,10 @@ working_dir: "./python" - Set environment variable to use non-default app port 5000 ```bash #Linux/Mac OS: - export FLASK_RUN_PORT=5000 + export FLASK_RUN_PORT=5001 #Windows: - set FLASK_RUN_PORT=5000 + set FLASK_RUN_PORT=5001 ``` - Start dapr using the command: ```bash - dapr run --app-id multiplyapp --app-port 5000 --dapr-http-port 3501 flask run + dapr run --app-id multiplyapp --app-port 5001 --dapr-http-port 3501 flask run ``` diff --git a/distributed-calculator/deploy/python-multiplier.yaml b/distributed-calculator/deploy/python-multiplier.yaml index d31438bf9..fefb6fe75 100644 --- a/distributed-calculator/deploy/python-multiplier.yaml +++ b/distributed-calculator/deploy/python-multiplier.yaml @@ -16,12 +16,12 @@ spec: annotations: dapr.io/enabled: "true" dapr.io/app-id: "multiplyapp" - dapr.io/app-port: "5000" + dapr.io/app-port: "5001" dapr.io/config: "appconfig" spec: containers: - name: multiply image: dapriosamples/distributed-calculator-python:latest ports: - - containerPort: 5000 + - containerPort: 5001 imagePullPolicy: Always diff --git a/distributed-calculator/python/Dockerfile b/distributed-calculator/python/Dockerfile index da1020b4b..fa0d808f5 100644 --- a/distributed-calculator/python/Dockerfile +++ b/distributed-calculator/python/Dockerfile @@ -3,5 +3,5 @@ COPY . /app WORKDIR /app RUN pip install flask flask_cors ENTRYPOINT ["python"] -EXPOSE 5000 +EXPOSE 5001 CMD ["app.py"] diff --git a/distributed-calculator/python/app.py b/distributed-calculator/python/app.py index c6a83f2c3..38948e3cf 100644 --- a/distributed-calculator/python/app.py +++ b/distributed-calculator/python/app.py @@ -19,4 +19,4 @@ def multiply(): print(f"Calculating {operand_one} * {operand_two}", flush=True) return jsonify(math.ceil(operand_one * operand_two * 100000)/100000) -app.run() \ No newline at end of file +app.run(port=5001) diff --git a/observability/deploy/python-multiplier.yaml b/observability/deploy/python-multiplier.yaml index 93f898aff..9c3402fde 100644 --- a/observability/deploy/python-multiplier.yaml +++ b/observability/deploy/python-multiplier.yaml @@ -16,12 +16,12 @@ spec: annotations: dapr.io/enabled: "true" dapr.io/app-id: "multiplyapp" - dapr.io/app-port: "5000" + dapr.io/app-port: "5001" dapr.io/config: "appconfig" spec: containers: - name: multiply image: dapriosamples/distributed-calculator-slow-python:latest ports: - - containerPort: 5000 + - containerPort: 5001 imagePullPolicy: Always diff --git a/observability/python/Dockerfile b/observability/python/Dockerfile index da1020b4b..fa0d808f5 100644 --- a/observability/python/Dockerfile +++ b/observability/python/Dockerfile @@ -3,5 +3,5 @@ COPY . /app WORKDIR /app RUN pip install flask flask_cors ENTRYPOINT ["python"] -EXPOSE 5000 +EXPOSE 5001 CMD ["app.py"] diff --git a/observability/python/app.py b/observability/python/app.py index 08bcd03fc..d10e4625c 100644 --- a/observability/python/app.py +++ b/observability/python/app.py @@ -24,4 +24,4 @@ def multiply(): print(f"Calculating {operand_one} * {operand_two}", flush=True) return jsonify(math.ceil(operand_one * operand_two * 100000)/100000) -app.run() \ No newline at end of file +app.run(port=5001) diff --git a/pub-sub/README.md b/pub-sub/README.md index 03501922f..57827ceb2 100644 --- a/pub-sub/README.md +++ b/pub-sub/README.md @@ -134,7 +134,7 @@ sleep: 10 --> ```bash -dapr run --app-id python-subscriber --app-port 5000 python3 app.py +dapr run --app-id python-subscriber --app-port 5001 python3 app.py ``` diff --git a/pub-sub/deploy/python-subscriber.yaml b/pub-sub/deploy/python-subscriber.yaml index e8e9497c4..cedcf58e4 100644 --- a/pub-sub/deploy/python-subscriber.yaml +++ b/pub-sub/deploy/python-subscriber.yaml @@ -16,11 +16,11 @@ spec: annotations: dapr.io/enabled: "true" dapr.io/app-id: "python-subscriber" - dapr.io/app-port: "5000" + dapr.io/app-port: "5001" spec: containers: - name: python-subscriber image: dapriosamples/pubsub-python-subscriber:latest ports: - - containerPort: 5000 - imagePullPolicy: Always \ No newline at end of file + - containerPort: 5001 + imagePullPolicy: Always diff --git a/pub-sub/python-subscriber/Dockerfile b/pub-sub/python-subscriber/Dockerfile index 0383363b1..f45330cf3 100644 --- a/pub-sub/python-subscriber/Dockerfile +++ b/pub-sub/python-subscriber/Dockerfile @@ -2,5 +2,5 @@ FROM python:3.7-alpine COPY . /app WORKDIR /app RUN pip install flask flask_cors -EXPOSE 5000 -CMD ["python", "app.py"] \ No newline at end of file +EXPOSE 5001 +CMD ["python", "app.py"] diff --git a/pub-sub/python-subscriber/app.py b/pub-sub/python-subscriber/app.py index 36656982f..b705783b3 100644 --- a/pub-sub/python-subscriber/app.py +++ b/pub-sub/python-subscriber/app.py @@ -29,4 +29,4 @@ def c_subscriber(): print('Received message "{}" on topic "{}"'.format(request.json['data']['message'], request.json['topic']), flush=True) return json.dumps({'success':True}), 200, {'ContentType':'application/json'} -app.run() +app.run(port=5001)