Skip to content

Commit

Permalink
docker-compose changes (apache#764)
Browse files Browse the repository at this point in the history
  • Loading branch information
@pjfanning
pjfanning committed Aug 4, 2024
1 parent 56e1f56 commit 16b20d1
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 29 deletions.
43 changes: 22 additions & 21 deletions .github/workflows/check-build-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,49 +76,50 @@ jobs:
fail-fast: false
matrix:
include:
- { connector: amqp, pre_cmd: 'docker-compose up -d amqp' }
- { connector: amqp, pre_cmd: 'docker compose up -d amqp' }
- { connector: avroparquet }
- { connector: awslambda }
- { connector: aws-event-bridge, pre_cmd: 'docker-compose up -d amazoneventbridge' }
- { connector: aws-event-bridge, pre_cmd: 'docker compose up -d amazoneventbridge' }
- { connector: azure-storage-queue }
- { connector: cassandra, pre_cmd: 'docker-compose up -d cassandra' }
- { connector: couchbase, pre_cmd: 'docker-compose up -d couchbase_prep' }
- { connector: cassandra, pre_cmd: 'docker compose up -d cassandra' }
- { connector: couchbase, pre_cmd: 'docker compose up -d couchbase_prep' }
- { connector: csv }
- { connector: dynamodb, pre_cmd: 'docker-compose up -d dynamodb' }
- { connector: elasticsearch, pre_cmd: 'docker-compose up -d elasticsearch6 elasticsearch7 opensearch1' }
- { connector: dynamodb, pre_cmd: 'docker compose up -d dynamodb' }
- { connector: elasticsearch, pre_cmd: 'docker compose up -d elasticsearch6 elasticsearch7 opensearch1' }
- { connector: file }
- { connector: ftp, pre_cmd: './scripts/ftp-servers.sh' }
- { connector: geode, pre_cmd: 'docker-compose up -d geode' }
- { connector: geode, pre_cmd: 'docker compose up -d geode' }
- { connector: google-cloud-bigquery }
- { connector: google-cloud-bigquery-storage }
- { connector: google-cloud-pub-sub, pre_cmd: 'docker-compose up -d gcloud-pubsub-emulator_prep' }
- { connector: google-cloud-pub-sub-grpc, pre_cmd: 'docker-compose up -d gcloud-pubsub-emulator_prep' }
- { connector: google-cloud-pub-sub, pre_cmd: 'docker compose up -d gcloud-pubsub-emulator_prep' }
- { connector: google-cloud-pub-sub-grpc, pre_cmd: 'docker compose up -d gcloud-pubsub-emulator_prep' }
- { connector: google-cloud-storage }
- { connector: google-common }
- { connector: google-fcm }
# hbase disabled until we resolve why new docker image fails our build: https://github.com/akka/alpakka/issues/2185
# - { connector: hbase, pre_cmd: 'docker-compose up -d hbase' }
# - { connector: hbase, pre_cmd: 'docker compose up -d hbase' }
- { connector: hdfs, pre_cmd: 'file ${HOME}/.cache/coursier/v1/https/repo1.maven.org/maven2/org/typelevel/cats-kernel_2.13/2.0.0/cats-kernel_2.13-2.0.0.jar' }
- { connector: huawei-push-kit }
- { connector: influxdb, pre_cmd: 'docker-compose up -d influxdb' }
- { connector: ironmq, pre_cmd: 'docker-compose up -d ironauth ironmq' }
- { connector: jms, pre_cmd: 'docker-compose up -d ibmmq' }
- { connector: influxdb, pre_cmd: 'docker compose up -d influxdb' }
# ironmq disabled while we resolve https://github.com/apache/pekko-connectors/issues/697
# - { connector: ironmq, pre_cmd: 'docker compose up -d ironauth ironmq' }
- { connector: jms, pre_cmd: 'docker compose up -d ibmmq' }
- { connector: json-streaming }
- { connector: kinesis }
- { connector: kudu, pre_cmd: 'docker-compose up -d kudu-master-data kudu-tserver-data kudu-master kudu-tserver' }
- { connector: mongodb, pre_cmd: 'docker-compose up -d mongo' }
- { connector: mqtt, pre_cmd: 'docker-compose up -d mqtt' }
- { connector: mqtt-streaming, pre_cmd: 'docker-compose up -d mqtt' }
- { connector: orientdb, pre_cmd: 'docker-compose up -d orientdb' }
- { connector: pravega, pre_cmd: 'docker-compose up -d pravega'}
- { connector: kudu, pre_cmd: 'docker compose up -d kudu-master kudu-tserver' }
- { connector: mongodb, pre_cmd: 'docker compose up -d mongo' }
- { connector: mqtt, pre_cmd: 'docker compose up -d mqtt' }
- { connector: mqtt-streaming, pre_cmd: 'docker compose up -d mqtt' }
- { connector: orientdb, pre_cmd: 'docker compose up -d orientdb' }
- { connector: pravega, pre_cmd: 'docker compose up -d pravega'}
- { connector: reference }
- { connector: s3 }
- { connector: spring-web }
- { connector: simple-codecs }
- { connector: slick }
- { connector: sns, pre_cmd: 'docker-compose up -d amazonsns' }
- { connector: sns, pre_cmd: 'docker compose up -d amazonsns' }
- { connector: solr }
- { connector: sqs, pre_cmd: 'docker-compose up -d elasticmq' }
- { connector: sqs, pre_cmd: 'docker compose up -d elasticmq' }
- { connector: sse }
- { connector: text }
- { connector: udp }
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ lazy val `pekko-connectors` = project
| starts a webserver and opens a new browser window
|
| test - runs all the tests for all of the connectors.
| Make sure to run `docker-compose up` first.
| Make sure to run `docker compose up` first.
|
| mqtt/testOnly *.MqttSourceSpec - runs a single test
|
Expand Down
3 changes: 1 addition & 2 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# For detailed information about docker-compose visit https://docs.docker.com/compose/
# To start all docker containers required to execute the tests locally run:
# docker-compose up
# docker compose up

version: '2.2'
services:
amazoneventbridge:
image: localstack/localstack:0.10.6
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/paradox/aws-event-bridge.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Messages published in a batch using @apidoc[EventBridgePublisher.flowSeq](EventB

## Integration testing

For integration testing without connecting directly to Amazon EventBridge, Apache Pekko Connectors uses [Localstack](https://github.com/localstack/localstack), which comes as a docker image - and has a corresponding service `amazoneventbridge` in the `docker-compose.yml` file. Which needs to be started before running the integration tests `docker-compose up amazoneventbridge`.
For integration testing without connecting directly to Amazon EventBridge, Apache Pekko Connectors uses [Localstack](https://github.com/localstack/localstack), which comes as a docker image - and has a corresponding service `amazoneventbridge` in the `docker-compose.yml` file. Which needs to be started before running the integration tests `docker compose up amazoneventbridge`.

@@@ index

Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/paradox/ftp.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ Java
The code in this guide is part of runnable tests of this project. You are welcome to browse the code, edit and run it in sbt.

```
docker-compose up -d ftp sftp
docker compose up -d ftp sftp
sbt
> ftp/test
```
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/paradox/google-cloud-pub-sub-grpc.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ Java
@@@ note
Integration test code requires Google Cloud Pub/Sub emulator running in the background. You can start it quickly using docker:

`docker-compose up -d gcloud-pubsub-client`
`docker compose up -d gcloud-pubsub-client`

This will also run the Pub/Sub admin client that will create topics and subscriptions used by the
integration tests.
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/paradox/mqtt.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ The code in this guide is part of runnable tests of this project. You are welcom

> Test code requires a MQTT server running in the background. You can start one quickly using docker:
>
> `docker-compose up mqtt`
> `docker compose up mqtt`
Scala
: ```
Expand Down
2 changes: 1 addition & 1 deletion scripts/ftp-servers.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ set -x
export FTP_USER_UID=$(id -u)
export FTP_USER_GID=$(id -g)

docker-compose up -d ftp sftp squid
docker compose up -d ftp sftp squid

0 comments on commit 16b20d1

Please sign in to comment.