Skip to content

Commit

Permalink
Merge pull request #106 from betadots/update_and_make_production_ready
Browse files Browse the repository at this point in the history
Update and make production ready
  • Loading branch information
rwaffen authored Jan 30, 2023
2 parents 5735707 + b64fce5 commit 7b14691
Show file tree
Hide file tree
Showing 19 changed files with 259 additions and 187 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.1.2
ruby-3.1.3
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby 2.5.3
ruby 3.1.3
14 changes: 0 additions & 14 deletions .travis.yml

This file was deleted.

25 changes: 13 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
FROM ruby:3.1.2-alpine
FROM ruby:3.1.3-slim-bullseye

RUN apk add --update --no-cache \
binutils-gold \
build-base \
RUN apt update && apt install -y \
g++ \
gcc \
libstdc++ \
make \
libstdc++-10-dev \
libffi-dev \
libc-dev \
libxml2-dev \
libxslt-dev \
libgcrypt-dev \
make \
sqlite \
sqlite-dev \
libsqlite3-dev \
sqlite3 \
# not needed for gems, but for runtime
git \
tzdata

# RUN gem install bundler -v 2.3.11
tzdata \
&& rm -rf /var/lib/apt/lists/*

ENV APP_HOME /hdm
ENV RAILS_ENV production
ENV RAILS_SERVE_STATIC_FILES true
ENV RAILS_LOG_TO_STDOUT true

WORKDIR $APP_HOME

COPY . $APP_HOME
COPY config/hdm.yml.template $APP_HOME/config/hdm.yml

RUN bundle check || (bundle config set --local without 'test' && bundle install)
RUN bundle check || (bundle config set --local without 'development test' && bundle install)

EXPOSE 3000

Expand Down
25 changes: 11 additions & 14 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.1.2'
ruby '3.1.3'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 7.0.0'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', '~> 1.4'
gem 'sqlite3', '~> 1.5'
# Use Puma as the app server
gem 'puma', '~> 5.6'
gem 'puma', '~> 6.0'

# Asset handling
gem 'sprockets-rails'
Expand All @@ -20,23 +20,17 @@ gem 'bootstrap', '~> 4.6.0'
gem 'bootstrap-icons-helper'
gem 'jquery-rails'

# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
# gem 'jbuilder', '~> 2.7'
# Use Redis adapter to run Action Cable in production
gem 'redis', '~> 4.0'
gem 'redis', '~> 5.0'
# Use Active Model has_secure_password
gem 'bcrypt', '~> 3.1.7'

gem 'faker'
gem 'friendly_id', '~> 5.4.0'
gem 'friendly_id', '~> 5.5.0'
gem 'puppet'
gem 'puppetdb-ruby', require: 'puppetdb'
gem 'hiera-eyaml'
gem 'net-ldap', require: "net/ldap"

# Use Active Storage variant
# gem 'image_processing', '~> 1.2'

gem 'breadcrumbs_on_rails'
gem 'cancancan'

Expand All @@ -50,9 +44,10 @@ end
group :development do
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '~> 3.2'
end

gem 'listen', '~> 3.2' # need for rake to precompile assets

group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15'
Expand All @@ -67,13 +62,15 @@ group :linter do
gem 'rubocop-rake'
end

group :release do
gem 'github_changelog_generator', '>= 1.16.1', :require => false
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

# Professional version only gems
gem 'git'
gem 'gitable', require: "gitable/uri"

# dependencies & sec fixes
# gem "nokogiri", ">= 1.13.2" # needs ruby >= 2.6.0
gem 'mini_racer' # minimal Google V8 JS engine for execjs
Loading

0 comments on commit 7b14691

Please sign in to comment.