diff --git a/.travis.yml b/.travis.yml index eec67ea2e..880574efe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,6 @@ env: before_install: - sudo apt-get update - - curl -L https://github.com/docker/compose/releases/download/1.4.0/docker-compose-`uname -s`-`uname -m` > docker-compose - - chmod +x docker-compose - - sudo mv docker-compose /usr/local/bin - sudo apt-get install -y xvfb libappindicator1 fonts-liberation - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - sudo dpkg -i google-chrome*.deb @@ -34,7 +31,6 @@ install: - rake dummy_apps - rake examples - rake node_package - - docker-compose up lint before_script: - "export DISPLAY=:99" diff --git a/Dockerfile_tests b/Dockerfile_tests deleted file mode 100644 index 67599e15e..000000000 --- a/Dockerfile_tests +++ /dev/null @@ -1,12 +0,0 @@ -FROM dylangrafmyre/docker-ci - -WORKDIR /app/ - -COPY ["/lib/react_on_rails/version.rb", "/app/lib/react_on_rails/"] -COPY ["Gemfile", "Gemfile.lock", "react_on_rails.gemspec", "rakelib/", "/app/"] -COPY ["/spec/dummy/Gemfile", "/spec/dummy/Gemfile.lock", "/app/spec/dummy/"] -RUN bundle install --gemfile=spec/dummy/Gemfile - -ENV DISPLAY :99 -ENTRYPOINT service xvfd start \ - && rake diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 98b6394a0..000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -lint: - image: dylangrafmyre/docker-lint - working_dir: /app/ - volumes: - - '.:/app/' -tests: - build: . - dockerfile: Dockerfile_tests - working_dir: /app/ - volumes: - - '.:/app/'