From 6f5041dbe2c887599bcdd05292bff2b44bb92c3f Mon Sep 17 00:00:00 2001 From: Enno Runne <458526+ennru@users.noreply.github.com> Date: Thu, 15 Aug 2024 09:47:10 +0200 Subject: [PATCH] Docker compose (without hyphen) (#3251) * Docker compose (without hyphen) * Ignore failing repo.akka.io URL --- .github/workflows/check-build-test.yml | 40 +++++++++---------- build.sbt | 2 +- docker-compose.yml | 4 +- docs/src/main/paradox/aws-event-bridge.md | 2 +- docs/src/main/paradox/ftp.md | 2 +- .../main/paradox/google-cloud-pub-sub-grpc.md | 2 +- docs/src/main/paradox/mqtt.md | 2 +- scripts/ftp-servers.sh | 2 +- scripts/link-validator.conf | 1 + 9 files changed, 29 insertions(+), 28 deletions(-) diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml index 9a613fcd79..1de27f85d4 100644 --- a/.github/workflows/check-build-test.yml +++ b/.github/workflows/check-build-test.yml @@ -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 } diff --git a/build.sbt b/build.sbt index 2bb6ffdb11..1f85a5a850 100644 --- a/build.sbt +++ b/build.sbt @@ -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 | diff --git a/docker-compose.yml b/docker-compose.yml index f56a7e4adc..911f155d66 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: diff --git a/docs/src/main/paradox/aws-event-bridge.md b/docs/src/main/paradox/aws-event-bridge.md index c9656d6683..3268b14b23 100644 --- a/docs/src/main/paradox/aws-event-bridge.md +++ b/docs/src/main/paradox/aws-event-bridge.md @@ -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 diff --git a/docs/src/main/paradox/ftp.md b/docs/src/main/paradox/ftp.md index d95063a43b..73a07705d4 100644 --- a/docs/src/main/paradox/ftp.md +++ b/docs/src/main/paradox/ftp.md @@ -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 ``` diff --git a/docs/src/main/paradox/google-cloud-pub-sub-grpc.md b/docs/src/main/paradox/google-cloud-pub-sub-grpc.md index 68a221c163..de2e7fe198 100644 --- a/docs/src/main/paradox/google-cloud-pub-sub-grpc.md +++ b/docs/src/main/paradox/google-cloud-pub-sub-grpc.md @@ -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. diff --git a/docs/src/main/paradox/mqtt.md b/docs/src/main/paradox/mqtt.md index e3e7161146..3446fc826b 100644 --- a/docs/src/main/paradox/mqtt.md +++ b/docs/src/main/paradox/mqtt.md @@ -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 : ``` diff --git a/scripts/ftp-servers.sh b/scripts/ftp-servers.sh index 249b5da754..b086a79b86 100755 --- a/scripts/ftp-servers.sh +++ b/scripts/ftp-servers.sh @@ -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 diff --git a/scripts/link-validator.conf b/scripts/link-validator.conf index 1d730c6f05..c9eb35163c 100644 --- a/scripts/link-validator.conf +++ b/scripts/link-validator.conf @@ -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"