From bebe01449674d046d181d19340e7b31f2caba883 Mon Sep 17 00:00:00 2001 From: Teo Gebhard Date: Mon, 25 Sep 2023 17:22:35 +0300 Subject: [PATCH 1/3] add entry-point service --- docker-compose.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index ff721fd..b34466c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -167,6 +167,27 @@ services: interval: 30s timeout: 10s retries: 20 + entry-point: + # NOTE THIS IS NOT USABLE YET as streamr/broker-node:dev images are in brubeck era, not in streamr-1.0 era + # - we currently publish images only from main, not from streamr-1.0 + # - i.e. in the current streamr/broker-node:dev image there is no "entry-point" script at all + # TODO could move entry-point.ts from broker/bin to dht/bin then create a dht docker image and then use it here + # - also remove "entry-point" from broker's package.json bin script list + # TODO add this as a dependency for all brokers + container_name: streamr-dev-entry-point + image: streamr/broker-node:dev + init: true + networks: + - streamr-network + restart: unless-stopped + ports: + - "40500:40500" + command: npm exec -- entry-point + healthcheck: + test: ["CMD", "curl", "${STREAMR_BASE_URL}:40500"] + interval: 1s + timeout: 5s + retries: 10 broker-node-storage-1: container_name: streamr-dev-broker-node-storage-1 image: streamr/broker-node:dev From 4e634c26351454116f6042fa508d3badbeaac862 Mon Sep 17 00:00:00 2001 From: Teo Gebhard Date: Mon, 25 Sep 2023 17:27:47 +0300 Subject: [PATCH 2/3] lint --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index b34466c..f5b6151 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -172,7 +172,7 @@ services: # - we currently publish images only from main, not from streamr-1.0 # - i.e. in the current streamr/broker-node:dev image there is no "entry-point" script at all # TODO could move entry-point.ts from broker/bin to dht/bin then create a dht docker image and then use it here - # - also remove "entry-point" from broker's package.json bin script list + # - also remove "entry-point" from broker's package.json bin script list # TODO add this as a dependency for all brokers container_name: streamr-dev-entry-point image: streamr/broker-node:dev From 6b200fb1dfc4b6505807dcde9da849f60f6eedd6 Mon Sep 17 00:00:00 2001 From: Teo Gebhard Date: Mon, 25 Sep 2023 17:34:36 +0300 Subject: [PATCH 3/3] ignore entry-point --- .github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8a226ec..608ddc9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -47,7 +47,8 @@ jobs: - name: Check out the repo uses: actions/checkout@v3.5.2 - name: Start Streamr Docker Stack - run: ./streamr-docker-dev/bin.sh start --wait --timeout 600 + # TODO the entry-point service is temporarily disabled as broker images are not yet built from streamr-1.0 branch + run: ./streamr-docker-dev/bin.sh start --wait --timeout 600 --except entry-point - name: Collect docker logs on failure if: failure() uses: jwalton/gh-docker-logs@v2.2.1