Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate to Docker Compose v2 #139

Merged
merged 2 commits into from
Jun 25, 2024
Merged

Migrate to Docker Compose v2 #139

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f71d293
Migrate to Docker Compose v2
johnpoth Jun 24, 2024
73f7ac3
fix as2 example - CAMEL-19164: upgrade to http components 5.x
johnpoth Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions resume-api/resume-api-aws2-kinesis/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Building the demo
To build the demo and the containers:

```shell
mvn clean package && docker-compose build
mvn clean package && docker compose build
```

Run
Expand All @@ -24,7 +24,7 @@ Run
To run the demo:

```shell
docker-compose up -d && docker-compose logs --no-log-prefix -f example ; docker-compose down
docker compose up -d && docker compose logs --no-log-prefix -f example ; docker compose down
```

Advanced / Manual
Expand Down
1 change: 0 additions & 1 deletion ...sume-api-aws2-kinesis/docker-compose.yaml → ...-api/resume-api-aws2-kinesis/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------

version: '3.4'
services:
kinesis:
image: localstack/localstack:latest
Expand Down
4 changes: 2 additions & 2 deletions resume-api/resume-api-cassandraql/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Building the demo
To build the demo and the containers:

```shell
mvn clean package && docker-compose build
mvn clean package && docker compose build
```

Run
Expand All @@ -22,7 +22,7 @@ Run
To run the demo:

```shell
docker-compose up -d && docker-compose logs --no-log-prefix -f example ; docker-compose down
docker compose up -d && docker compose logs --no-log-prefix -f example ; docker compose down
```

Advanced / Manual
Expand Down
1 change: 0 additions & 1 deletion ...esume-api-cassandraql/docker-compose.yaml → ...e-api/resume-api-cassandraql/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------

version: '3.4'
services:
cassandra:
image: cassandra:4
Expand Down
4 changes: 2 additions & 2 deletions resume-api/resume-api-file-offset/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Building the demo
To build the demo and the containers:

```shell
mvn clean package && docker-compose build
mvn clean package && docker compose build
```


Expand All @@ -25,7 +25,7 @@ Run
To run the demo:

```shell
docker-compose up -d && docker-compose logs --no-log-prefix -f example ; docker-compose down
docker compose up -d && docker compose logs --no-log-prefix -f example ; docker compose down
```

Advanced / Manual
Expand Down
1 change: 0 additions & 1 deletion ...pi/resume-api-fileset/docker-compose.yaml → ...e-api/resume-api-file-offset/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------

version: '3.4'
services:
zookeeper:
image: quay.io/strimzi/kafka:0.28.0-kafka-3.1.0
Expand Down
4 changes: 2 additions & 2 deletions resume-api/resume-api-fileset-clusterized/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Building the demo
To build the demo and the containers:

```shell
mvn clean package && docker-compose build
mvn clean package && docker compose build
```

Run
Expand All @@ -47,7 +47,7 @@ Run
To run the demo:

```shell
docker-compose up -d && docker-compose logs -f example-1 example-2 ; docker-compose down
docker compose up -d && docker compose logs -f example-1 example-2 ; docker compose down
```


Expand Down
1 change: 0 additions & 1 deletion ...i-fileset-clusterized/docker-compose.yaml → ...sume-api-fileset-clusterized/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------

version: '3.4'
services:
zookeeper:
image: quay.io/strimzi/kafka:0.28.0-kafka-3.1.0
Expand Down
6 changes: 3 additions & 3 deletions resume-api/resume-api-fileset-wal/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Building the demo
To build the demo and the containers:

```shell
mvn clean package && docker-compose build
mvn clean package && docker compose build
```

Run
Expand All @@ -23,7 +23,7 @@ Run
This demo runs manually. First, start the demo using the command:

```shell
docker-compose up -d && docker exec -it resume-api-fileset-wal-example-1 /bin/bash ; docker-compose down
docker compose up -d && docker exec -it resume-api-fileset-wal-example-1 /bin/bash ; docker compose down
```

This will take you to another shell. Open another window or terminal and leave that shell open for now.
Expand Down Expand Up @@ -59,7 +59,7 @@ docker network connect --alias kafka resume-api-fileset-wal_default resume-api-f
While running the demo, note how the application performs the recovery prior to starting the execution.


*Note*: it assumes docker-compose will create the containers using its default name pattern. If that's not the case,
*Note*: it assumes docker compose will create the containers using its default name pattern. If that's not the case,
please adjust the names accordingly.


Expand Down
1 change: 0 additions & 1 deletion ...esume-api-file-offset/docker-compose.yaml → ...e-api/resume-api-fileset-wal/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------

version: '3.4'
services:
zookeeper:
image: quay.io/strimzi/kafka:0.28.0-kafka-3.1.0
Expand Down
4 changes: 2 additions & 2 deletions resume-api/resume-api-fileset/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Building the demo
To build the demo and the containers:

```shell
mvn clean package && docker-compose build
mvn clean package && docker compose build
```

Run
Expand All @@ -23,5 +23,5 @@ Run
To run the demo:

```shell
docker-compose up -d && docker-compose logs --no-log-prefix -f example ; docker-compose down
docker compose up -d && docker compose logs --no-log-prefix -f example ; docker compose down
```
1 change: 0 additions & 1 deletion ...esume-api-fileset-wal/docker-compose.yaml → resume-api/resume-api-fileset/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------

version: '3.4'
services:
zookeeper:
image: quay.io/strimzi/kafka:0.28.0-kafka-3.1.0
Expand Down
Loading