diff --git a/Dockerfile-dev b/Dockerfile-dev index ca7865a5..37dce5f6 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -1,4 +1,4 @@ -FROM ruby:2.6 +FROM ruby:2.7 # Install dependencies RUN deps='libmagic-dev chromium nodejs' && \ @@ -19,6 +19,7 @@ ENV PORT=3000 \ WORKDIR /app +RUN gem install bundler RUN bundle config build.nokogiri "--use-system-libraries" EXPOSE 3000 diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 0a8b3fec..b0a325db 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -11,6 +11,7 @@ services: build: context: . dockerfile: Dockerfile-dev + platform: linux/x86_64 command: ./proc-start worker volumes: - bundle:/usr/local/bundle diff --git a/app/lib/tasks/.gitkeep b/lib/tasks/.gitkeep similarity index 100% rename from app/lib/tasks/.gitkeep rename to lib/tasks/.gitkeep diff --git a/app/lib/tasks/foodsoft.rake b/lib/tasks/foodsoft.rake similarity index 100% rename from app/lib/tasks/foodsoft.rake rename to lib/tasks/foodsoft.rake diff --git a/app/lib/tasks/foodsoft_setup.rake b/lib/tasks/foodsoft_setup.rake similarity index 100% rename from app/lib/tasks/foodsoft_setup.rake rename to lib/tasks/foodsoft_setup.rake diff --git a/app/lib/tasks/multicoops.rake b/lib/tasks/multicoops.rake similarity index 100% rename from app/lib/tasks/multicoops.rake rename to lib/tasks/multicoops.rake diff --git a/app/lib/tasks/resque.rake b/lib/tasks/resque.rake similarity index 100% rename from app/lib/tasks/resque.rake rename to lib/tasks/resque.rake diff --git a/app/lib/tasks/rspec.rake b/lib/tasks/rspec.rake similarity index 100% rename from app/lib/tasks/rspec.rake rename to lib/tasks/rspec.rake diff --git a/app/lib/tasks/seeds.rake b/lib/tasks/seeds.rake similarity index 100% rename from app/lib/tasks/seeds.rake rename to lib/tasks/seeds.rake