You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by jp...@apache.org on 2024/06/27 07:50:16 UTC
(camel-kamelets-examples) branch docker created (now c94cf44)
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a change to branch docker
in repository https://gitbox.apache.org/repos/asf/camel-kamelets-examples.git
at c94cf44 Migrate to Docker Compose v2
This branch includes the following new commits:
new c94cf44 Migrate to Docker Compose v2
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(camel-kamelets-examples) 01/01: Migrate to Docker Compose v2
Posted by jp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch docker
in repository https://gitbox.apache.org/repos/asf/camel-kamelets-examples.git
commit c94cf4454241c10e7aa6de48e665de5d97bb325a
Author: John Poth <po...@gmail.com>
AuthorDate: Thu Jun 27 09:49:14 2024 +0200
Migrate to Docker Compose v2
---
jbang/kafka-apicurio-secured-json-schema-registry/README.md | 2 +-
.../docker-compose/config-registry.yml | 2 --
jbang/kafka-health/README.adoc | 8 ++++----
jbang/kafka-health/application.properties | 2 +-
jbang/kafka-health/{docker-compose.yml => compose.yaml} | 1 -
jbang/kafka-health/start.sh | 6 +++---
jbang/mqtt/README.adoc | 4 ++--
jbang/mqtt/{docker-compose.yml => compose.yaml} | 1 -
jbang/mqtt/start.sh | 6 +++---
jbang/sql/README.adoc | 4 ++--
jbang/sql/{docker-compose.yml => compose.yaml} | 1 -
11 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/jbang/kafka-apicurio-secured-json-schema-registry/README.md b/jbang/kafka-apicurio-secured-json-schema-registry/README.md
index bf3fdcb..9b8f135 100644
--- a/jbang/kafka-apicurio-secured-json-schema-registry/README.md
+++ b/jbang/kafka-apicurio-secured-json-schema-registry/README.md
@@ -11,7 +11,7 @@ You could use a plain Kafka archive or use an Ansible role
In the `docker-compose` folder run
```bash
-docker-compose -f config-registry.yml up
+docker compose -f config-registry.yml up
```
This will bring up the required bits for making an Apicurio Registry secured with Keycloak up and running.
diff --git a/jbang/kafka-apicurio-secured-json-schema-registry/docker-compose/config-registry.yml b/jbang/kafka-apicurio-secured-json-schema-registry/docker-compose/config-registry.yml
index 75c3516..939be94 100644
--- a/jbang/kafka-apicurio-secured-json-schema-registry/docker-compose/config-registry.yml
+++ b/jbang/kafka-apicurio-secured-json-schema-registry/docker-compose/config-registry.yml
@@ -1,5 +1,3 @@
-version: '2.2'
-
volumes:
postgres_data:
driver: local
diff --git a/jbang/kafka-health/README.adoc b/jbang/kafka-health/README.adoc
index 6ab475d..8d05d77 100644
--- a/jbang/kafka-health/README.adoc
+++ b/jbang/kafka-health/README.adoc
@@ -10,7 +10,7 @@ You need Docker to run the local Kafka broker which can run via docker compose.
[source,sh]
----
-$ docker-compose up -d
+$ docker compose up -d
----
And then you can stop and start the broker to make Camel health check report
@@ -18,21 +18,21 @@ as either UP or DOWN.
[source,sh]
----
-$ docker-compose stop
+$ docker compose stop
----
and to start it again
[source,sh]
----
-$ docker-compose start
+$ docker compose start
----
And to shutdown when you no longer need the broker.
[source,sh]
----
-$ docker-compose down
+$ docker compose down
----
diff --git a/jbang/kafka-health/application.properties b/jbang/kafka-health/application.properties
index f45e872..a7ce537 100644
--- a/jbang/kafka-health/application.properties
+++ b/jbang/kafka-health/application.properties
@@ -8,5 +8,5 @@
# quarkus.log.category."org.apache.kafka".level=DEBUG
# quarkus.log.category."org.apache.camel.component.kafka".level=DEBUG
-# turn of quarkus dev-services as we run kafka via docker-compose
+# turn of quarkus dev-services as we run kafka via docker compose
quarkus.devservices.enabled = false
\ No newline at end of file
diff --git a/jbang/kafka-health/docker-compose.yml b/jbang/kafka-health/compose.yaml
similarity index 91%
rename from jbang/kafka-health/docker-compose.yml
rename to jbang/kafka-health/compose.yaml
index f62b0ee..7b8a16b 100644
--- a/jbang/kafka-health/docker-compose.yml
+++ b/jbang/kafka-health/compose.yaml
@@ -1,5 +1,4 @@
---
-version: '3'
services:
zookeeper:
image: confluentinc/cp-zookeeper:latest
diff --git a/jbang/kafka-health/start.sh b/jbang/kafka-health/start.sh
index ccb09e3..c451759 100755
--- a/jbang/kafka-health/start.sh
+++ b/jbang/kafka-health/start.sh
@@ -1,7 +1,7 @@
#!/bin/sh
-docker-compose down
+docker compose down
docker rm -f $(docker ps -a -q)
docker volume rm $(docker volume ls -q)
-docker-compose up -d
-docker-compose logs -f
\ No newline at end of file
+docker compose up -d
+docker compose logs -f
\ No newline at end of file
diff --git a/jbang/mqtt/README.adoc b/jbang/mqtt/README.adoc
index 41e14c7..c4e491f 100644
--- a/jbang/mqtt/README.adoc
+++ b/jbang/mqtt/README.adoc
@@ -42,7 +42,7 @@ Or use
[source,sh]
----
-$ docker-compose up
+$ docker compose up
----
Then you can run the Camel integration using:
@@ -79,7 +79,7 @@ To stop Docker, you can run
[source,sh]
----
-$ docker-compose down
+$ docker compose down
----
And you can stop Camel with
diff --git a/jbang/mqtt/docker-compose.yml b/jbang/mqtt/compose.yaml
similarity index 92%
rename from jbang/mqtt/docker-compose.yml
rename to jbang/mqtt/compose.yaml
index b228e18..34f98e9 100644
--- a/jbang/mqtt/docker-compose.yml
+++ b/jbang/mqtt/compose.yaml
@@ -1,4 +1,3 @@
-version: '3.8'
services:
mosquitto:
image: eclipse-mosquitto
diff --git a/jbang/mqtt/start.sh b/jbang/mqtt/start.sh
index d36bb62..ecb40c0 100755
--- a/jbang/mqtt/start.sh
+++ b/jbang/mqtt/start.sh
@@ -1,7 +1,7 @@
#!/bin/sh
-docker-compose down
+docker compose down
docker rm -f $(docker ps -a -q)
docker volume rm $(docker volume ls -q)
-docker-compose up -d
-docker-compose logs -f%
\ No newline at end of file
+docker compose up -d
+docker compose logs -f%
\ No newline at end of file
diff --git a/jbang/sql/README.adoc b/jbang/sql/README.adoc
index 6cc832f..16c23ff 100644
--- a/jbang/sql/README.adoc
+++ b/jbang/sql/README.adoc
@@ -2,7 +2,7 @@
This example shows how to use a SQL database with Camel.
-The example comes with a `docker-compose` file for running a local Postgres database.
+The example comes with a `docker compose` file for running a local Postgres database.
The database is initialized with a `users` table with some sample data.
There are two examples;
@@ -42,7 +42,7 @@ Then run the Postgres database using Docker:
[source,sh]
----
-$ docker-compose up
+$ docker compose up
----
And then run Camel:
diff --git a/jbang/sql/docker-compose.yml b/jbang/sql/compose.yaml
similarity index 91%
rename from jbang/sql/docker-compose.yml
rename to jbang/sql/compose.yaml
index 0aed89d..0431315 100644
--- a/jbang/sql/docker-compose.yml
+++ b/jbang/sql/compose.yaml
@@ -1,4 +1,3 @@
-version: '3.8'
services:
db:
image: postgres:14.1-alpine