DRY up Cypress docker-compose

getredash · Sep 3, 2019 · 43abac7 · 43abac7
1 parent 4b90dae
commit 43abac7
Showing 1 changed file with 3 additions and 38 deletions.
diff --git a/.circleci/docker-compose.cypress.yml b/.circleci/docker-compose.cypress.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: '3.2'
 services:
   server:
     build: ../
@@ -15,46 +15,11 @@ services:
       REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
       REDASH_RATELIMIT_ENABLED: "false"
   scheduler:
-    build: .
-    command: scheduler
-    volumes:
-      - type: bind
-        source: .
-        target: /app
-    depends_on:
-      - server
-    environment:
-      REDASH_REDIS_URL: "redis://redis:6379/0"
+    build: ../
   rq_worker:
-    build: .
-    command: dev_rq_worker
-    deploy:
-      replicas: 2
-    volumes:
-      - type: bind
-        source: .
-        target: /app
-    depends_on:
-      - server
-    tty: true
-    environment:
-      PYTHONUNBUFFERED: 0
-      REDASH_LOG_LEVEL: "INFO"
-      REDASH_REDIS_URL: "redis://redis:6379/0"
-      REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
-      QUEUES: "default periodic schemas"
+    build: ../
   worker:
     build: ../
-    command: worker
-    depends_on:
-      - server
-    environment:
-      PYTHONUNBUFFERED: 0
-      REDASH_LOG_LEVEL: "INFO"
-      REDASH_REDIS_URL: "redis://redis:6379/0"
-      REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
-      QUEUES: "queries,scheduled_queries"
-      WORKERS_COUNT: 2
   cypress:
     build:
       context: ../