Skip to content
Snippets Groups Projects
Commit d98d1022 authored by Iain J. Bryson's avatar Iain J. Bryson
Browse files

Small updates

parent 72f6eaca
No related branches found
No related tags found
No related merge requests found
Pipeline #364 failed
...@@ -23,6 +23,7 @@ LABEL version="2019" ...@@ -23,6 +23,7 @@ LABEL version="2019"
LABEL description="This Dockerfile builds the container \ LABEL description="This Dockerfile builds the container \
to house the DTU course website." to house the DTU course website."
RUN sudo apt update
RUN sudo apt-get -y install redis RUN sudo apt-get -y install redis
RUN sudo apt-get -y install imagemagick RUN sudo apt-get -y install imagemagick
RUN sudo apt-get -y install libsqlite3-dev RUN sudo apt-get -y install libsqlite3-dev
...@@ -82,6 +83,8 @@ RUN mkdir -p ${APP_ROOT}/log ...@@ -82,6 +83,8 @@ RUN mkdir -p ${APP_ROOT}/log
# Generate cookie key # Generate cookie key
RUN RAILS_ENV=production PRECOMPILE=1 bundle exec rake secret > ~/secret-key-base.txt RUN RAILS_ENV=production PRECOMPILE=1 bundle exec rake secret > ~/secret-key-base.txt
# RUN NODE_ENV=development yarn run webpack --config config/webpack/development.js
# RUN NODE_ENV=production yarn run webpack --config config/webpack/production.js
RUN RAILS_ENV=production PRECOMPILE=1 bundle exec rake assets:precompile --trace RUN RAILS_ENV=production PRECOMPILE=1 bundle exec rake assets:precompile --trace
CMD ["/bin/bash", "-l", "-c", "./scripts/run-server.sh 2>&1 | tee ${APP_ROOT}/log/run-server.log"] CMD ["/bin/bash", "-l", "-c", "./scripts/run-server.sh 2>&1 | tee ${APP_ROOT}/log/run-server.log"]
......
== README
This README would normally document whatever steps are necessary to get the
application up and running.
Things you may want to cover:
* Ruby version
* System dependencies
* Configuration
* Database creation
* Database initialization
* How to run the test suite
* Services (job queues, cache servers, search engines, etc.)
* Deployment instructions
* ...
Please feel free to use a different markup language if you do not plan to run
<tt>rake doc:app</tt>.
...@@ -30,6 +30,7 @@ module.exports = function(api) { ...@@ -30,6 +30,7 @@ module.exports = function(api) {
{ {
forceAllTransforms: true, forceAllTransforms: true,
useBuiltIns: 'entry', useBuiltIns: 'entry',
corejs: 3,
modules: false, modules: false,
exclude: ['transform-typeof-symbol'] exclude: ['transform-typeof-symbol']
} }
......
Subproject commit 3f72f87c27ecba4a259a92f3f4af876f1c4b75f6 Subproject commit 764956be7599d732bad3cf6e5ae419650d89ca96
Subproject commit 90f530dbdf1bcb57667010f826f9075911004575 Subproject commit 63f3310e2a1a8b659a831703e4d43f6ed90d82f3
...@@ -14,10 +14,9 @@ ...@@ -14,10 +14,9 @@
"prettier": "prettier --single-quote --write app/client/**/*.js" "prettier": "prettier --single-quote --write app/client/**/*.js"
}, },
"dependencies": { "dependencies": {
"@ivoviz/feedback.js": "file:deps/feedbackjs",
"@rails/webpacker": "^4.0.2", "@rails/webpacker": "^4.0.2",
"bootstrap": "3.3.7", "bootstrap": "^3.4.1",
"bootstrap-treeview": "https://github.com/iainbryson/bootstrap-treeview", "bootstrap-treeview": "git+https://github.com/iainbryson/bootstrap-treeview.git",
"core-js": "3", "core-js": "3",
"dtu_core_assets": "file:./deps/dtu-core/dtu_core_assets/", "dtu_core_assets": "file:./deps/dtu-core/dtu_core_assets/",
"dtu_core_js": "file:./deps/dtu-core/dtu_core_assets", "dtu_core_js": "file:./deps/dtu-core/dtu_core_assets",
...@@ -29,7 +28,7 @@ ...@@ -29,7 +28,7 @@
"mathjax": "~2.7.1", "mathjax": "~2.7.1",
"mv": "^2.1.1", "mv": "^2.1.1",
"nano": "^8.0.0", "nano": "^8.0.0",
"pagedown-extra": "https://github.com/jmcmanus/pagedown-extra.git#ea782c3d11eb78f57d00aa819527338996a70721", "pagedown-extra": "git+https://github.com/jmcmanus/pagedown-extra.git#ea782c3d11eb78f57d00aa819527338996a70721",
"path": "^0.12.7", "path": "^0.12.7",
"popper.js": "^1.14.3", "popper.js": "^1.14.3",
"q": "^1.4.1", "q": "^1.4.1",
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment