docker-compose.harness.yml -> docker-compose.yml:

- move the sentry release build to docker-compose.bench.yml file
- replace all occurrences of `.harness` in docs, makefiles & CI build

Author: elpiel

.github/workflows/ci.yml

@@ -68,7 +68,7 @@ jobs:
         uses: sudo-bot/action-docker-compose@latest
         with:
           # https://docs.docker.com/compose/reference/overview/
-          cli-args: "-f docker-compose.harness.yml up -d --build adex-postgres adex-redis ganache-1 ganache-1337"
+          cli-args: "up -d --build adex-postgres adex-redis ganache-1 ganache-1337"
       - uses: actions-rs/toolchain@v1
         with:
           # No need to add `toolchain`, it will use `rust-toolchain` file instead

README.md

@@ -30,7 +30,7 @@ Two services are needed to run `Sentry`: `Postgres` and `Redis`.
 
 The easiest way to run these services locally is by using the provided `docker-compose` file:
 
-`docker-compose -f docker-compose.harness.yml up -d adex-redis adex-postgres`
+`docker-compose -f docker-compose.yml up -d adex-redis adex-postgres`
 
 If you want to run them manually without `docker-compose`:
 
@@ -245,7 +245,7 @@ cargo make
 It will format your code using `rustfmt` and will perform `clippy` checks (it will fail on warnings).
 Thanks to `cargo` it will run all the tests (doc tests, unit tests, integration tests, etc.).
 
-Using the provided `docker-compose.harness.yml` setup [`cargo-make`][cargo-make overview] will run
+Using the provided `docker-compose.yml` setup [`cargo-make`][cargo-make overview] will run
 all the required services for the specific crate/application before executing the tests.
 
 [cargo-make overview]: https://github.com/sagiegurari/cargo-make#overview

adapter/Makefile.toml

@@ -21,9 +21,9 @@ args = ["test", "--all-features"]
 [tasks.ganache-up]
 # `--renew-anon-volumes` is required to make sure that the snapshot used for the `ganache` instances is reloaded.
 script = '''
-docker-compose -f ../docker-compose.harness.yml up --renew-anon-volumes -d ganache-1 ganache-1337 \
+docker-compose -f ../docker-compose.yml up --renew-anon-volumes -d ganache-1 ganache-1337 \
 && sleep 6
 '''
 
 [tasks.ganache-down]
-script = "docker-compose -f ../docker-compose.harness.yml down"
+script = "docker-compose -f ../docker-compose.yml down"

docker-compose.bench.yml

@@ -0,0 +1,25 @@
+version: '3.8'
+
+services:
+  # Service used to bechmark the sentry application in release mode
+  # It uses the dummy adapter and the Leader
+  sentry-dummy-leader-release:
+    restart: unless-stopped
+    build:
+      context: .
+      dockerfile: Dockerfile-sentry
+    container_name: adex-sentry-dummy-leader-release
+    ports:
+      - "8005:8005"
+    environment:
+      ENV: development
+      IP_ADDR: 0.0.0.0
+      PORT: 8005
+      POSTGRES_DB: sentry_leader
+      POSTGRES_HOST: adex-postgres
+      REDIS_HOST: adex-redis
+      ADAPTER: dummy
+      DUMMY_IDENTITY: '0x80690751969B234697e9059e04ed72195c3507fa'
+      REDIS_URL: redis://adex-redis:6379/0
+    networks:
+      - adex-external

docker-compose.dev.yml

@@ -28,6 +28,7 @@ services:
       - "6379:6379"
     networks:
       - adex-external
+
   ganache-1:
     build:
       context: ./scripts/ethereum
@@ -59,28 +60,5 @@ services:
     networks:
       - adex-external
 
-  # Service used to bechmark the sentry application in release mode
-  # It uses the dummy adapter and the Leader
-  sentry-dummy-leader-release:
-    restart: unless-stopped
-    build:
-      context: .
-      dockerfile: Dockerfile-sentry
-    container_name: adex-sentry-dummy-leader-release
-    ports:
-      - "8005:8005"
-    environment:
-      ENV: development
-      IP_ADDR: 0.0.0.0
-      PORT: 8005
-      POSTGRES_DB: sentry_leader
-      POSTGRES_HOST: adex-postgres
-      REDIS_HOST: adex-redis
-      ADAPTER: dummy
-      DUMMY_IDENTITY: '0x80690751969B234697e9059e04ed72195c3507fa'
-      REDIS_URL: redis://adex-redis:6379/0
-    networks:
-      - adex-external
-
 networks:
   adex-external:

docker-compose.harness.yml renamed to docker-compose.yml

@@ -19,7 +19,7 @@ dependencies = [
 env = { "POSTGRES_DB" = "primitives" }
 
 [tasks.services-up]
-script = "docker-compose -f ../docker-compose.harness.yml up -d adex-postgres && sleep 6"
+script = "docker-compose -f ../docker-compose.yml up -d adex-postgres && sleep 6"
 
 [tasks.services-down]
-script = "docker-compose -f ../docker-compose.harness.yml down"
+script = "docker-compose -f ../docker-compose.yml down"

primitives/Makefile.toml

@@ -19,10 +19,10 @@ dependencies = [
 env = { "POSTGRES_DB" = "sentry_leader" }
 
 [tasks.services-up]
-script = "docker-compose -f ../docker-compose.harness.yml up -d adex-redis adex-postgres && sleep 3"
+script = "docker-compose -f ../docker-compose.yml up -d adex-redis adex-postgres && sleep 3"
 
 [tasks.services-down]
-script = "docker-compose -f ../docker-compose.harness.yml down"
+script = "docker-compose -f ../docker-compose.yml down"
 
 [tasks.run-benchmark]
 category = "Development"
@@ -59,7 +59,8 @@ args = [
 
 [tasks.benchmark-services-up]
 # `--renew-anon-volumes` is required to make sure that the Databases are dumpped.
-script = "docker-compose -f ../docker-compose.harness.yml up --renew-anon-volumes -d adex-redis adex-postgres sentry-dummy-leader-release && sleep 3"
+# also run with `--build` to build the latest release of sentry!
+script = "docker-compose -f ../docker-compose.yml -f ../docker-compose.bench.yml up --build --renew-anon-volumes -d adex-redis adex-postgres sentry-dummy-leader-release && sleep 3"
 
 [tasks.benchmark-services-down]
-script = "docker-compose -f ../docker-compose.harness.yml down"
+script = "docker-compose -f ../docker-compose.yml -f ../docker-compose.bench.yml down"

sentry/Makefile.toml

@@ -21,9 +21,9 @@ dependencies = ["services-up", "test-flow", "services-down"]
 # it's used primarily for `ganache-cli`.
 # This forces the snapshot from previous unsuccessful test runs to get destroyed.
 script = '''
-docker-compose -f ../docker-compose.harness.yml up --renew-anon-volumes -d ganache-1 ganache-1337 adex-redis adex-postgres \
+docker-compose -f ../docker-compose.yml up --renew-anon-volumes -d ganache-1 ganache-1337 adex-redis adex-postgres \
 && sleep 6
 '''
 
 [tasks.services-down]
-script = "docker-compose -f ../docker-compose.harness.yml down"
+script = "docker-compose -f ../docker-compose.yml down"