Skip to content

Commit

Permalink
Merge branch 'all_the_auth' of github.com:samvera/hyku into all_the_auth
Browse files Browse the repository at this point in the history
  • Loading branch information
orangewolf committed Aug 7, 2023
2 parents ec0ef77 + 57e649d commit 042ab05
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 33 deletions.
6 changes: 3 additions & 3 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ SOLR_PORT=8983
SOLR_URL=http://solr:SolrRocks@solr:8983/solr/

# Comment out these 5 for single tenancy / Uncomment for multi
HYKU_ADMIN_HOST=local3000.notch8.cloud
HYKU_ADMIN_HOST=hyku.test
HYKU_ADMIN_ONLY_TENANT_CREATION=false
HYKU_DEFAULT_HOST=%{tenant}.local3000.notch8.cloud
HYKU_ROOT_HOST=local3000.notch8.cloud
HYKU_DEFAULT_HOST=%{tenant}.hyku.test
HYKU_ROOT_HOST=hyku.test
HYKU_MULTITENANT=true
# Comment out these 2 for multi tenancy / Uncomment for single
# HYKU_ROOT_HOST=hyku.test
Expand Down
14 changes: 8 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,17 @@ COPY --chown=1001:101 ./ops/exiftool_image_to_fits.xslt /app/fits/xml/exiftool/e
RUN ln -sf /usr/lib/libmediainfo.so.0 /app/fits/tools/mediainfo/linux/libmediainfo.so.0 && \
ln -sf /usr/lib/libzen.so.0 /app/fits/tools/mediainfo/linux/libzen.so.0

FROM hyku-base as hyku-web
ONBUILD COPY --chown=1001:101 $APP_PATH/bin/db-migrate-seed.sh /app/samvera/

ONBUILD COPY --chown=1001:101 $APP_PATH/Gemfile* /app/samvera/hyrax-webapp/
ONBUILD RUN bundle install --jobs "$(nproc)"

COPY --chown=1001:101 $APP_PATH/Gemfile* /app/samvera/hyrax-webapp/
RUN bundle install --jobs "$(nproc)"
ONBUILD COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp

COPY --chown=1001:101 $APP_PATH/bin/db-migrate-seed.sh /app/samvera/
COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DB_URL='postgresql://fake' bundle exec rake assets:precompile && yarn install

RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DB_URL='postgresql://fake' bundle exec rake assets:precompile && yarn install

FROM hyku-base as hyku-web
CMD ./bin/web

FROM hyku-web as hyku-worker
Expand Down
24 changes: 0 additions & 24 deletions app/assets/images/login_saml_logo.svg

This file was deleted.

0 comments on commit 042ab05

Please sign in to comment.