From 5916cb708b0e96fdc0454071d919969d956f6f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20G=C3=B3rny?= Date: Wed, 6 Oct 2021 11:07:37 +0200 Subject: [PATCH] Fix formatting of the docker compose files, add quotes around vars --- .../docker-compose.yaml | 14 +++---- openwhisk/docker-compose.yaml | 40 +++++++++---------- openwhisk/docker-whisk-controller.env | 8 ++-- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/aurras-event-feed-substrate/docker-compose.yaml b/aurras-event-feed-substrate/docker-compose.yaml index a956579..f32d211 100644 --- a/aurras-event-feed-substrate/docker-compose.yaml +++ b/aurras-event-feed-substrate/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.5' +version: '3.8' services: aurras-event-feed-substrate: image: hugobyte/aurras-event-feed-substrate @@ -15,9 +15,9 @@ services: - ./config:/config networks: - default: - name: aurras - driver: bridge - gateway: - name: gateway - external: true \ No newline at end of file + default: + name: aurras + driver: bridge + gateway: + name: gateway + external: true diff --git a/openwhisk/docker-compose.yaml b/openwhisk/docker-compose.yaml index a0b3ad1..5577266 100644 --- a/openwhisk/docker-compose.yaml +++ b/openwhisk/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.5' +version: '3.8' services: db: image: apache/couchdb:2.3 @@ -19,7 +19,7 @@ services: environment: ZOO_SERVERS: server.1=0.0.0.0:2888:3888 ZOO_MY_ID: 1 - + kafka: image: wurstmeister/kafka:0.11.0.1 networks: @@ -56,16 +56,16 @@ services: - kafka kafka-topics-ui: - image: landoop/kafka-topics-ui:0.9.3 - environment: - - KAFKA_REST_PROXY_URL=http://kafka-rest:8082 - - KAFKA_REST_BOOTSTRAP_SERVERS=PLAINTEXT://kafka:9092 - - PROXY=true - ports: - - 8001:8000 - links: - - kafka - - kafka-rest + image: landoop/kafka-topics-ui:0.9.3 + environment: + - KAFKA_REST_PROXY_URL=http://kafka-rest:8082 + - KAFKA_REST_BOOTSTRAP_SERVERS=PLAINTEXT://kafka:9092 + - PROXY=true + ports: + - 8001:8000 + links: + - kafka + - kafka-rest redis: image: redis:2.8 @@ -80,7 +80,7 @@ services: - db:db.docker depends_on: - db - restart: "no" + restart: "no" volumes: - ./logs:/logs - ./config/ansible:/openwhisk/ansible @@ -148,7 +148,7 @@ services: - "31001:31001" - "9000:9000" - "9090:8080" - + kafka-provider: image: openwhisk/kafkaprovider:nightly command: /bin/sh -c "cd KafkaFeedProvider && while ping -q -c1 db.setup >/dev/null; do sleep 1; done; python -u app.py >> /logs/kafka-provider.log 2>&1" @@ -216,9 +216,9 @@ services: - "9333:9222" networks: - default: - name: openwhisk - driver: bridge - gateway: - name: gateway - driver: bridge \ No newline at end of file + default: + name: openwhisk + driver: bridge + gateway: + name: gateway + driver: bridge diff --git a/openwhisk/docker-whisk-controller.env b/openwhisk/docker-whisk-controller.env index bf66946..154601b 100644 --- a/openwhisk/docker-whisk-controller.env +++ b/openwhisk/docker-whisk-controller.env @@ -21,7 +21,7 @@ CONFIG_whisk_db_activationsFilterDdoc=whisks-filters.v2.1.0 KAFKA_DEFAULT_REPLICATION_FACTOR=1 KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 KAFKA_BROKER_ID=0 -KAFKA_HEAP_OPTS=-Xmx512m -Xms512m +KAFKA_HEAP_OPTS='-Xmx512m -Xms512m' KAFKA_ADVERTISED_PORT=9092 KAFKA_TOPICS_COMPLETED_RETENTION_MS=300000 KAFKA_TOPICS_COMPLETED_RETENTION_BYTES=104857600 @@ -42,7 +42,7 @@ CONFIG_whisk_containerPool_userMemory=1024m CONFIG_whisk_userEvents_enabled=true CONTROLLER_BLACKBOXFRACTION=0.10 -CONTROLLER_OPTS=-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=1098 -Xdebug -Xrunjdwp:transport=dt_socket,address=9222,server=y,suspend=n +CONTROLLER_OPTS='-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=1098 -Xdebug -Xrunjdwp:transport=dt_socket,address=9222,server=y,suspend=n' CONTROLLER_HA=false CONTROLLER_INSTANCES=1 CONTROLLER_LOCALBOOKKEEPING=true @@ -55,7 +55,7 @@ LOADBALANCER_ACTIVATIONCOUNTBEFORENEXTINVOKER=10 LOADBALANCER_USERMEMORY=1024m CONFIG_whisk_docker_containerFactory_useRunc=false -INVOKER_OPTS=-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=1098 -Xdebug -Xrunjdwp:transport=dt_socket,address=9222,server=y,suspend=n +INVOKER_OPTS='-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=1098 -Xdebug -Xrunjdwp:transport=dt_socket,address=9222,server=y,suspend=n' INVOKER_INSTANCES=3 AKKA_CLUSTER_HOST=localhost @@ -63,4 +63,4 @@ AKKA_CLUSTER_SEED_NODES=[] AKKA_CLUSTER_BIND_PORT=5221 WHISK_SYSTEM_KEY=whisk.system -RUNTIMES_MANIFEST={"runtimes":{"nodejs":[{"kind":"nodejs:6","default":false,"image":{"prefix":"openwhisk","name":"nodejs6action","tag":"nightly"},"deprecated":true,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}},{"kind":"nodejs:8","default":false,"image":{"prefix":"openwhisk","name":"action-nodejs-v8","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}},{"kind":"nodejs:10","default":true,"image":{"prefix":"openwhisk","name":"action-nodejs-v10","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"},"stemCells":[{"count":2,"memory":"256MB"}]},{"kind":"nodejs:12","default":false,"image":{"prefix":"openwhisk","name":"action-nodejs-v12","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}}],"python":[{"kind":"python:2","default":false,"image":{"prefix":"openwhisk","name":"python2action","tag":"1.13.0-incubating"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}},{"kind":"python:3","default":true,"image":{"prefix":"openwhisk","name":"python3action","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}}],"swift":[{"kind":"swift:4.2","default":true,"image":{"prefix":"openwhisk","name":"action-swift-v4.2","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}},{"kind":"swift:5.1","default":false,"image":{"prefix":"openwhisk","name":"action-swift-v5.1","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}}],"java":[{"kind":"java:8","default":true,"image":{"prefix":"openwhisk","name":"java8action","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"},"requireMain":true}],"php":[{"kind":"php:7.3","default":false,"deprecated":false,"image":{"prefix":"openwhisk","name":"action-php-v7.3","tag":"nightly"},"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}},{"kind":"php:7.4","default":true,"deprecated":false,"image":{"prefix":"openwhisk","name":"action-php-v7.4","tag":"nightly"},"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}}],"ruby":[{"kind":"ruby:2.5","default":true,"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"},"image":{"prefix":"openwhisk","name":"action-ruby-v2.5","tag":"nightly"}}],"go":[{"kind":"go:1.11","default":true,"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"},"image":{"prefix":"openwhisk","name":"action-golang-v1.11","tag":"nightly"}}],"dotnet":[{"kind":"dotnet:2.2","default":true,"deprecated":false,"requireMain":true,"image":{"prefix":"openwhisk","name":"action-dotnet-v2.2","tag":"nightly"},"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}},{"kind":"dotnet:3.1","default":false,"deprecated":false,"requireMain":true,"image":{"prefix":"openwhisk","name":"action-dotnet-v3.1","tag":"nightly"},"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}}],"ballerina":[{"kind":"ballerina:0.990","default":true,"image":{"prefix":"openwhisk","name":"action-ballerina-v0.990.2","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}}],"rust":[{"kind":"rust:1.34","default":true,"image":{"prefix":"openwhisk","name":"action-rust-v1.34","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}}]},"blackboxes":[{"prefix":"openwhisk","name":"dockerskeleton","tag":"nightly"}]} \ No newline at end of file +RUNTIMES_MANIFEST={"runtimes":{"nodejs":[{"kind":"nodejs:6","default":false,"image":{"prefix":"openwhisk","name":"nodejs6action","tag":"nightly"},"deprecated":true,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}},{"kind":"nodejs:8","default":false,"image":{"prefix":"openwhisk","name":"action-nodejs-v8","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}},{"kind":"nodejs:10","default":true,"image":{"prefix":"openwhisk","name":"action-nodejs-v10","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"},"stemCells":[{"count":2,"memory":"256MB"}]},{"kind":"nodejs:12","default":false,"image":{"prefix":"openwhisk","name":"action-nodejs-v12","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}}],"python":[{"kind":"python:2","default":false,"image":{"prefix":"openwhisk","name":"python2action","tag":"1.13.0-incubating"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}},{"kind":"python:3","default":true,"image":{"prefix":"openwhisk","name":"python3action","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}}],"swift":[{"kind":"swift:4.2","default":true,"image":{"prefix":"openwhisk","name":"action-swift-v4.2","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}},{"kind":"swift:5.1","default":false,"image":{"prefix":"openwhisk","name":"action-swift-v5.1","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}}],"java":[{"kind":"java:8","default":true,"image":{"prefix":"openwhisk","name":"java8action","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"},"requireMain":true}],"php":[{"kind":"php:7.3","default":false,"deprecated":false,"image":{"prefix":"openwhisk","name":"action-php-v7.3","tag":"nightly"},"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}},{"kind":"php:7.4","default":true,"deprecated":false,"image":{"prefix":"openwhisk","name":"action-php-v7.4","tag":"nightly"},"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}}],"ruby":[{"kind":"ruby:2.5","default":true,"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"},"image":{"prefix":"openwhisk","name":"action-ruby-v2.5","tag":"nightly"}}],"go":[{"kind":"go:1.11","default":true,"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"},"image":{"prefix":"openwhisk","name":"action-golang-v1.11","tag":"nightly"}}],"dotnet":[{"kind":"dotnet:2.2","default":true,"deprecated":false,"requireMain":true,"image":{"prefix":"openwhisk","name":"action-dotnet-v2.2","tag":"nightly"},"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}},{"kind":"dotnet:3.1","default":false,"deprecated":false,"requireMain":true,"image":{"prefix":"openwhisk","name":"action-dotnet-v3.1","tag":"nightly"},"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}}],"ballerina":[{"kind":"ballerina:0.990","default":true,"image":{"prefix":"openwhisk","name":"action-ballerina-v0.990.2","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}}],"rust":[{"kind":"rust:1.34","default":true,"image":{"prefix":"openwhisk","name":"action-rust-v1.34","tag":"nightly"},"deprecated":false,"attached":{"attachmentName":"codefile","attachmentType":"text/plain"}}]},"blackboxes":[{"prefix":"openwhisk","name":"dockerskeleton","tag":"nightly"}]}