Skip to content

Commit

Permalink
Use runtime 1.14 RC 8 (#1095)
Browse files Browse the repository at this point in the history
* Use runtime 1.14 RC 8

Signed-off-by: Artur Souza <[email protected]>

* Use docker compose instead of docker-compose

Signed-off-by: Artur Souza <[email protected]>

* Fix expectation on new docker compose output

Signed-off-by: Artur Souza <[email protected]>

---------

Signed-off-by: Artur Souza <[email protected]>
  • Loading branch information
artursouza authored Aug 9, 2024
1 parent 00ef6a5 commit 6e813b9
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
GOPROXY: https://proxy.golang.org
JDK_VER: ${{ matrix.java }}
DAPR_CLI_VER: 1.14.0-rc.6
DAPR_RUNTIME_VER: 1.14.0-rc.6
DAPR_RUNTIME_VER: 1.14.0-rc.8
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0-rc.4/install/install.sh
DAPR_CLI_REF:
DAPR_REF:
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
./dist/linux_amd64/release/placement &
- name: Spin local environment
run: |
docker-compose -f ./sdk-tests/deploy/local-test.yml up -d mongo kafka
docker compose -f ./sdk-tests/deploy/local-test.yml up -d mongo kafka
docker ps
- name: Install local ToxiProxy to simulate connectivity issues to Dapr sidecar
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
GOPROXY: https://proxy.golang.org
JDK_VER: ${{ matrix.java }}
DAPR_CLI_VER: 1.14.0-rc.6
DAPR_RUNTIME_VER: 1.14.0-rc.6
DAPR_RUNTIME_VER: 1.14.0-rc.8
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0-rc.3/install/install.sh
DAPR_CLI_REF:
DAPR_REF:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -237,13 +237,13 @@ Similarly, all of these need to be run for running the ITs either individually o
Run the following commands from the root of the repo to start all the docker containers that the tests depend on.
```bash
docker-compose -f ./sdk-tests/deploy/local-test.yml up -d
docker compose -f ./sdk-tests/deploy/local-test.yml up -d
```
To stop the containers and services, run the following commands.
```bash
docker-compose -f ./sdk-tests/deploy/local-test.yml down
docker compose -f ./sdk-tests/deploy/local-test.yml down
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,11 @@ Before getting into the application code, follow these steps in order to set up
<!-- STEP
name: Setup kafka container
expected_stderr_lines:
- 'Creating network "http_default" with the default driver'
sleep: 20
-->

```bash
docker-compose -f ./src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml up -d
docker compose -f ./src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml up -d
```

<!-- END_STEP -->
Expand Down Expand Up @@ -248,7 +247,7 @@ name: Cleanup Kafka containers
-->

```bash
docker-compose -f ./src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml down
docker compose -f ./src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml down
```

<!-- END_STEP -->
Expand Down
4 changes: 2 additions & 2 deletions examples/src/main/java/io/dapr/examples/querystate/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ sleep: 5
-->

```bash
docker-compose -f ./src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml up -d
docker compose -f ./src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml up -d
```

<!-- END_STEP -->
Expand Down Expand Up @@ -305,7 +305,7 @@ name: Cleanup MongoDB containers
-->

```bash
docker-compose -f ./src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml down
docker compose -f ./src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml down
```

<!-- END_STEP -->
4 changes: 2 additions & 2 deletions examples/src/main/java/io/dapr/examples/state/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ sleep: 5
-->

```bash
docker-compose -f ./src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml up -d
docker compose -f ./src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml up -d
```

<!-- END_STEP -->
Expand Down Expand Up @@ -227,7 +227,7 @@ name: Cleanup MongoDB container
-->

```bash
docker-compose -f ./src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml down
docker compose -f ./src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml down
```

<!-- END_STEP -->

0 comments on commit 6e813b9

Please sign in to comment.