solution to this error: 'updated config is invalid: client config invalid: chain-id is empty'

.gitea/workflows/fixturenet-eth-plugeth-arm-test.yml

@@ -43,11 +43,3 @@ jobs:
         run: ./scripts/build_shiv_package.sh
       - name: "Run fixturenet-eth tests"
         run: ./tests/fixturenet-eth-plugeth/run-test.sh
-      - name: Notify Slack on CI failure
-          if: always()
-          uses: ravsamhq/notify-slack-action@v2
-          with:
-            status: ${{ job.status }}
-            notify_when: 'failure'
-          env:
-            SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}

.gitea/workflows/fixturenet-eth-plugeth-test.yml

@@ -47,11 +47,3 @@ jobs:
           sleep 5
       - name: "Run fixturenet-eth tests"
         run: ./tests/fixturenet-eth-plugeth/run-test.sh
-      - name: Notify Slack on CI failure
-          if: always()
-          uses: ravsamhq/notify-slack-action@v2
-          with:
-            status: ${{ job.status }}
-            notify_when: 'failure'
-          env:
-            SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}

.gitea/workflows/fixturenet-eth-test.yml

@@ -45,11 +45,4 @@ jobs:
           sleep 5
       - name: "Run fixturenet-eth tests"
         run: ./tests/fixturenet-eth/run-test.sh
-      - name: Notify Slack on CI failure
-          if: always()
-          uses: ravsamhq/notify-slack-action@v2
-          with:
-            status: ${{ job.status }}
-            notify_when: 'failure'
-          env:
-            SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
+

.gitea/workflows/fixturenet-laconicd-test.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   test:
-    name: "Run Laconicd fixturenet and Laconic CLI tests"
+    name: "Run an Laconicd fixturenet test"
     runs-on: ubuntu-latest
     steps:
       - name: 'Update'
@@ -46,13 +46,3 @@ jobs:
         run: ./scripts/build_shiv_package.sh
       - name: "Run fixturenet-laconicd tests"
         run: ./tests/fixturenet-laconicd/run-test.sh
-      - name: "Run laconic CLI tests"
-        run: ./tests/fixturenet-laconicd/run-cli-test.sh
-      - name: Notify Slack on CI failure
-          if: always()
-          uses: ravsamhq/notify-slack-action@v2
-          with:
-            status: ${{ job.status }}
-            notify_when: 'failure'
-          env:
-            SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}

.gitea/workflows/lint.yml

@@ -19,11 +19,3 @@ jobs:
           python-version: '3.8'
       - name : "Run flake8"
         uses: py-actions/flake8@v2
-      - name: Notify Slack on CI failure
-          if: always()
-          uses: ravsamhq/notify-slack-action@v2
-          with:
-            status: ${{ job.status }}
-            notify_when: 'failure'
-          env:
-            SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}

.gitea/workflows/publish.yml

@@ -54,11 +54,3 @@ jobs:
           # Hack using endsWith to workaround Gitea sometimes sending "publish-test" vs "refs/heads/publish-test"
           draft: ${{ endsWith('publish-test', github.ref ) }}
           files: ./laconic-so
-      - name: Notify Slack on CI failure
-          if: always()
-          uses: ravsamhq/notify-slack-action@v2
-          with:
-            status: ${{ job.status }}
-            notify_when: 'failure'
-          env:
-            SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}

.gitea/workflows/test-container-registry.yml

@@ -51,11 +51,4 @@ jobs:
           source /opt/bash-utils/cgroup-helper.sh
           join_cgroup
           ./tests/container-registry/run-test.sh
-      - name: Notify Slack on CI failure
-          if: always()
-          uses: ravsamhq/notify-slack-action@v2
-          with:
-            status: ${{ job.status }}
-            notify_when: 'failure'
-          env:
-            SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
+

.gitea/workflows/test-database.yml

@@ -49,11 +49,4 @@ jobs:
           source /opt/bash-utils/cgroup-helper.sh
           join_cgroup
           ./tests/database/run-test.sh
-      - name: Notify Slack on CI failure
-          if: always()
-          uses: ravsamhq/notify-slack-action@v2
-          with:
-            status: ${{ job.status }}
-            notify_when: 'failure'
-          env:
-            SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
+

.gitea/workflows/test-deploy.yml

@@ -47,11 +47,3 @@ jobs:
           sleep 5
       - name: "Run deploy tests"
         run: ./tests/deploy/run-deploy-test.sh
-      - name: Notify Slack on CI failure
-          if: always()
-          uses: ravsamhq/notify-slack-action@v2
-          with:
-            status: ${{ job.status }}
-            notify_when: 'failure'
-          env:
-            SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}

.gitea/workflows/test-k8s-deploy.yml

@@ -51,12 +51,4 @@ jobs:
           source /opt/bash-utils/cgroup-helper.sh
           join_cgroup
           ./tests/k8s-deploy/run-deploy-test.sh
-      - name: Notify Slack on CI failure
-          if: always()
-          uses: ravsamhq/notify-slack-action@v2
-          with:
-            status: ${{ job.status }}
-            notify_when: 'failure'
-          env:
-            SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
 

.gitea/workflows/test-webapp.yml

@@ -49,11 +49,3 @@ jobs:
           sleep 5
       - name: "Run webapp tests"
         run: ./tests/webapp-test/run-webapp-test.sh
-      - name: Notify Slack on CI failure
-          if: always()
-          uses: ravsamhq/notify-slack-action@v2
-          with:
-            status: ${{ job.status }}
-            notify_when: 'failure'
-          env:
-            SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}

.gitea/workflows/test.yml

@@ -47,11 +47,5 @@ jobs:
           sleep 5
       - name: "Run smoke tests"
         run: ./tests/smoke-test/run-smoke-test.sh
-      - name: Notify Slack on CI failure
-          if: always()
-          uses: ravsamhq/notify-slack-action@v2
-          with:
-            status: ${{ job.status }}
-            notify_when: 'failure'
-          env:
-            SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
+
+

.gitea/workflows/triggers/fixturenet-laconicd-test

@@ -1,5 +1,3 @@
 Change this file to trigger running the fixturenet-laconicd-test CI job
 Trigger
 Trigger
-Trigger
-Trigger

README.md

@@ -26,7 +26,8 @@ curl -SL https://github.com/docker/compose/releases/download/v2.11.2/docker-comp
 chmod +x ~/.docker/cli-plugins/docker-compose
 ```
 
-Next decide on a directory where you would like to put the stack-orchestrator program. Typically this would be a "user" binary directory such as `~/bin` or perhaps `/usr/local/laconic` or possibly just the current working directory.
+Next decide on a directory where you would like to put the stack-orchestrator program. Typically this would be 
+a "user" binary directory such as `~/bin` or perhaps `/usr/local/laconic` or possibly just the current working directory.
 
 Now, having selected that directory, download the latest release from [this page](https://git.vdb.to/cerc-io/stack-orchestrator/tags) into it (we're using `~/bin` below for concreteness but edit to suit if you selected a different directory). Also be sure that the destination directory exists and is writable:
 
@@ -55,7 +56,6 @@ echo "distribution-url: https://git.vdb.to/cerc-io/stack-orchestrator/releases/d
 ```
 
 ### Update
-
 If Stack Orchestrator was installed using the process described above, it is able to subsequently self-update to the current latest version by running:
 
 ```bash
@@ -78,3 +78,5 @@ See the [CONTRIBUTING.md](/docs/CONTRIBUTING.md) for developer mode install.
 ## Platform Support
 
 Native aarm64 is _not_ currently supported. x64 emulation on ARM64 macos should work (not yet tested).
+
+

stack_orchestrator/data/compose/docker-compose-fixturenet-laconic2d.yml

@@ -0,0 +1,30 @@
+services:
+  laconic2d:
+    restart: unless-stopped
+    image: cerc/laconic2d:local
+    command: ["sh", "/docker-entrypoint-scripts.d/create-fixturenet.sh"]
+    volumes:
+      # The cosmos-sdk node's database directory:
+      - laconic2d-data:/root/.laconic2d
+      # TODO: look at folding these scripts into the container
+      - ../config/fixturenet-laconic2d/create-fixturenet.sh:/docker-entrypoint-scripts.d/create-fixturenet.sh
+      - ../config/fixturenet-laconic2d/export-mykey.sh:/docker-entrypoint-scripts.d/export-mykey.sh
+      - ../config/fixturenet-laconic2d/export-myaddress.sh:/docker-entrypoint-scripts.d/export-myaddress.sh
+    # TODO: determine which of the ports below is really needed
+    ports:
+      - "6060"
+      - "26657"
+      - "26656"
+      - "9473"
+      - "8545"
+      - "8546"
+      - "9090"
+      - "9091"
+      - "1317"
+  cli:
+    image: cerc/laconic-registry-cli:local
+    volumes:
+      - ../config/fixturenet-laconic2d/registry-cli-config-template.yml:/registry-cli-config-template.yml
+
+volumes:
+  laconic2d-data:

stack_orchestrator/data/compose/docker-compose-fixturenet-laconicd.yml

@@ -3,9 +3,6 @@ services:
     restart: unless-stopped
     image: cerc/laconicd:local
     command: ["sh", "/docker-entrypoint-scripts.d/create-fixturenet.sh"]
-    environment:
-      TEST_AUCTION_ENABLED: ${TEST_AUCTION_ENABLED}
-      TEST_REGISTRY_EXPIRY: ${TEST_REGISTRY_EXPIRY}
     volumes:
       # The cosmos-sdk node's database directory:
       - laconicd-data:/root/.laconicd
@@ -28,7 +25,6 @@ services:
     image: cerc/laconic-registry-cli:local
     volumes:
       - ../config/fixturenet-laconicd/registry-cli-config-template.yml:/registry-cli-config-template.yml
-      - ${BASE_DIR:-~/cerc}/laconic-registry-cli:/laconic-registry-cli
 
 volumes:
   laconicd-data:

stack_orchestrator/data/config/fixturenet-laconic2d/create-fixturenet.sh

@@ -0,0 +1,91 @@
+#!/bin/bash
+
+KEY="mykey"
+CHAINID="laconic_9000-1"
+MONIKER="localtestnet"
+KEYRING="test"
+LOGLEVEL="${LOGLEVEL:-info}"
+
+if [ "$1" == "clean" ] || [ ! -d "$HOME/.laconic2d/data/blockstore.db" ]; then
+  # validate dependencies are installed
+  command -v jq > /dev/null 2>&1 || {
+    echo >&2 "jq not installed. More info: https://stedolan.github.io/jq/download/"
+    exit 1
+  }
+
+  # remove existing daemon and client
+  rm -rf $HOME/.laconic2d/*
+  rm -rf $HOME/.laconic/*
+
+  if [ -n "`which make`" ]; then
+    make install
+  fi
+
+  laconic2d config set client chain-id $CHAINID
+  laconic2d config set client keyring-backend $KEYRING
+
+  # if $KEY exists it should be deleted
+  laconic2d keys add $KEY --keyring-backend $KEYRING
+
+  # Set moniker and chain-id for Ethermint (Moniker can be anything, chain-id must be an integer)
+  laconic2d init $MONIKER --chain-id $CHAINID --default-denom photon
+
+  update_genesis() {
+    jq "$1" $HOME/.laconic2d/config/genesis.json > $HOME/.laconic2d/config/tmp_genesis.json &&
+      mv $HOME/.laconic2d/config/tmp_genesis.json $HOME/.laconic2d/config/genesis.json
+  }
+
+  if [[ "$TEST_REGISTRY_EXPIRY" == "true" ]]; then
+    echo "Setting timers for expiry tests."
+
+    update_genesis '.app_state["registry"]["params"]["record_rent_duration"]="60s"'
+    update_genesis '.app_state["registry"]["params"]["authority_grace_period"]="60s"'
+    update_genesis '.app_state["registry"]["params"]["authority_rent_duration"]="60s"'
+  fi
+
+  if [[ "$TEST_AUCTION_ENABLED" == "true" ]]; then
+    echo "Enabling auction and setting timers."
+
+    update_genesis '.app_state["registry"]["params"]["authority_auction_enabled"]=true'
+    update_genesis '.app_state["registry"]["params"]["authority_rent_duration"]="60s"'
+    update_genesis '.app_state["registry"]["params"]["authority_grace_period"]="300s"'
+    update_genesis '.app_state["registry"]["params"]["authority_auction_commits_duration"]="60s"'
+    update_genesis '.app_state["registry"]["params"]["authority_auction_reveals_duration"]="60s"'
+  fi
+
+  # increase block time (?)
+  update_genesis '.consensus["params"]["block"]["time_iota_ms"]="1000"'
+
+  # Set gas limit in genesis
+  update_genesis '.consensus["params"]["block"]["max_gas"]="10000000"'
+
+  # disable produce empty block
+  if [[ "$OSTYPE" == "darwin"* ]]; then
+      sed -i '' 's/create_empty_blocks = true/create_empty_blocks = false/g' $HOME/.laconic2d/config/config.toml
+    else
+      sed -i 's/create_empty_blocks = true/create_empty_blocks = false/g' $HOME/.laconic2d/config/config.toml
+  fi
+
+  # Allocate genesis accounts (cosmos formatted addresses)
+  laconic2d genesis add-genesis-account $KEY 100000000000000000000000000photon --keyring-backend $KEYRING
+
+  # Sign genesis transaction
+  laconic2d genesis gentx $KEY 1000000000000000000000photon --keyring-backend $KEYRING --chain-id $CHAINID
+
+  # Collect genesis tx
+  laconic2d genesis collect-gentxs
+
+  # Run this to ensure everything worked and that the genesis file is setup correctly
+  laconic2d genesis validate
+else
+  echo "Using existing database at $HOME/.laconic2d.  To replace, run '`basename $0` clean'"
+fi
+
+# Start the node (remove the --pruning=nothing flag if historical queries are not needed)
+laconic2d start \
+  --pruning=nothing \
+  --log_level $LOGLEVEL \
+  --minimum-gas-prices=0.0001photon \
+  --api.enable \
+  --rpc.laddr="tcp://0.0.0.0:26657" \
+  --gql-server --gql-playground

stack_orchestrator/data/config/fixturenet-laconic2d/export-myaddress.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+laconic2d keys show mykey | grep address | cut -d ' ' -f 3

stack_orchestrator/data/config/fixturenet-laconic2d/export-mykey.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+echo y | laconic2d keys export mykey --unarmored-hex --unsafe

stack_orchestrator/data/config/fixturenet-laconic2d/registry-cli-config-template.yml

@@ -0,0 +1,9 @@
+services:
+  registry:
+    restEndpoint: 'http://laconic2d:1317'
+    gqlEndpoint: 'http://laconic2d:9473/api'
+    userKey: REPLACE_WITH_MYKEY
+    bondId:
+    chainId: laconic_9000-1
+    gas: 350000
+    fees: 200000aphoton

stack_orchestrator/data/container-build/cerc-laconic-registry-cli/create-demo-records.sh

@@ -5,7 +5,7 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
 
-registry_command="laconic cns"
+registry_command="laconic registry"
 demo_records_dir="scripts/demo-records"
 
 # Check we have funds

stack_orchestrator/data/container-build/cerc-laconic2d/build.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build cerc/laconicd
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+docker build -t cerc/laconic2d:local ${build_command_args} ${CERC_REPO_BASE_DIR}/laconic2d

stack_orchestrator/data/stacks/fixturenet-laconic-loaded/README.md

@@ -49,7 +49,7 @@ $ laconic-so --stack fixturenet-laconic-loaded deploy logs
 ```
 ## 6. Test with the Registry CLI
 ```
-$ laconic-so --stack fixturenet-laconic-loaded deploy exec cli "laconic cns status"
+$ laconic-so --stack fixturenet-laconic-loaded deploy exec cli "laconic registry status"
 ```
 ## 7. View the laconic console
 Get the URL for the console web app with this command (the port number will be different for each deployment):

stack_orchestrator/data/stacks/fixturenet-laconic-loaded/stack.yml

@@ -2,16 +2,16 @@ version: "1.1"
 name: fixturenet-laconic-loaded
 description: "A full featured laconic fixturenet"
 repos:
-  - git.vdb.to/cerc-io/laconicd
+  - git.vdb.to/cerc-io/laconic2d
   - github.com/lirewine/debug
   - github.com/lirewine/crypto
   - github.com/lirewine/gem
   - github.com/lirewine/sdk
-  - git.vdb.to/cerc-io/laconic-sdk
-  - git.vdb.to/cerc-io/laconic-registry-cli
-  - git.vdb.to/cerc-io/laconic-console
+  - git.vdb.to/cerc-io/registry-sdk
+  - git.vdb.to/cerc-io/laconic-registry-cli@laconic2
+  - git.vdb.to/cerc-io/laconic-console@laconic2
 npms:
-  - laconic-sdk
+  - registry-sdk
   - laconic-registry-cli
   - debug
   - crypto
@@ -19,12 +19,12 @@ npms:
   - gem
   - laconic-console
 containers:
-  - cerc/laconicd
+  - cerc/laconic2d
   - cerc/laconic-registry-cli
   - cerc/webapp-base
   - cerc/laconic-console-host
 pods:
-  - fixturenet-laconicd
+  - fixturenet-laconic2d
   - fixturenet-laconic-console
 config:
   cli:

stack_orchestrator/data/stacks/fixturenet-laconicd/README.md

@@ -44,5 +44,5 @@ $ laconic-so --stack fixturenet-laconicd deploy logs
 ```
 ## 6. Test with the Registry CLI
 ```
-$ laconic-so --stack fixturenet-laconicd deploy exec cli "laconic cns status"
+$ laconic-so --stack fixturenet-laconicd deploy exec cli "laconic registry status"
 ```

stack_orchestrator/deploy/webapp/util.py

@@ -94,7 +94,7 @@ class LaconicRegistryClient:
         )
 
     def list_records(self, criteria={}, all=False):
-        args = ["laconic", "-c", self.config_file, "cns", "record", "list"]
+        args = ["laconic", "-c", self.config_file, "registry", "record", "list"]
 
         if all:
             args.append("--all")
@@ -140,7 +140,7 @@ class LaconicRegistryClient:
         if name in self.cache.name_or_id:
             return self.cache.name_or_id[name]
 
-        args = ["laconic", "-c", self.config_file, "cns", "name", "resolve", name]
+        args = ["laconic", "-c", self.config_file, "registry", "name", "resolve", name]
 
         parsed = [AttrDict(r) for r in json.loads(logged_cmd(self.log_file, *args))]
         if parsed:
@@ -165,7 +165,7 @@ class LaconicRegistryClient:
             "laconic",
             "-c",
             self.config_file,
-            "cns",
+            "registry",
             "record",
             "get",
             "--id",
@@ -203,7 +203,8 @@ class LaconicRegistryClient:
             print(open(record_fname, 'r').read(), file=self.log_file)
 
             new_record_id = json.loads(
-                logged_cmd(self.log_file, "laconic", "-c", self.config_file, "cns", "record", "publish", "--filename", record_fname)
+                logged_cmd(self.log_file, "laconic", "-c", self.config_file, "registry",
+                           "record", "publish", "--filename", record_fname)
             )["id"]
             for name in names:
                 self.set_name(name, new_record_id)
@@ -212,10 +213,10 @@ class LaconicRegistryClient:
             logged_cmd(self.log_file, "rm", "-rf", tmpdir)
 
     def set_name(self, name, record_id):
-        logged_cmd(self.log_file, "laconic", "-c", self.config_file, "cns", "name", "set", name, record_id)
+        logged_cmd(self.log_file, "laconic", "-c", self.config_file, "registry", "name", "set", name, record_id)
 
     def delete_name(self, name):
-        logged_cmd(self.log_file, "laconic", "-c", self.config_file, "cns", "name", "delete", name)
+        logged_cmd(self.log_file, "laconic", "-c", self.config_file, "registry", "name", "delete", name)
 
 
 def file_hash(filename):

tests/fixturenet-laconicd/run-cli-test.sh

@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-echo "$(date +"%Y-%m-%d %T"): Running stack-orchestrator Laconic registry CLI tests"
-env
-cat /etc/hosts
-# Bit of a hack, test the most recent package
-TEST_TARGET_SO=$( ls -t1 ./package/laconic-so* | head -1 )
-
-export CERC_REPO_BASE_DIR=$(mktemp -d $(pwd)/stack-orchestrator-fixturenet-laconicd-test.XXXXXXXXXX)
-echo "$(date +"%Y-%m-%d %T"): Cloning laconic-registry-cli repository into: $CERC_REPO_BASE_DIR"
-$TEST_TARGET_SO --stack fixturenet-laconicd setup-repositories --include git.vdb.to/cerc-io/laconic-registry-cli
-
-echo "$(date +"%Y-%m-%d %T"): Starting stack"
-TEST_AUCTION_ENABLED=true BASE_DIR=${CERC_REPO_BASE_DIR} $TEST_TARGET_SO --stack fixturenet-laconicd deploy --cluster laconicd up
-echo "$(date +"%Y-%m-%d %T"): Stack started"
-
-# Verify that the fixturenet is up and running
-$TEST_TARGET_SO --stack fixturenet-laconicd deploy --cluster laconicd ps
-
-# Get the fixturenet account address
-laconicd_account_address=$(docker exec laconicd-laconicd-1 laconicd keys list | awk '/- address:/ {print $3}')
-
-# Copy over config
-docker exec laconicd-cli-1 cp config.yml laconic-registry-cli/
-
-# Wait for the laconid endpoint to come up
-echo "Waiting for the RPC endpoint to come up"
-docker exec laconicd-laconicd-1 sh -c "curl --retry 20 --retry-delay 3 --retry-connrefused http://127.0.0.1:9473/api"
-
-# Run the tests
-echo "Running the tests"
-docker exec -e TEST_ACCOUNT=$laconicd_account_address laconicd-cli-1 sh -c 'cd laconic-registry-cli && yarn && yarn test'
-
-# Clean up
-$TEST_TARGET_SO --stack fixturenet-laconicd deploy --cluster laconicd down --delete-volumes
-echo "$(date +"%Y-%m-%d %T"): Removing cloned repositories"
-rm -rf $CERC_REPO_BASE_DIR
-echo "$(date +"%Y-%m-%d %T"): Test finished"

tests/fixturenet-laconicd/run-test.sh

@@ -12,7 +12,6 @@ cat /etc/hosts
 TEST_TARGET_SO=$( ls -t1 ./package/laconic-so* | head -1 )
 # Set a new unique repo dir
 export CERC_REPO_BASE_DIR=$(mktemp -d $(pwd)/stack-orchestrator-fixturenet-laconicd-test.XXXXXXXXXX)
-
 echo "$(date +"%Y-%m-%d %T"): Testing this package: $TEST_TARGET_SO"
 echo "$(date +"%Y-%m-%d %T"): Test version command"
 reported_version_string=$( $TEST_TARGET_SO version )

tests/webapp-test/run-webapp-test.sh

@@ -32,14 +32,14 @@ set +e
 
 CONTAINER_ID=$(docker run -p 3000:80 -d -e CERC_SCRIPT_DEBUG=$CERC_SCRIPT_DEBUG cerc/test-progressive-web-app:local)
 sleep 3
-wget --tries 20 --retry-connrefused --waitretry=3 -O test.before -m http://localhost:3000
+wget -t 7 -O test.before -m http://localhost:3000
 
 docker logs $CONTAINER_ID
 docker remove -f $CONTAINER_ID
 
 CONTAINER_ID=$(docker run -p 3000:80 -e CERC_WEBAPP_DEBUG=$CHECK -e CERC_SCRIPT_DEBUG=$CERC_SCRIPT_DEBUG -d cerc/test-progressive-web-app:local)
 sleep 3
-wget --tries 20 --retry-connrefused --waitretry=3 -O test.after -m http://localhost:3000
+wget -t 7 -O test.after -m http://localhost:3000
 
 docker logs $CONTAINER_ID
 docker remove -f $CONTAINER_ID