Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
269 commits
Select commit Hold shift + click to select a range
ac28f8f
Merge branch 'google_analytics'
orangewolf Feb 7, 2018
3cfcb72
updates ldap workaround, and enables solr
gbrain Feb 8, 2018
c107276
Merge branch 'ldap-update-and-solr-setup' into 'master'
orangewolf Feb 8, 2018
d663d07
added downloadable flag to video model
labradford Feb 12, 2018
750e6bb
added config to minterstate file for development
labradford Feb 12, 2018
a8214bb
WIP - downloadable checkbox on form, added to show page, conditional …
labradford Feb 13, 2018
4f33069
remove some extra placeholder text used for dev help
labradford Feb 14, 2018
5d7a789
updated downloadable label for search results page
labradford Feb 14, 2018
4ab7ba5
adds link to advanced search, and gets advanced search rendering
gbrain Feb 15, 2018
f81a4d0
adds advanced search views
gbrain Feb 15, 2018
e6c7460
added download toggle for videos in collection
labradford Feb 15, 2018
f9c74ac
removed helper notice
labradford Feb 15, 2018
e943bf2
moved location of downloadable checkbox and aded new label
labradford Feb 15, 2018
746d16b
fixing labels and form field
labradford Feb 15, 2018
f6183c1
updated attribute rows to show true or false instead of 1 or 0
labradford Feb 19, 2018
e37c8e2
updated to store boolean
labradford Feb 19, 2018
936c936
updated search results index
labradford Feb 19, 2018
90ae068
check for non-video items to still have download button
labradford Feb 19, 2018
4351adc
styled advanced search page
labradford Feb 21, 2018
8746c56
added collection params to advanced search when in a collection
labradford Feb 21, 2018
e9f2425
added inclusive to advanced search params
labradford Feb 21, 2018
6adecaa
ci work
orangewolf Feb 22, 2018
534477a
ci work
orangewolf Feb 22, 2018
fc2667d
ci work
orangewolf Feb 22, 2018
d1b5f98
ci work
orangewolf Feb 22, 2018
d338757
add file upload to staging instances
orangewolf Feb 22, 2018
8c7eb83
missing close
orangewolf Feb 22, 2018
23f6747
added text content search to advanced and general search
labradford Feb 26, 2018
4687c2d
removed all fields from advanced search
labradford Feb 26, 2018
d1785ff
634221 advanced search
labradford Feb 27, 2018
d13631e
Merge branch '634221-advanced-search' into 'master'
gbrain Feb 27, 2018
efd1ccd
updates readme
gbrain Feb 27, 2018
e288709
merge conflict
gbrain Feb 27, 2018
05406f7
download flag on audio, image and text files
labradford Feb 28, 2018
40e4535
added bulk downlowdable actions to other file types
labradford Feb 28, 2018
4e77201
added if statement for tei page to only show image if there is an image
labradford Mar 1, 2018
593bb26
updates tei importer
gbrain Mar 1, 2018
076eef4
hide file section when download flag is set to false
labradford Mar 1, 2018
f251e27
updates ingestion for sample assets
gbrain Mar 1, 2018
8be12bb
ignore sample assets if they exist in gitignore
gbrain Mar 1, 2018
c7d913e
fixes asset load task
gbrain Mar 1, 2018
16bab4d
adds seed to ci
gbrain Mar 1, 2018
ca0715c
mobile-small size device styling for main components
labradford Mar 2, 2018
0061503
phone mobile styles for tei page
labradford Mar 2, 2018
9e92793
mobile styles ipad view
labradford Mar 2, 2018
254ed04
footer styles for mobile and ipad
labradford Mar 2, 2018
e1b9274
hide advanced search button when on advanced search page
gbrain Mar 2, 2018
82a1375
updated template for google analytics
labradford Mar 5, 2018
9b03644
mobile styles for tei viewer page
labradford Mar 5, 2018
d0656e3
refactored downloadable code to be prevent_downloads in all places, n…
labradford Mar 5, 2018
a1e9848
fixed typo
labradford Mar 5, 2018
a6ffbdf
added source field to model and show page
labradford Mar 6, 2018
3a610b0
moves rights to database
gbrain Mar 6, 2018
e5d968d
adds crud for rights
gbrain Mar 6, 2018
16dfde4
adds migration to load rights
gbrain Mar 6, 2018
b64deab
removes un-neede css file
gbrain Mar 6, 2018
7fedbca
removes unused file
gbrain Mar 6, 2018
ab29f31
Merge branch 'google_analytics_2' into 'master'
gbrain Mar 6, 2018
cdedb2d
updates order of search fields
gbrain Mar 6, 2018
43dbdd5
removes rights from advanced search
gbrain Mar 6, 2018
17e733b
merges master
gbrain Mar 6, 2018
b88eddc
Merge branch 'add_download_flag' of gitlab.com:notch8/washington-gold…
gbrain Mar 6, 2018
dc4c605
adds rights edit for collections, and adds rights to menu
gbrain Mar 7, 2018
5ab2153
removes swp file
gbrain Mar 7, 2018
a30b0ec
merges advanced search
gbrain Mar 7, 2018
0a91009
merges in rights
gbrain Mar 7, 2018
c0927ef
merges tei
gbrain Mar 7, 2018
31451dd
clear works during ci sample load
gbrain Mar 7, 2018
bb931cc
adds migrations to build for ci
gbrain Mar 7, 2018
f14a71a
dont load assets during startup
gbrain Mar 7, 2018
b83476a
run load sample first in ci deploy
gbrain Mar 7, 2018
a347571
wait to destroy old assets
gbrain Mar 7, 2018
82d93de
dont load sample assets during build
gbrain Mar 7, 2018
e009332
"added styles and bootstrap classes to rights crud files"
labradford Mar 7, 2018
e9e2a2d
merged published changes
labradford Mar 7, 2018
2120602
removed duplicate tei json field
labradford Mar 7, 2018
95446a4
Merge branch '634255-rights-statements' of gitlab.com:notch8/washingt…
gbrain Mar 7, 2018
f361635
disable editing of uri for existing rights
gbrain Mar 7, 2018
8f2aa32
adds validation for http on rights uri
gbrain Mar 7, 2018
c8bdfe3
removes date from advanced search
gbrain Mar 7, 2018
bc1c625
Merge branch '634221-advanced-search' into integration
gbrain Mar 7, 2018
a61b9dd
merges phase 1 branches
gbrain Mar 7, 2018
5627d47
fixed advanced search params
labradford Mar 8, 2018
3e415f8
Merge branch '634221-advanced-search' of gitlab.com:notch8/washington…
labradford Mar 8, 2018
32c3c4e
Merge branch '634221-advanced-search' into integration
labradford Mar 8, 2018
b4008ed
adds support from https for rights uri
gbrain Mar 8, 2018
5863f12
Merge branch '634255-rights-statements' into integration
gbrain Mar 8, 2018
76b40f3
Merge branch 'integration' of gitlab.com:notch8/washington-goldenseal…
gbrain Mar 8, 2018
9a22c26
removed header on advanced search, added style, removed test meta tag…
labradford Mar 8, 2018
38437db
merged advanced search branch
labradford Mar 8, 2018
8f8a2f5
quick deploy fix
orangewolf Mar 8, 2018
601b293
working, tunnel based ldap configuration
orangewolf Mar 8, 2018
25322ad
setting download flag on file_set level
labradford Mar 14, 2018
cba51b0
add prevent download attribute to show page, hid download button for …
labradford Mar 14, 2018
6bf7462
adds migrations for spotlight
gbrain Mar 19, 2018
c54b074
adds gems for spotlight
gbrain Mar 19, 2018
b23109e
adds config files for spotlight
gbrain Mar 19, 2018
d6de5f9
updates to routes for spotlight
gbrain Mar 19, 2018
6d4653e
adds spotlight behaviors to user
gbrain Mar 19, 2018
d07f18b
updates to solr_document model for spotlight
gbrain Mar 19, 2018
1af7174
adds concerns to search builder for spotlight
gbrain Mar 19, 2018
94fae39
adds endpoints for spotlight to application_controller
gbrain Mar 19, 2018
9e7dd79
backups for spotlight config files
gbrain Mar 19, 2018
0f3e49f
temporarily adds spotlight gem in tmp
gbrain Mar 19, 2018
d58926e
make label clickable for preventing download
gbrain Mar 20, 2018
98acd50
cleans up routes a bit
gbrain Mar 20, 2018
b06e3d0
adds spotlight in tmp for now
gbrain Mar 20, 2018
a89d30f
updated spotlight gem location
labradford Mar 20, 2018
3665276
remove extra items for advanced search
labradford Mar 23, 2018
378d9f1
change item type to dropdown in advanced search
labradford Mar 23, 2018
81068f5
rearrange items on advanced search page
labradford Mar 23, 2018
d24a4e7
truncate long descriptions on search index page
labradford Mar 23, 2018
a6d128b
634279 spotlight menu
labradford Mar 28, 2018
ea43ae2
Merge branch '634279-spotlight-menu' into '634279-spotlight'
gbrain Mar 28, 2018
8fd91da
wires up resources from curration concerns in spotlight
gbrain Mar 29, 2018
dcf95e8
added match highlighting to search results
labradford Mar 29, 2018
dde729e
hide advanced search button"
labradford Mar 29, 2018
5492a3b
Merge branch 'hide_advanced_search_button' into 'master'
orangewolf Mar 29, 2018
d9c8c2f
removed extra closing tag on comment
labradford Mar 29, 2018
8e1fba5
replaces work models with original
gbrain Apr 2, 2018
ac9012a
tei text view is full-width if no image
labradford Apr 2, 2018
f75ff0a
deploy correct xslt
orangewolf Apr 2, 2018
7691fa5
Merge branch 'hide_advanced_search_button' into 'master'
orangewolf Apr 2, 2018
71da930
Merge branch 'master' of gitlab.com:notch8/washington-goldenseal
orangewolf Apr 2, 2018
eb173a8
bulk update of downloads on collections, only prevents downloads for …
labradford Apr 3, 2018
5d49a2d
Merge branch 'download_flag_filesets' of gitlab.com:notch8/washington…
labradford Apr 3, 2018
7ec0e00
fixed bug for validation error
labradford Apr 3, 2018
4fefcb9
wip: adds link from admin set to exhibit
gbrain Apr 3, 2018
b565647
Merge branch '634255-rights-statements' of gitlab.com:notch8/washingt…
labradford Apr 3, 2018
887053f
Merge branch '634239-tei-template' of gitlab.com:notch8/washington-go…
gbrain Apr 3, 2018
7c11dbe
merges advanced search
gbrain Apr 3, 2018
482e11a
Merge branch '634255-rights-statements' of gitlab.com:notch8/washingt…
gbrain Apr 3, 2018
c2b844d
merges prevent download
gbrain Apr 3, 2018
e0d6939
removed downloadable stuff from controllers, added nil check for rep_…
labradford Apr 3, 2018
12f314f
deleted unnecessary code from audios controller, added bold style to …
labradford Apr 4, 2018
bdb9675
finishes link from admin set to spotlight exhibit
gbrain Apr 4, 2018
7c238be
moves spotlight out to a real gem, adds localization for spotlight
gbrain Apr 4, 2018
bead27c
updates exhibit left nav
gbrain Apr 4, 2018
6de8947
merges integration
gbrain Apr 4, 2018
9e444d0
updates truncation of search results fields to play nice with highlig…
gbrain Apr 4, 2018
c6c204c
ui updates for download actions
gbrain Apr 4, 2018
b2b7880
adds prevent download to admin sets
gbrain Apr 5, 2018
8b22bdd
migrate and seed instead of load samples
gbrain Apr 5, 2018
a1fc047
dont run db setup on ci deploy
gbrain Apr 5, 2018
2a71424
adds edit button from admin set to exhbit, removes curation link from…
gbrain Apr 6, 2018
da3cec7
wires up search from spotlight exhibit
gbrain Apr 6, 2018
3e6bdf7
updates readme with solr and docker information
gbrain Apr 6, 2018
ec4deac
adds custom metadata classes for works
gbrain Apr 17, 2018
db3ac78
display custom metadata on works page, and edit forms
gbrain Apr 19, 2018
785ad9a
generalizes custom metadata and makes available to all work types
gbrain Apr 19, 2018
0d9a0cb
cleans up spotlight exhibit edit screens
gbrain Apr 19, 2018
6317ef0
delegate title on exhibit to collection or admin_set
gbrain Apr 19, 2018
a48cbd4
css fixes, removed sidebar from spotlight, fix nil error in attribute…
labradford Apr 20, 2018
10daefc
Merge branch 'jetty-solr-documentation' into 'master'
orangewolf Apr 20, 2018
7f72260
initial oai provider needs format
orangewolf Apr 20, 2018
af34aa7
generalizes spotlight exhibits
gbrain Apr 20, 2018
894405a
Merge branch '634279-spotlight-collection-experiment' of gitlab.com:n…
gbrain Apr 20, 2018
7a683a5
files needed for collection support
gbrain Apr 20, 2018
0c63d53
update docker to keep solr from falling over all the time
orangewolf Apr 21, 2018
a74c5bc
Merge branch 'master' of gitlab.com:notch8/washington-goldenseal
orangewolf Apr 21, 2018
f5ec3e5
Merge branch 'master' into 634279-spotlight
orangewolf Apr 21, 2018
a5280d7
Merge branch 'master' into oai-pmh
orangewolf Apr 21, 2018
69446ca
Merge of fixes for ci samples
orangewolf Apr 26, 2018
e902c0d
cleans up spotlight integration
gbrain Apr 27, 2018
d519079
Merge branch '634279-spotlight' of gitlab.com:notch8/washington-golde…
gbrain Apr 27, 2018
c6a1dfc
cleans up links between collections/admin_sets and spotlight exhibits
gbrain Apr 28, 2018
7558ee4
fixes route for sir trevor widgets
gbrain Apr 28, 2018
4d51f9d
removes browse and pages blocks from sir trevor
gbrain Apr 29, 2018
f6d30f4
adds default_filter_field to exhibit
gbrain Apr 30, 2018
5b45716
handle missing attached files for tei Text works
gbrain Apr 30, 2018
393aaad
cleans up admin_set default spotlight query
gbrain Apr 30, 2018
5959440
better check for custom metadata in attribute view
gbrain Apr 30, 2018
f7f1afc
merges master
gbrain Apr 30, 2018
441412f
wip: adds fields for oai
gbrain May 1, 2018
a74b0ce
wip: adds property for solr document work
gbrain May 1, 2018
9b3fb92
adds thumb and work urls to index
gbrain May 1, 2018
93265e3
index proper identifiers for oai
gbrain May 1, 2018
8b2f297
adds default_host env var
gbrain May 1, 2018
ac6ed67
merges in spotlight
gbrain May 1, 2018
4ec197b
merges in download, tei, and ui work
gbrain May 1, 2018
7789d34
dont migrate during ci deploy
gbrain May 1, 2018
f50b676
remove extraneous slash in thumb path for oai identifier
gbrain May 1, 2018
7b443a8
Merge branch 'oai-pmh' into spotlight-integration
gbrain May 1, 2018
ac8048d
absolute path to exhibit tab heading translations
gbrain May 1, 2018
c5a9e93
fixes error for works without custom metadata
gbrain May 1, 2018
474891c
Merge branch '634279-spotlight' into spotlight-integration
gbrain May 1, 2018
8560f07
show thumbnail in spotlight widgets
gbrain May 2, 2018
20a0622
fixes default query from spotlight
gbrain May 2, 2018
afeaea4
cleans up exihibitable, and a bad merge in schema
gbrain May 3, 2018
3aa5fd5
adds some git ignore paths for vim
gbrain May 28, 2018
1312397
cleans up failing import because of tei circular dependency
gbrain May 29, 2018
3bc5bbf
merges upstream
gbrain May 29, 2018
c2bf26d
remove spotlight exhibits when admin sets destroyed
gbrain May 30, 2018
d99d6f6
installs fits for work ingestion
gbrain Jun 3, 2018
deb938f
sets target for staging deploy
gbrain Jun 3, 2018
d144e6b
Merge branch 'master' into 'working_ldap'
orangewolf Jun 13, 2018
872575c
Merge branch 'working_ldap' into 'master'
orangewolf Jun 13, 2018
e5bd62d
ansible deploy updates
orangewolf Jun 14, 2018
261bf59
Merge branch 'master' of gitlab.com:notch8/washington-goldenseal
orangewolf Jun 14, 2018
e8e8e37
cleanup ldap pass
orangewolf Jun 14, 2018
e860b56
fixes permissions with jetty on deploy
gbrain Jun 19, 2018
6273ccb
Merge branch 'master' of gitlab.com:notch8/washington-goldenseal
gbrain Jun 19, 2018
3fde2d6
merges master
gbrain Jun 19, 2018
aa2fb73
cleans up fits setup
gbrain Jul 10, 2018
38e9f06
Merge branch 'spotlight-integration' into 'master'
gbrain Jul 10, 2018
ba5b16b
move back to washington url for deployment
orangewolf Jul 10, 2018
0be9196
giant file is giant
orangewolf Jul 10, 2018
5de06da
fix migration which does not seem to work against prod db
orangewolf Jul 10, 2018
1b14e88
allow fits in docker w/o adding it to the repo
orangewolf Jul 10, 2018
a525cc7
move collection controller behavior enhancements out to own file
gbrain Jul 14, 2018
0af338b
merges upstream
gbrain Jul 14, 2018
46dda91
adds back in all config to search
gbrain Jul 14, 2018
9e579a4
Merge branch 'master' into fixes-concern-inclusion-issues-in-prod
gbrain Jul 17, 2018
be1bb24
Fixes concern inclusion issues in prod
gbrain Jul 17, 2018
862611b
Merge branch 'fixes-concern-inclusion-issues-in-prod' into 'master'
orangewolf Jul 17, 2018
d437740
removes include and prevent download from concern monkey patch, and c…
gbrain Jul 17, 2018
7045ab3
merges upstream
gbrain Jul 17, 2018
8b91d6e
Merge branch 'fixes-concern-inclusion-issues-in-prod' into 'master'
gbrain Jul 17, 2018
7efc841
remove the file causing our production mode to fail
orangewolf Aug 17, 2018
6770dc8
adjusts column widths for video tei
gbrain Aug 22, 2018
3071fa3
Merge branch 'video-tei-ui-overlap' into 'master'
gbrain Aug 29, 2018
beaa60f
restores original homepage
gbrain Aug 29, 2018
855d7f6
removes commented out homepage route
gbrain Aug 29, 2018
ef11263
reverts some docker settings
gbrain Aug 31, 2018
39763e0
Merge branch 'i7-homepage-content' into 'master'
gbrain Aug 31, 2018
b989e8f
add skip ldap to development env
gbrain Aug 31, 2018
eae7837
Merge branch 'master' of gitlab.com:notch8/washington-goldenseal
gbrain Aug 31, 2018
3a025c6
adds spotlight exhibits to abilities
gbrain Sep 25, 2018
3f505dc
updates abilities for spotlight
gbrain Sep 25, 2018
b510029
adds ability to manage spotlight to admins
gbrain Sep 25, 2018
82ba953
adds a view members link to exhibit home, adjusts font in header
gbrain Sep 25, 2018
4731f06
cleans up includes for access controls
gbrain Sep 26, 2018
68a5f43
adds comment about odd rescue
gbrain Sep 26, 2018
9e089dc
better load order resolution for access control concern
gbrain Sep 26, 2018
bdfe7f4
cleaner access control
gbrain Sep 26, 2018
9c01492
Merge branch 'i13-auth' into 'master'
orangewolf Sep 26, 2018
cf828fc
Update .env
orangewolf Sep 26, 2018
5c6fbeb
Merge branch 'i16-collection-link' into 'master'
orangewolf Sep 26, 2018
7ca543b
Merge branch 'i6-fulltext-search' into 'master'
orangewolf Sep 26, 2018
9dbdb26
removes tags, which we dont need for our implimentation of spotlight
gbrain Sep 26, 2018
c2f4745
reverts hidding transcript and video playback based on prevent download
gbrain Sep 28, 2018
7f2661c
dont offer custom meta data fields if no spotligt exhibit on work edit
gbrain Oct 1, 2018
6b055f8
Merge branch 'i10-revert-hidding-transcript-and-video' into 'master'
orangewolf Oct 1, 2018
3845e36
if instead of unless
gbrain Oct 2, 2018
66de55f
cleans up nav links on collection edit pages
gbrain Oct 2, 2018
af170cc
removes skipldap
gbrain Oct 2, 2018
cf6fb7d
Merge branch 'conditional_custom_metadata' into 'master'
gbrain Oct 2, 2018
5f43f69
fixes header
gbrain Oct 11, 2018
498b9b6
Merge branch 'header' into 'master'
gbrain Oct 23, 2018
e65fa44
deletes associated spotlight exhibit when collection is deleted
gbrain Oct 24, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 12 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.bundle
.convox
.env
.git
!.git/logs/HEAD
db/*.sqlite3
db/*.sqlite3-journal
log/*
tmp/*
!tmp/.gitkeep
sample-assets*
dump.rdb
14 changes: 14 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#POSTGRES_DB=goldenseal
#POSTGRES_HOST=postgres
#POSTGRES_PASSWORD=DatabaseFTW
#POSTGRES_USER=postgres
DEFAULT_HOST=localhost:8080
DEPLOY_HOOK=CHANGEME
DOCKER_PORT=8000:80
PASSENGER_APP_ENV=development
REGISTRY_HOST=registry.gitlab.com
REGISTRY_URI=/notch8/washington-goldenseal
SITE_URI=web.goldenseal.staging.notch8network.com
SOLR_URL=http://localhost:8983/solr/development
TAG=dev
TEST_DB=goldenseal_test
4 changes: 4 additions & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
VIRTUAL_PORT: 80
VIRTUAL_HOST: goldenseal.docker
SKIP_LDAP: true

10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
/db/*.sqlite3
/db/*.sqlite3-journal

public/uploads

/log/*
!/log/.keep
/tmp
Expand All @@ -23,3 +25,11 @@ config/solr.yml
config/redis.yml
config/resque-pool.yml
config/ldap.yml

public/uploads
sample-assets
sample_assets.tgz
**/*.swo
**/*.swp

ops/fits-1.0.5/*
66 changes: 66 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
image: docker:17.04
services:
- docker:dind

stages:
- build
- review

variables:
DOCKER_DRIVER: overlay
DOCKER_PORT: 80
PASSENGER_APP_ENV: development
RAILS_ENV: development
REGISTRY_HOST: registry.gitlab.com
REGISTRY_URI: /notch8/washington-goldenseal
TEST_DB: test
SECRET_KEY_BASE: 729ac8fd6f2ad97b45d9bdf6cbc6a83e01c53fcc0e7b3c2afac1dfb2906deccfd39b83e534938d4e2729e3787a72043794eb045568f089efddce51c17cc4160d
SKIP_LDAP: 'true'

build:
stage: build
script:
- docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG" .
- docker push "$CI_REGISTRY_IMAGE:$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG"
variables:
GIT_STRATEGY: fetch
tags:
- docker

review:
stage: review
type: deploy
environment:
name: review/$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
url: http://web.$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG.staging.notch8network.com
on_stop: stop_review
only:
- branches
except:
- master
script:
- wget https://github.com/rancher/cli/releases/download/v0.4.1/rancher-linux-amd64-v0.4.1.tar.gz
- tar zxfv rancher-linux-amd64-v0.4.1.tar.gz
- export RANCHER_ENVIRONMENT=staging
- export TAG=$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
- export SITE_URI=web.$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG.staging.notch8network.com
- ./rancher-v0.4.1/rancher up -p -d -u -c -s $TAG -f docker-compose.ci.yml
variables:
GIT_STRATEGY: fetch
tags:
- docker

stop_review:
stage: review
script:
- wget https://github.com/rancher/cli/releases/download/v0.4.1/rancher-linux-amd64-v0.4.1.tar.gz
- tar zxfv rancher-linux-amd64-v0.4.1.tar.gz
- export RANCHER_ENVIRONMENT=staging
- ./rancher-v0.4.1/rancher rm $CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
variables:
GIT_STRATEGY: none
when: manual
environment:
name: review/$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
action: stop
18 changes: 18 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM registry.gitlab.com/notch8/washington-goldenseal/base:latest

ADD https://time.is/just build-time
COPY ops/nginx.sh /etc/service/nginx/run
COPY ops/webapp.conf /etc/nginx/sites-enabled/webapp.conf
COPY ops/env.conf /etc/nginx/main.d/env.conf

COPY . $APP_HOME

ADD https://projects.iq.harvard.edu/files/fits/files/fits-1.0.5.zip /opt/
RUN unzip /opt/fits-1.0.5.zip -d /opt
RUN chmod a+x /opt/fits-1.0.5/fits.sh
ENV PATH="/opt/fits-1.0.5:${PATH}"

RUN bundle check || bundle install
RUN chown -R app:app ./jetty

CMD ["/sbin/my_init"]
60 changes: 60 additions & 0 deletions Dockerfile.base
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
FROM phusion/passenger-ruby23:0.9.27

RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
apt-get install -y software-properties-common && \
apt-add-repository -y ppa:ansible/ansible && \
add-apt-repository -y ppa:webupd8team/java && \
apt-get update -qq && \
apt-get install -y build-essential nodejs yarn pv ansible libsasl2-dev libpq-dev postgresql-client \
oracle-java8-installer zip unzip imagemagick tzdata redis-server && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
yarn config set no-progress && \
yarn config set silent

ENV JAVA_HOME /usr/lib/jvm/java-8-oracle


RUN rm /etc/nginx/sites-enabled/default
COPY ops/webapp.conf /etc/nginx/sites-enabled/webapp.conf
COPY ops/env.conf /etc/nginx/main.d/env.conf

ENV APP_HOME /home/app/webapp
RUN mkdir $APP_HOME
WORKDIR $APP_HOME

ENV BUNDLE_GEMFILE=$APP_HOME/Gemfile \
BUNDLE_JOBS=4

COPY Gemfile* $APP_HOME/
RUN bundle check || bundle install
#RUN yarn install

RUN touch /var/log/worker.log && chmod 666 /var/log/worker.log
RUN mkdir /etc/service/worker
COPY ops/worker.sh /etc/service/worker/run
RUN chmod +x /etc/service/worker/run

RUN mkdir /etc/service/redis
COPY ops/redis.sh /etc/service/redis/run
RUN chmod +x /etc/service/redis/run


COPY . $APP_HOME
RUN chown -R app $APP_HOME

RUN /sbin/setuser app ./bin/setup && \
/sbin/setuser app rake jetty:clean && \
/sbin/setuser app rake curation_concerns:jetty:config
RUN touch /var/log/jetty.log && chmod 666 /var/log/jetty.log


# Asset complie and migrate if prod, otherwise just start nginx
COPY ops/nginx.sh /etc/service/nginx/run
RUN chmod +x /etc/service/nginx/run
RUN rm -f /etc/service/nginx/down

CMD ["/sbin/my_init"]
11 changes: 11 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ gem 'riiif', '0.2.0'
gem 'openseadragon', '~> 0.2.1'
gem 'angularjs-rails', '~> 1.4.4'
gem 'ldp', '~> 0.4.1'
gem 'blacklight_oai_provider', git: 'https://github.com/projectblacklight/blacklight_oai_provider.git', branch: 'v5.1'
gem 'blacklight-spotlight', git: 'https://github.com/projectblacklight/spotlight.git', tag: 'v0.17.1'

# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'
Expand Down Expand Up @@ -71,3 +73,12 @@ gem 'rsolr', '~> 1.0.6'
gem 'devise'
gem 'devise_ldap_authenticatable'
gem 'devise-guests', '~> 0.3'

gem 'font-awesome-rails'

gem 'friendly_id'
gem 'sitemap_generator'
gem 'blacklight-gallery', '>= 0.3.0'
gem 'blacklight-oembed'
gem 'social-share-button'
gem 'devise_invitable'
Loading