This repository has been archived by the owner on Oct 27, 2018. It is now read-only.
small config changes; added env variable to enable temp login in prod… #145
Merged
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
04c5121
small config changes; added env variable to enable temp login in prod…
alexstrilets 74e98df
changes as discussed
alexstrilets e53d922
fixing rubocop errors
alexstrilets f82fb73
switch unless ot if
alexstrilets 4ecdab7
fixed rubocop warning message
alexstrilets d8d1d94
moved Docker file into the repository
alexstrilets 5d4788e
changes as discussed in the PR
alexstrilets 1e8a457
revert changes as Shane already did them
alexstrilets File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
FROM ualibraries/ruby_plus2.3.3 | ||
# https://github.com/ualbertalib/DIDockerImages/blob/master/RubyPlus/Dockerfile | ||
RUN apt-get update -qq && \ | ||
apt-get install -y libpq-dev \ | ||
nodejs \ | ||
libreoffice-core \ | ||
libreoffice-base-core \ | ||
libreoffice-common \ | ||
imagemagick \ | ||
unzip && \ | ||
rm -rf /var/lib/apt/lists/* | ||
|
||
RUN mkdir /app | ||
WORKDIR /app | ||
ADD . /app | ||
RUN echo "gem 'tinymce-rails-imageupload', github: 'PerfectlyNormal/tinymce-rails-imageupload'" >> /app/Gemfile | ||
RUN cd /app && bundle install | ||
RUN cd /app && rake assets:precompile | ||
|
||
CMD rake db:migrate && rails server -b 0.0.0.0 | ||
|
||
EXPOSE 3000 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. With Nginx configured, do we still need to expose port 3000 explicitly? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes we need to expose it inside docker image. This instruction means that other containers can connect to this one to the port 3000. This is what Nginx will do - will connect to instance of hydranorth2 running container and redirect port 3000 to its own port 80 which in turn will be redirected to atomic host port pointed by HOSTPORT environment variable. |
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
development: | ||
user: fedoraAdmin | ||
password: fedoraAdmin | ||
url: <%= ENV['FCREPO_DEVELOPMENT_URL'] || 'http://localhost:8984/rest' %> | ||
url: <%= ENV['FCREPO_URL'] || 'http://localhost:8984/rest' %> | ||
base_path: /dev | ||
test: | ||
user: fedoraAdmin | ||
password: fedoraAdmin | ||
url: <%= ENV['FCREPO_TEST_URL'] || 'http://localhost:8986/rest' %> | ||
url: <%= ENV['FCREPO_URL'] || 'http://localhost:8986/rest' %> | ||
base_path: /test | ||
production: | ||
user: fedoraAdmin | ||
password: fedoraAdmin | ||
url: <%= ENV['FCREPO_PROD_URL'] || 'http://localhost:8983/rest' %> | ||
url: <%= ENV['FCREPO_URL'] || 'http://localhost:8983/rest' %> | ||
base_path: /prod |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
# This is a sample config file that points to a solr server for each environment | ||
development: | ||
url: <%= ENV['SOLR_DEVELOPMENT_URL'] || 'http://localhost:8983/solr/hydra-development' %> | ||
url: <%= ENV['SOLR_URL'] || 'http://localhost:8983/solr/hydra-development' %> | ||
test: | ||
url: <%= ENV['SOLR_TEST_URL'] || 'http://localhost:8985/solr/hydra-test' %> | ||
url: <%= ENV['SOLR_URL'] || 'http://localhost:8985/solr/hydra-test' %> | ||
production: | ||
url: http://your.production.server:8080/bl_solr/core0 | ||
url: <%= ENV['SOLR_URL'] || 'http://your.production.server:8080/bl_solr/core0' %> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mbarnett already fixed this in Master haha. Not sure if that was clear sorry alex.
https://github.com/ualbertalib/Hydranorth2/blob/master/.rubocop.yml#L74-L75
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@astrilet this is already fixed, you don't need to include it in your PR.