From 0d71c01fce7946dc38d3d1a8e95af93103b5c299 Mon Sep 17 00:00:00 2001 From: jacobbhartman Date: Thu, 22 Oct 2020 12:54:53 -0700 Subject: [PATCH] https://github.com/rails/webpacker/pull/2518 for the integrity check change. otherwise, this commit fixes a fresh clone --- Dockerfile | 9 +++++---- config/webpacker.yml | 2 +- docker-compose.yml | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index de23b13..9c7c717 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,11 +20,12 @@ RUN apt-get update && apt-get install --yes \ RUN gem install rails --version 6.0.3.4 +RUN mkdir /cadre WORKDIR /cadre - - -#RUN rails new blog -#WORKDIR /blog +COPY Gemfile /cadre/Gemfile +COPY Gemfile.lock /cadre/Gemfile.lock +RUN bundle install +COPY . /cadre #RUN curl https://www.sqlite.org/2020/sqlite-tools-linux-x86-3330000.zip --output sqlite-tools-linux-x86-3330000.zip #RUN unzip sqlite-tools-linux-x86-3330000.zip diff --git a/config/webpacker.yml b/config/webpacker.yml index 8581ac0..79711bc 100644 --- a/config/webpacker.yml +++ b/config/webpacker.yml @@ -53,7 +53,7 @@ development: compile: true # Verifies that correct packages and versions are installed by inspecting package.json, yarn.lock, and node_modules - check_yarn_integrity: true + check_yarn_integrity: false # Reference: https://webpack.js.org/configuration/dev-server/ dev_server: diff --git a/docker-compose.yml b/docker-compose.yml index 2753f4c..956615a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,5 +7,5 @@ services: - "3000" ports: - "8001:3000" - volumes: - - .:/cadre:cached +# volumes: +# - .:/cadre:cached