Update Docker setup

This commit is contained in:
Rico Sta. Cruz 2020-06-14 23:32:34 +10:00
parent d3203a354c
commit d8df859e5c
3 changed files with 8 additions and 8 deletions

View File

@ -1,5 +1,5 @@
FROM ruby:2.5.1 FROM ruby:2.7.1
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ RUN apt-get update -qq && apt-get install -qq --no-install-recommends \

View File

@ -9,14 +9,11 @@ help:
@echo @echo
# Builds intermediate files. Needs a _site built first though # Builds intermediate files. Needs a _site built first though
update: _site critical update: _site
# Builds _site # Builds _site
_site: _site:
bundle exec jekyll build --incremental yarn build
critical: _site ## Builds critical path CSS/JS
yarn critical
dev: dev:
yarn dev yarn dev

View File

@ -6,11 +6,14 @@ services:
- .:/app - .:/app
- rubygems:/usr/local/bundle - rubygems:/usr/local/bundle
- ./node_modules:/app/node_modules - ./node_modules:/app/node_modules
- yarn_cache:/root/.cache/yarn
ports: ports:
- '4001:4001' - '4001:4001'
- '35729:35729' - '35729:35729'
command: 'env PORT=4001 HOST=0.0.0.0 yarn run dev' command: >
bash -c 'yarn; bundle; env PORT=4001 HOST=0.0.0.0 yarn run dev'
volumes: volumes:
rubygems: rubygems:
node_modules: node_modules:
yarn_cache: