cleanup

matestack · Mar 12, 2021 · be23dc4 · be23dc4
1 parent 1ab77bb
commit be23dc4
Showing 1 changed file with 1 addition and 59 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,7 +14,6 @@ services:
     volumes:
       - ./:/app
       - gem-volume:/usr/local/bundle
-      # - node-volume:/app/node_modules
     command: "bundle exec rails server -b 0.0.0.0"
     user: ${CURRENT_UID}
     stdin_open: true
@@ -29,8 +28,7 @@ services:
     volumes:
       - ./:/app
       - gem-volume:/usr/local/bundle
-      # - node-volume:/app/node_modules
-    command: "sh -c 'cd builder && ./bin/webpack --watch'"
+    command: "sh -c 'cd spec/dummy && ./bin/webpack --watch'"
     user: ${CURRENT_UID}
 
   test:
@@ -46,53 +44,10 @@ services:
     volumes:
       - ./:/app
       - gem-volume:/usr/local/bundle
-      # - node-volume:/app/node_modules
     command: "bundle exec rspec spec/test"
     user: ${CURRENT_UID}
 
-  test_5_2_ruby_2_6:
-    build:
-      context: .
-      dockerfile: ./ci/Dockerfile.test_5_2_ruby_2_6
-    environment:
-      RAILS_ENV: test
-    links:
-      - "postgres_test_5_2_ruby_2_6:postgres_test"
-    command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test"
-    user: ${CURRENT_UID}
-
-  test_6_0_ruby_2_6:
-    build:
-      context: .
-      dockerfile: ./ci/Dockerfile.test_6_0_ruby_2_6
-    environment:
-      RAILS_ENV: test
-    links:
-      - "postgres_test_6_0_ruby_2_6:postgres_test"
-    command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test"
-    user: ${CURRENT_UID}
-
-  test_6_1_ruby_2_7:
-    build:
-      context: .
-      dockerfile: ./ci/Dockerfile.test_6_1_ruby_2_7
-    environment:
-      RAILS_ENV: test
-    links:
-      - "postgres_test_6_1_ruby_2_7:postgres_test"
-    command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test"
-    user: ${CURRENT_UID}
 
-  test_6_1_ruby_3_0:
-    build:
-      context: .
-      dockerfile: ./ci/Dockerfile.test_6_1_ruby_3_0
-    environment:
-      RAILS_ENV: test
-    links:
-      - "postgres_test_6_1_ruby_3_0:postgres_test"
-    command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test"
-    user: ${CURRENT_UID}
 
   postgres_dummy:
     image: postgres
@@ -117,20 +72,7 @@ services:
   postgres_test:
     <<: *postgres_test_base
 
-  postgres_test_6_1_ruby_3_0:
-    <<: *postgres_test_base
-
-  postgres_test_6_1_ruby_2_7:
-    <<: *postgres_test_base
-
-  postgres_test_6_0_ruby_2_6:
-    <<: *postgres_test_base
-
-  postgres_test_5_2_ruby_2_6:
-    <<: *postgres_test_base
-
 volumes:
   test-data-volume:
   dummy-data-volume:
   gem-volume:
-  # node-volume: