From a8f6932088b63900cb523afbee7921a88647c7ca Mon Sep 17 00:00:00 2001 From: Johnny Almonte Date: Wed, 17 Jun 2020 11:25:20 -0400 Subject: [PATCH 1/5] chore: move ionicons assets to vendor --- .../assets/fonts/ionicons}/ionicons.eot | Bin .../assets/fonts/ionicons}/ionicons.svg | 0 .../assets/fonts/ionicons}/ionicons.ttf | Bin .../assets/fonts/ionicons}/ionicons.woff | Bin 4 files changed, 0 insertions(+), 0 deletions(-) rename {app/assets/fonts => vendor/assets/fonts/ionicons}/ionicons.eot (100%) rename {app/assets/fonts => vendor/assets/fonts/ionicons}/ionicons.svg (100%) rename {app/assets/fonts => vendor/assets/fonts/ionicons}/ionicons.ttf (100%) rename {app/assets/fonts => vendor/assets/fonts/ionicons}/ionicons.woff (100%) diff --git a/app/assets/fonts/ionicons.eot b/vendor/assets/fonts/ionicons/ionicons.eot similarity index 100% rename from app/assets/fonts/ionicons.eot rename to vendor/assets/fonts/ionicons/ionicons.eot diff --git a/app/assets/fonts/ionicons.svg b/vendor/assets/fonts/ionicons/ionicons.svg similarity index 100% rename from app/assets/fonts/ionicons.svg rename to vendor/assets/fonts/ionicons/ionicons.svg diff --git a/app/assets/fonts/ionicons.ttf b/vendor/assets/fonts/ionicons/ionicons.ttf similarity index 100% rename from app/assets/fonts/ionicons.ttf rename to vendor/assets/fonts/ionicons/ionicons.ttf diff --git a/app/assets/fonts/ionicons.woff b/vendor/assets/fonts/ionicons/ionicons.woff similarity index 100% rename from app/assets/fonts/ionicons.woff rename to vendor/assets/fonts/ionicons/ionicons.woff From 864cc414ea9b6449334b8420e70640e75a3993c7 Mon Sep 17 00:00:00 2001 From: Johnny Almonte Date: Wed, 17 Jun 2020 11:32:30 -0400 Subject: [PATCH 2/5] fix: update assets paths --- app/assets/stylesheets/_ionicons.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/_ionicons.scss b/app/assets/stylesheets/_ionicons.scss index bda8c265c..e217629e8 100644 --- a/app/assets/stylesheets/_ionicons.scss +++ b/app/assets/stylesheets/_ionicons.scss @@ -13,8 +13,8 @@ */ @font-face { font-family: "Ionicons"; - src: url("../fonts/ionicons.eot?v=2.0.0"); - src: url("../fonts/ionicons.eot?v=2.0.1#iefix") format("embedded-opentype"), url("../fonts/ionicons.ttf?v=2.0.1") format("truetype"), url("../fonts/ionicons.woff?v=2.0.1") format("woff"), url("../fonts/ionicons.svg?v=2.0.1#Ionicons") format("svg"); + src: url("/assets/fonts/ionicons.eot?v=2.0.0"); + src: url("/assets/fonts/ionicons.eot?v=2.0.1#iefix") format("embedded-opentype"), url("/assets/fonts/ionicons.ttf?v=2.0.1") format("truetype"), url("/assets/fonts/ionicons.woff?v=2.0.1") format("woff"), url("/assets/fonts/ionicons.svg?v=2.0.1#Ionicons") format("svg"); font-weight: normal; font-style: normal; } From 43e16203ddf604bd6f177e6de428727cc8b0eefe Mon Sep 17 00:00:00 2001 From: Johnny Almonte Date: Wed, 17 Jun 2020 11:34:12 -0400 Subject: [PATCH 3/5] fix: precompiling font assets --- config/initializers/assets.rb | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 1d686d7e3..cac5fd170 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -9,7 +9,7 @@ Rails.application.config.assets.version = '1.0' Rails.application.config.assets.paths << Rails.root.join('vendor', 'assets') Rails.application.config.assets.paths << Rails.root.join('dist') -Rails.application.config.assets.precompile << ["*.svg", "*.eot", "*.woff", "*.ttf"] +Rails.application.config.assets.precompile += %w( fonts/ionicons.eot fonts/ionicons.svg fonts/ionicons.ttf fonts/ionicons.woff ) # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. diff --git a/package.json b/package.json index fd47140cc..92bf422e5 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "scripts": { "start": "webpack-dev-server --progress", "bundle": "webpack --mode production", - "build": "bundle install && npm install && npm run bundle", + "build": "bundle install && npm install && bundle exec rails assets:precompile && npm run bundle", "submodules": "git submodule update --init --force --remote", "test": "karma start karma.conf.js --single-run", "lint": "eslint --fix app/assets/javascripts/**/*.js" From 8aaaf31bd485c9ecf3f9c6d13c71f1ba09016d1d Mon Sep 17 00:00:00 2001 From: Johnny Almonte Date: Wed, 17 Jun 2020 21:46:13 -0400 Subject: [PATCH 4/5] fix: use npm ci --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 92bf422e5..8514b6256 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "scripts": { "start": "webpack-dev-server --progress", "bundle": "webpack --mode production", - "build": "bundle install && npm install && bundle exec rails assets:precompile && npm run bundle", + "build": "bundle install && npm ci && bundle exec rails assets:precompile && npm run bundle", "submodules": "git submodule update --init --force --remote", "test": "karma start karma.conf.js --single-run", "lint": "eslint --fix app/assets/javascripts/**/*.js" From dd426cf0a0984d4c8fdef7b2c85aadea1ede36c9 Mon Sep 17 00:00:00 2001 From: Johnny Almonte Date: Wed, 17 Jun 2020 21:46:42 -0400 Subject: [PATCH 5/5] refactor: remove duplicate commands --- Dockerfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index ca7e08284..5b12e1d40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,14 +34,8 @@ COPY . /app/ # Leave RAILS_SERVE_STATIC_FILES commented if Nginx/Apache will serve static files instead of rails. ### -RUN bundle install - -RUN npm install - RUN npm run build -RUN bundle exec rake assets:precompile - EXPOSE 3000 ENTRYPOINT [ "./docker/entrypoint" ]