Skip to content

Commit

Permalink
Docker compose (without hyphen) (#3251)
Browse files Browse the repository at this point in the history 
* Docker compose (without hyphen)
* Ignore failing repo.akka.io URL
  • Loading branch information
@ennru
ennru authored Aug 15, 2024
1 parent 9a488e4 commit 6f5041d
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 28 deletions.
40 changes: 20 additions & 20 deletions .github/workflows/check-build-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,49 +87,49 @@ 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-tests }
- { 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: influxdb, pre_cmd: 'docker compose up -d influxdb' }
- { connector: ironmq, pre_cmd: 'docker compose up -d ironauth ironmq' }
- { connector: jakarta-jms }
- { connector: jms, pre_cmd: 'docker-compose up -d ibmmq' }
- { 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: pravega, pre_cmd: 'docker-compose up -d pravega'}
- { 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: 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 @@ -66,7 +66,7 @@ lazy val alpakka = 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
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# For detailed information about docker-compose visit https://docs.docker.com/compose/
# 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: '3.7'
services:
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 @@ -126,7 +126,7 @@ Messages published in a batch using @apidoc[EventBridgePublisher.flowSeq](EventB

## Integration testing

For integration testing without connecting directly to Amazon EventBridge, Alpakka 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, Alpakka 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 @@ -169,7 +169,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 @@ -151,7 +151,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 @@ -196,7 +196,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
1 change: 1 addition & 0 deletions scripts/link-validator.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ site-link-validator {
"^api/alpakka/snapshot/akka/stream/alpakka/googlecloud/storage/impl/Formats.*"

ignore-prefixes = [
"https://repo.akka.io/maven",
# Fails after a number of requests with "403 Forbidden"
"https://javadoc.io/static/"
# GitHub will block with "429 Too Many Requests"
Expand Down

0 comments on commit 6f5041d

Please sign in to comment.