Skip to content

Commit

Permalink
tidy env vars
Browse files Browse the repository at this point in the history
  • Loading branch information
lsat12357 committed Feb 14, 2024
1 parent 3099658 commit 944ecef
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM ruby:2.7-alpine3.15
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8

RUN gem install bundler
RUN gem install bundler -v 2.4.22

RUN apk add --update --no-cache \
bash \
Expand Down
7 changes: 2 additions & 5 deletions config/initializers/devise.rb
Original file line number Diff line number Diff line change
Expand Up @@ -309,11 +309,8 @@
#assertion_consumer_service_url: 'localhost:3000/
idp_cert: ENV.fetch('SAML_IDP_CERT', 'cert'),
idp_sso_service_url: ENV.fetch('SAML_URL', 'https://shibboleth-test.uoregon.edu/idp/profile/SAML2/Redirect/SSO'),
sp_entity_id: 'localhost:3000'
#issuer: ENV.fetch('SAML_ISSUER', 'http://lib-staging.uoregon.edu/users/auth/saml?locale=en'),
#private_key: ENV.fetch('SAML_PRIVATE_KEY', 'key'),
#certificate: ENV.fetch('SAML_CERT', nil),
#uid_attribute: 'urn:oid:0.9.2342.19200300.100.1.1'
sp_entity_id: ENV.fetch('SP_ENTITY_ID', 'localhost:3000/users/auth/saml/metadata'),
uid_attribute: 'urn:oid:0.9.2342.19200300.100.1.1'

# ==> Warden configuration
# If you want to use other strategies, that are not supported by Devise, or
Expand Down
3 changes: 0 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ services:
- ACTIVE_JOB_QUEUE_ADAPTER=sidekiq
- SIDEKIQ_ADMIN_SAFE_URLS='http://localhost:3000'
- MYSQL_DATABASE=spotlightdev
- SAML_IDP_CERT=cert
- SAML_URL=saml_url
- SAML_ENTITY_ID=saml_entity_id
command: >
bash -c "./build/entrypoint.sh"
depends_on:
Expand Down

0 comments on commit 944ecef

Please sign in to comment.