Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions .env-example
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
DATABASE_NAME=osp_app
# DATABASE_USERNAME=
# DATABASE_PASSWORD=
DATABASE_HOST=localhost
DATABASE_PORT=5432
# bundle exec rake secret
SECRET_KEY_BASE=
ASSET_HOST=
# THROTTLING_MAX_REQUESTS - Integer - Number of requests per ip
THROTTLING_MAX_REQUESTS=100
# THROTTLING_PERIOD - Integer - Period for each IP in minutes
THROTTLING_PERIOD=1
# ENABLE_RACK_ATTACK - Binary (Default 1) - Enable or Disable Rack Attack
# ENABLE_RACK_ATTACK=0
ENABLE_RACK_ATTACK=1
# Omniauth
# OMNIAUTH_ENABLE_MULTI_TENANT - Binary (Default 1) - Enable or Disable Omniauth multitenant setup
# OMNIAUTH_ENABLE_MULTI_TENANT=0
OMNIAUTH_ENABLE_MULTI_TENANT=1
# If OMNIAUTH_ENABLE_MULTI_TENANT is enabled these variables will not be taken into account
## France Connect UID
OMNIAUTH_FRANCE_CONNECT_UID_ENABLED=0
OMNIAUTH_FRANCE_CONNECT_UID_ICON_PATH=
OMNIAUTH_FRANCE_CONNECT_UID_BUTTON_PATH=
OMNIAUTH_FRANCE_CONNECT_UID_PROVIDER_NAME=
OMNIAUTH_FRANCE_CONNECT_UID_SITE=
OMNIAUTH_FRANCE_CONNECT_UID_CLIENT_ID=
OMNIAUTH_FRANCE_CONNECT_UID_CLIENT_SECRET=
OMNIAUTH_FRANCE_CONNECT_UID_END_SESSION_ENDPOINT=
OMNIAUTH_FRANCE_CONNECT_UID_MINIMUM_AGE=
## France Connect PROFILE
OMNIAUTH_FRANCE_CONNECT_PROFILE_ENABLED=0
OMNIAUTH_FRANCE_CONNECT_PROFILE_ICON_PATH=
OMNIAUTH_FRANCE_CONNECT_PROFILE_BUTTON_PATH=
OMNIAUTH_FRANCE_CONNECT_PROFILE_PROVIDER_NAME=
OMNIAUTH_FRANCE_CONNECT_PROFILE_SITE=
OMNIAUTH_FRANCE_CONNECT_PROFILE_CLIENT_ID=
OMNIAUTH_FRANCE_CONNECT_PROFILE_CLIENT_SECRET=
OMNIAUTH_FRANCE_CONNECT_PROFILE_END_SESSION_ENDPOINT=
OMNIAUTH_FRANCE_CONNECT_PROFILE_MINIMUM_AGE=

ENABLE_LETTER_OPENER=0
8 changes: 4 additions & 4 deletions .github/workflows/CI_CD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ env:
CI: "true"
SIMPLECOV: "true"
RSPEC_FORMAT: "documentation"
RUBY_VERSION: 2.6.5
RUBY_VERSION: 2.6.9
RAILS_ENV: test
NODE_VERSION: 16.9.1
NODE_VERSION: 22.17.1

jobs:
lint:
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
DATABASE_PASSWORD: postgres
DATABASE_HOST: host.docker.internal
steps:
- uses: OpenSourcePolitics/build-and-test-images-action@master
- uses: OpenSourcePolitics/build-and-test-images-action@ppan
with:
registry: ${{ vars.REGISTRY_ENDPOINT }}
namespace: ${{ vars.REGISTRY_NAMESPACE }}
Expand All @@ -118,7 +118,7 @@ jobs:
needs: [ lint, tests, system_tests, test_build ]
runs-on: ubuntu-latest
steps:
- uses: OpenSourcePolitics/build-and-push-images-action@master
- uses: OpenSourcePolitics/build-and-push-images-action@ppan
with:
registry: ${{ vars.REGISTRY_ENDPOINT }}
namespace: ${{ vars.REGISTRY_NAMESPACE }}
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15.14.0
22.17.1
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.5
2.6.9
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM ruby:2.6.5
FROM ruby:2.6.9

ENV RAILS_ENV=production
ENV SECRET_KEY_BASE=dummy

# Install NodeJS
RUN curl https://deb.nodesource.com/setup_lts.x | bash && \
RUN curl https://deb.nodesource.com/setup_22.x | bash && \
apt install -y nodejs && \
apt update && \
npm install -g npm@8.19.2 && \
npm install --global yarn && \
apt install -y libicu-dev postgresql-client && \
gem install bundler:2.2.17
gem install bundler:2.2.24

COPY Gemfile* ./
RUN bundle config set --local without 'development test' && bundle install
Expand Down
9 changes: 5 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ gem "decidim-initiatives", git: "https://github.com/OpenSourcePolitics/decidim.g
gem "decidim-cleaner", git: "https://github.com/OpenSourcePolitics/decidim-module-cleaner.git", branch: "release/0.22-stable"
gem "decidim-term_customizer", git: "https://github.com/OpenSourcePolitics/decidim-module-term_customizer.git", branch: "0.dev"

gem "bootsnap"
gem "bootsnap", "1.7.5"
gem "puma", ">= 4.3"
gem "uglifier"

Expand All @@ -22,16 +22,17 @@ gem "wkhtmltopdf-binary"

gem "activerecord-session_store"

gem "omniauth_openid_connect", "0.3.1"
gem "openid_connect", "~> 1.3"
gem "faraday", "2.8.1"
gem "omniauth_openid_connect", "~> 0.8.0"

gem "ruby-progressbar"
gem "rubyzip", require: "zip"
gem "sentry-raven"

gem "dotenv-rails"
gem "health_check"
gem "rails", "5.2.4.4"
gem "rack-attack", "~> 6.0"
gem "rails", "5.2.6"
gem "sidekiq_alive"

group :development, :test do
Expand Down
Loading