diff --git a/Dockerfile b/Dockerfile index 9209616..fe50f06 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,9 +36,7 @@ FROM development AS production COPY --chown=${UID}:${GID} . /app ENV BUNDLE_WITHOUT development:test -RUN --mount=type=secret,id=github_token,uid=1000 \ - github_token="$(cat /run/secrets/github_token)" \ - && BUNDLE_RUBYGEMS__PKG__GITHUB__COM=${github_token} bundle install +RUN bundle install RUN npm ci diff --git a/Gemfile b/Gemfile index c5a75ed..c5983e6 100644 --- a/Gemfile +++ b/Gemfile @@ -12,9 +12,9 @@ gem "omniauth_openid_connect" gem "sinatra-flash" gem "rackup" -source "https://rubygems.pkg.github.com/mlibrary" do - gem "alma_rest_client", "~> 2.0" -end +gem "alma_rest_client", + git: "https://github.com/mlibrary/alma_rest_client", + tag: "v2.0.0" # In order to get rspec to work for ruby 3.3. Maybe later see if it's still necessary gem "net-smtp", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 29ea8c2..ff0c5dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,15 @@ +GIT + remote: https://github.com/mlibrary/alma_rest_client + revision: 9606225d82480b6d1568902813ae9018dd8c1acc + tag: v2.0.0 + specs: + alma_rest_client (2.0.0) + activesupport (~> 7.0, >= 4.2) + faraday + faraday-retry + httpx + rexml + GEM remote: https://rubygems.org/ specs: @@ -44,13 +56,13 @@ GEM faraday (>= 1, < 3) faraday-net_http (3.1.0) net-http - faraday-retry (2.2.0) + faraday-retry (2.2.1) faraday (~> 2.0) ffi (1.16.3) hashdiff (1.1.0) hashie (5.0.0) http-2-next (1.0.3) - httpx (1.2.1) + httpx (1.2.5) http-2-next (>= 1.0.3) i18n (1.14.1) concurrent-ruby (~> 1.0) @@ -250,22 +262,12 @@ GEM puma yabeda (~> 0.5) -GEM - remote: https://rubygems.pkg.github.com/mlibrary/ - specs: - alma_rest_client (2.0.0) - activesupport (~> 7.0, >= 4.2) - faraday - faraday-retry - httpx - rexml - PLATFORMS x86_64-linux DEPENDENCIES activesupport - alma_rest_client (~> 2.0)! + alma_rest_client! climate_control faraday-follow_redirects listen diff --git a/env.example b/env.example index 39abcde..3fd3603 100644 --- a/env.example +++ b/env.example @@ -4,4 +4,3 @@ OIDC_CLIENT_ID='YOUR-OIDC-CLIENT-ID' OIDC_ISSUER='https://your-oidc-issuer' WEBLOGIN_ON='false' ACCOUNT_URL='https://account.lib.umich.edu' -BUNDLE_RUBYGEMS__PKG__GITHUB__COM="YOUR GITHUB TOKEN WITH READ PACKAGES"