Skip to content

Commit

Permalink
add back the m1 things I took out for my local use
Browse files Browse the repository at this point in the history
  • Loading branch information
aprilrieger committed Sep 22, 2023
1 parent 70327be commit 5beea30
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# UCLALibrary - .env setup -- Start
DEPLOY_HOOK=CHANGEME
DOCKER_PORTS=80
MAKE_WAVES=
Expand All @@ -13,4 +12,4 @@ REGISTRY_URI=uclalibrary
SITE_URI=oralhistory-test.library.ucla.edu
SOLR_URL=http://solr:8983/solr/blacklight-core
TAG=dev
TEST_DB=oral_history_test
TEST_DB=oral_history_test
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM phusion/passenger-ruby25:1.0.11 as web
FROM phusion/passenger-ruby25:1.0.11

RUN echo 'Downloading Packages' && \
apt-get update -qq -o Dir::Etc::sourceparts=- && \
Expand Down
5 changes: 5 additions & 0 deletions bin/rails
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#!/usr/bin/env ruby
begin
load File.expand_path('../spring', __FILE__)
rescue LoadError => e
raise unless e.message.include?('spring')
end
APP_PATH = File.expand_path('../config/application', __dir__)
require_relative '../config/boot'
require 'rails/commands'
5 changes: 5 additions & 0 deletions bin/rake
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#!/usr/bin/env ruby
begin
load File.expand_path('../spring', __FILE__)
rescue LoadError => e
raise unless e.message.include?('spring')
end
require_relative '../config/boot'
require 'rake'
Rake.application.run
2 changes: 1 addition & 1 deletion config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@

# Use an evented file watcher to asynchronously detect changes in source code,
# routes, locales, etc. This feature depends on the listen gem.
# config.file_watcher = ActiveSupport::EventedFileUpdateChecker
config.file_watcher = ActiveSupport::EventedFileUpdateChecker
end

0 comments on commit 5beea30

Please sign in to comment.