Merge branch 'main' into dboreham/build-mobymask-watcher

compose/docker-compose-db.yml

@@ -15,7 +15,7 @@ services:
       DATABASE_PORT: 5432
 
   ipld-eth-db:
-    image: timescale/timescaledb:latest-pg14
+    image: timescale/timescaledb:2.8.1-pg14
     restart: always
     environment:
       POSTGRES_USER: "vdbm"

docker-compose-test.yaml

@@ -1,36 +0,0 @@
-version: '3'
-
-services:
-
-  # Postgresql DB
-  db:
-    image: timescale/timescaledb:latest-pg14
-    command: -c work_mem=256MB
-    restart: unless-stopped
-    environment:
-      POSTGRES_PASSWORD: db
-      POSTGRES_USER: db
-      POSTGRES_DB: db
-      POSTGRES_HOST_AUTH_METHOD: trust
-    ports:
-      # Postgresql
-      - "5432"
-
-  # Elastic
-  es:
-    restart: unless-stopped
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.10.0
-    environment:
-      - xpack.security.enabled=false
-      - discovery.type=single-node
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-      nofile:
-        soft: 65536
-        hard: 65536
-    cap_add:
-      - IPC_LOCK
-    ports:
-      - 9200