From c98c224a1e9623af686f3e011e3207c9dafcf5bc Mon Sep 17 00:00:00 2001 From: "epugh@opensourceconnections.com" <> Date: Mon, 9 Aug 2021 18:29:39 -0400 Subject: [PATCH] post 6.6.0 updates --- Dockerfile.prod | 4 +++- README.md | 2 +- docs/operating_documentation.md | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile.prod b/Dockerfile.prod index 592656cf7..890170c26 100644 --- a/Dockerfile.prod +++ b/Dockerfile.prod @@ -14,7 +14,7 @@ RUN apt-get update -qq && apt-get install -y --no-install-recommends vim curl gi && rm -rf /var/lib/apt/lists/* # Install Node -RUN curl -sL https://deb.nodesource.com/setup_10.x | bash +RUN curl -sL https://deb.nodesource.com/setup_14.x | bash RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list @@ -42,6 +42,8 @@ RUN bundle install --without development test && \ COPY --from=build-dep /srv/app/node_modules ./node_modules/ COPY . . +RUN mkdir -p tmp/pids + RUN RAILS_ENV=production SECRET_KEY_BASE=fake_out_devise bundle exec rake assets:precompile # Remove some files not needed in resulting image diff --git a/README.md b/README.md index 8da2d5dbf..22313a05c 100644 --- a/README.md +++ b/README.md @@ -298,7 +298,7 @@ brew install mysql ### Debugging Splainer and other NPM packages -`docker-compose.override.yml.example` can be copied to `docker-compose.override.yml` and use it to override environment variables or work with a local copy of the splainer-search JS library during development defined in `docker-compose.yml`. Example is included. Just update the path to splainer-search with your local checkout! https://docs.docker.com/compose/extends/ +`docker-compose.override.yml.example` can be copied to `docker-compose.override.yml` and use it to override environment variables or work with a local copy of the splainer-search JS library during development defined in `docker-compose.yml`. Example is included. Just update the path to `splainer-search` with your local checkout! https://docs.docker.com/compose/extends/ ## Convenience Scripts diff --git a/docs/operating_documentation.md b/docs/operating_documentation.md index ec96f133a..a7ede8f8e 100644 --- a/docs/operating_documentation.md +++ b/docs/operating_documentation.md @@ -52,11 +52,13 @@ SMTP_ENABLE_STARTTLS # If STARTTLS is enabled in your server set to true # OAuth Quepid uses [OmniAuth](https://github.com/intridea/omniauth) for authenticating users against other resources besides it's own email/password database. OmniAuth provides an easy way to authenticate against dozens of outside services. The only ones that are packaged with Quepid are Google and Keycloak, but it's fairly easy to add new ones. +Learn more about setting up Google oAuth at https://support.google.com/cloud/answer/6158849?hl=en. + The built in options are `GOOGLE_CLIENT_ID`, `GOOGLE_CLIENT_SECRET`, `KEYCLOAK_REALM` and `KEYCLOAK_SITE`. The OmniAuth providers are defined in `config/devise.rb`. A list of available providers can be viewed on the [OmniAuth Wiki](https://github.com/intridea/omniauth/wiki/List-of-Strategies). To enable a provider you need to add the gem (eg. `omniauth-facebook`) to the `Gemfile` and configure in `config/devise.rb` and `user.rb` -The existance of `GOOGLE_CLIENT_ID` or `KEYCLOAK_REALM` enables the respective sign in option. +The existence of `GOOGLE_CLIENT_ID` or `KEYCLOAK_REALM` enables the respective sign in option. # Legal Pages & GDPR