Skip to content

Commit

Permalink
bump ruby, yarn can install
Browse files Browse the repository at this point in the history
  • Loading branch information
eessex committed Apr 1, 2020
1 parent 23c5b43 commit fb65d97
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.0
2.6.5
18 changes: 8 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
FROM ruby:2.6.0-alpine
FROM ruby:2.6-alpine
ENV LANG C.UTF-8
ENV PORT 3000
EXPOSE 3000

WORKDIR /app

RUN apk update && apk --no-cache --quiet add \
RUN apk update && apk --no-cache --quiet add --update \
build-base \
dumb-init \
nodejs \
postgresql-dev \
postgresql-client \
python2-dev \
Expand All @@ -18,16 +15,17 @@ RUN apk update && apk --no-cache --quiet add \
git && \
adduser -D -g '' deploy

# Switch to 3.9 alpine registry for node v10
RUN sed -i -e 's/v[[:digit:]]\..*\//v3.9\//g' /etc/apk/repositories && \
cat /etc/alpine-release && \
apk update && apk --no-cache --quiet add --update nodejs=~10

# support hokusai registry commands
RUN pip install --upgrade --no-cache-dir hokusai

# RUN npm install -g yarn

# Set up gems and packages
RUN gem install bundler -v '<2' && \
bundle config --global frozen 1

# Set up gems and packages
WORKDIR /tmp
COPY Gemfile \
Gemfile.lock \
.ruby-version \
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ GEM
diff-lcs (1.3)
erubi (1.9.0)
execjs (2.7.0)
faraday (1.0.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.12.2)
formtastic (3.1.5)
Expand Down Expand Up @@ -156,7 +156,7 @@ GEM
nio4r (2.5.2)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
octokit (4.17.0)
octokit (4.18.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
pg (1.2.2)
Expand Down Expand Up @@ -313,7 +313,7 @@ DEPENDENCIES
webpacker

RUBY VERSION
ruby 2.6.0p0
ruby 2.6.5p114

BUNDLED WITH
1.17.3
7 changes: 0 additions & 7 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,22 @@ default: &default

development:
<<: *default
database: horizon_development

# The specified database role being used to connect to postgres.
# To create additional roles in postgres see `$ createuser --help`.
# When left blank, postgres will use the default role. This is
# the same name as the operating system user that initialized the database.
#username: horizon

# The password associated with the postgres role (username).
#password:

# Connect on a TCP socket. Omitted by default since the client uses a
# domain socket that doesn't need configuration. Windows does not have
# domain sockets, so uncomment these lines.
#host: localhost

# The TCP port the server listens on. Defaults to 5432.
# If your server runs on a different port number, change accordingly.
#port: 5432

# Schema search path. The server defaults to $user,public
#schema_search_path: myapp,sharedapp,public

# Minimum log levels, in increasing order:
# debug5, debug4, debug3, debug2, debug1,
# log, notice, warning, error, fatal, and panic
Expand Down
12 changes: 7 additions & 5 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.

Expand Down Expand Up @@ -44,21 +46,21 @@
# config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]

# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
# config.force_ssl = true
config.force_ssl = true

# Use the lowest log level to ensure availability of diagnostic information
# when problems arise.
config.log_level = :debug
config.log_level = :info

# Prepend all log lines with the following tags.
config.log_tags = [ :request_id ]
config.log_tags = [:request_id]

# Use a different cache store in production.
# config.cache_store = :mem_cache_store

# Use a real queuing backend for Active Job (and separate queues per environment).
# config.active_job.queue_adapter = :resque
# config.active_job.queue_name_prefix = "horizon_production"
# config.active_job.queue_name_prefix = "horizon_#{Rails.env}"

config.action_mailer.perform_caching = false

Expand All @@ -80,7 +82,7 @@
# require 'syslog/logger'
# config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')

if ENV["RAILS_LOG_TO_STDOUT"].present?
if ENV['RAILS_LOG_TO_STDOUT'].present?
logger = ActiveSupport::Logger.new(STDOUT)
logger.formatter = config.log_formatter
config.logger = ActiveSupport::TaggedLogging.new(logger)
Expand Down
2 changes: 1 addition & 1 deletion hokusai/development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
version: "2"
services:
horizon:
env_file: ../.env
environment:
- RAILS_ENV=development
- RAILS_LOG_TO_STDOUT=true
- DATABASE_URL=postgresql://postgres:@horizon-postgres/horizon_development
- REDIS_URL=redis://horizon-redis
extends:
Expand Down
Binary file removed production.dump
Binary file not shown.

0 comments on commit fb65d97

Please sign in to comment.