diff --git a/.travis.yml b/.travis.yml index c0ee05a..aa4a4f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,6 @@ services: - docker before_install: - bin/setup - - gem update bundler + - gem install -v 2.2 bundler -N script: - rake diff --git a/Dockerfile b/Dockerfile index b4c5585..176fba4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ -FROM ruby:2.4.0 +FROM ruby:2.6.6 RUN apt-get update -qq -RUN gem update bundler -ENV BUNDLER_VERSION=2.0.2 +RUN gem update --system +RUN gem install -v 2.2.3 bundler -N +ENV BUNDLER_VERSION=2.2 RUN mkdir /simple_jsonapi_client WORKDIR /simple_jsonapi_client ADD . . diff --git a/docker-compose.yml b/docker-compose.yml index 796546f..b77365f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,9 +16,8 @@ services: jsonapi_app_spec: build: ./spec/jsonapi_app entrypoint: bin/wait_for_it db:5432 -t 30 -- - volumes: - - ./spec/jsonapi_app:/jsonapi_app - - /jsonapi_app/tmp/ + # volumes: + # - ./spec/jsonapi_app:/jsonapi_app command: bundle exec rails s -p 3001 -b '0.0.0.0' ports: - "3001:3001" @@ -40,9 +39,8 @@ services: jsonapi_app_console: build: ./spec/jsonapi_app entrypoint: bin/wait_for_it db:5432 -t 30 -- - volumes: - - ./spec/jsonapi_app:/jsonapi_app - - /jsonapi_app/tmp/ + # volumes: + # - ./spec/jsonapi_app:/jsonapi_app command: bundle exec rails s -p 3002 -b '0.0.0.0' ports: - "3002:3002" diff --git a/spec/jsonapi_app/.dockerignore b/spec/jsonapi_app/.dockerignore new file mode 100644 index 0000000..dd4e936 --- /dev/null +++ b/spec/jsonapi_app/.dockerignore @@ -0,0 +1 @@ +tmp/pids/server.pid diff --git a/spec/jsonapi_app/Dockerfile b/spec/jsonapi_app/Dockerfile index 61d18e5..d4e2e76 100644 --- a/spec/jsonapi_app/Dockerfile +++ b/spec/jsonapi_app/Dockerfile @@ -1,6 +1,7 @@ -FROM ruby:2.4.0 +FROM ruby:2.6.6 RUN apt-get update -qq -RUN gem update bundler +RUN gem update --system +RUN gem install -v 2.2.3 bundler -N RUN mkdir /jsonapi_app WORKDIR /jsonapi_app ADD Gemfile /jsonapi_app/Gemfile diff --git a/spec/jsonapi_app/Gemfile.lock b/spec/jsonapi_app/Gemfile.lock index c05f9f8..fdcf778 100644 --- a/spec/jsonapi_app/Gemfile.lock +++ b/spec/jsonapi_app/Gemfile.lock @@ -128,4 +128,4 @@ DEPENDENCIES rails (~> 5.0.1) BUNDLED WITH - 1.15.3 + 2.2.3