Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EID and SVM login #475

Open
wants to merge 209 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
209 commits
Select commit Hold shift + click to select a range
d18be0b
Implement stub for EID authentication strategy
alhafoudh Apr 7, 2022
084202f
Add TODO notes
mirrec Apr 7, 2022
c94a6ab
Extract eid provider options to ENV and implement JWT token verification
alhafoudh Apr 7, 2022
6644f23
Merge
mirrec Apr 7, 2022
0f9158f
Fix hash key reference
alhafoudh Apr 7, 2022
1480b32
Merge branch 'eid-login' of github.com:slovensko-digital/navody.digit…
mirrec Apr 7, 2022
9123a02
Add eid_sub field to User model
mirrec Apr 7, 2022
ade5eec
Add endpoint for finishing eid onboarding
mirrec Apr 7, 2022
b4e0a58
add eid login button variants
MarekVigas Apr 7, 2022
841fb59
change login view
MarekVigas Apr 7, 2022
8c2404b
Add url to sample
mirrec Apr 7, 2022
b4361d3
Merge branch 'eid-login' of github.com:slovensko-digital/navody.digit…
mirrec Apr 7, 2022
28da00c
update wording
MarekVigas Apr 7, 2022
31d866c
keep sample env empty
MarekVigas Apr 7, 2022
9cdffdb
Move eid onboarding to namespace
alhafoudh Apr 8, 2022
e6ba6ca
prepare controller for business register
martyciz Jun 24, 2022
b6ff12d
Finish eid login with magic link verification
alhafoudh Jun 24, 2022
b7d4732
service for retrieving business acts
martyciz Jun 24, 2022
d4f6948
Implement EID logout
alhafoudh Jun 24, 2022
0a0148d
controller API points for getting business acts
martyciz Jun 24, 2022
9019ecb
Handle sk.sk callback redirect
alhafoudh Jun 24, 2022
d7bfb1a
Merge branch 'master' into eid-login
alhafoudh Jun 24, 2022
b758ab7
Fix double render
alhafoudh Jun 24, 2022
1ad56ae
Refactor condition to method
alhafoudh Jun 24, 2022
f1a63dc
Refactor condition to method
alhafoudh Jun 24, 2022
19226e7
Add SkTalk, ApplicationForDocumentCopy builders
luciajanikova Jun 24, 2022
0ef2648
Merge branch 'feature/orsr-submission' of https://github.com/slovensk…
luciajanikova Jun 24, 2022
fbec553
Remove skipping JWT verification in development env
alhafoudh Jun 24, 2022
0b358f4
Refactor EID token parsing to EidToken model
alhafoudh Jun 24, 2022
20d7fbe
form builder and generating XML, prepared send XML form
martyciz Jun 24, 2022
57009f1
Pass EID token using forms up to the point user is authenticated and …
alhafoudh Jun 25, 2022
377459b
Keep EID token in session but remove it when it does not match with E…
alhafoudh Jun 25, 2022
f38122d
form for submit and form for generating XML - WIP
martyciz Jun 25, 2022
d0c0a98
Extract logout URL generation to EidToken model
alhafoudh Jun 25, 2022
660bf68
Prepare Upvs Submissions API, views
luciajanikova Jun 25, 2022
f323b32
Merge branch 'feature/orsr-submission' of https://github.com/slovensk…
luciajanikova Jun 25, 2022
68e8954
Extract EID token related controller methods to EidAuth concern
alhafoudh Jun 25, 2022
7f57d92
generate XML with form
martyciz Jun 25, 2022
d494f50
Update form path
luciajanikova Jun 25, 2022
848e4f2
Merge branch 'feature/orsr-submission' of https://github.com/slovensk…
luciajanikova Jun 25, 2022
1fd0d8e
Fix putting EID token into session
alhafoudh Jun 25, 2022
7e67c48
Indicate presence of EID token in session
alhafoudh Jun 25, 2022
94ec91d
Fix null reference
alhafoudh Jun 25, 2022
d9215a4
Fix putting EID token to session
alhafoudh Jun 25, 2022
1a5f97e
fetch company and acts using JS
martyciz Jun 25, 2022
10a5bd3
Update navody-digital-frontend npm package
alhafoudh Jun 25, 2022
1cac8b3
Merge branch 'update-govuk' into eid-login
alhafoudh Jun 25, 2022
3b623a8
Add form visualisation
luciajanikova Jun 25, 2022
d2467b9
Merge branch 'feature/orsr-submission' of https://github.com/slovensk…
luciajanikova Jun 25, 2022
9873090
Tweak new EID identity view style
alhafoudh Jun 25, 2022
4c7f59e
Update navody-digital-frontend npm package (pt. 2)
alhafoudh Jun 25, 2022
4d604d4
Update node version to 16.15.1 again
alhafoudh Jun 25, 2022
dc8eaf7
Merge branch 'eid-login' of https://github.com/slovensko-digital/navo…
luciajanikova Jun 25, 2022
ba34520
Merge branch 'eid-login' of https://github.com/slovensko-digital/navo…
luciajanikova Jun 25, 2022
449af3f
Updates
luciajanikova Jun 25, 2022
4991f2a
refactor code to use form object
martyciz Jun 25, 2022
a845474
Html, css, js files for mobile formular
danielstaleiny Jun 25, 2022
bc7851c
Merge branch 'feature/orsr-submission' of https://github.com/slovensk…
luciajanikova Jun 25, 2022
cf1182d
Merge pull request #489 from danielstaleiny/feature/orsr-submission
cizmarty Jun 25, 2022
928554b
merge HTML,CSS, working form
martyciz Jun 25, 2022
6f8bc6e
working XML query
martyciz Jun 25, 2022
d00a6c8
fix companies select
martyciz Jun 25, 2022
02d4663
send XML within hidden form
martyciz Jun 25, 2022
79edf6e
Create Upvs::FormTemplateRelatedDocuments, Update Upvs::EgovApplicati…
luciajanikova Jul 15, 2022
f99658e
Add sk-api login&logout, form visualisation. submission to sk-api, fi…
luciajanikova Jul 22, 2022
1db705d
Frontend fixes
luciajanikova Jul 25, 2022
6889c68
Merge branch 'master' into eid-login
alhafoudh Jul 25, 2022
30901d6
Tweak actor retrieval from OBO token
alhafoudh Jul 25, 2022
71389e5
Fix node version for navody-frontend package
alhafoudh Jul 25, 2022
01ea659
Add support for error cases (OBO token expires before submit/submit f…
luciajanikova Jul 27, 2022
686881f
Small frontend fixes
luciajanikova Jul 27, 2022
1f63884
Merge branch 'master' of https://github.com/slovensko-digital/navody.…
luciajanikova Jul 27, 2022
835201e
Revert node version upgrade
luciajanikova Jul 27, 2022
2f6a817
Merge branch 'eid-login' of https://github.com/slovensko-digital/navo…
luciajanikova Jul 27, 2022
5234fc9
Merge branch 'eid-login' of https://github.com/slovensko-digital/navo…
luciajanikova Jul 27, 2022
6eef1c0
Merge branch 'master' of https://gitlab.bonet.sk/slovensko.digital/na…
luciajanikova Jul 27, 2022
c5653d8
Update package.json
luciajanikova Jul 27, 2022
ab8115c
Update yarn.lock, Dockerfile
luciajanikova Jul 27, 2022
0cd486a
Try to update caniuse-lite
luciajanikova Jul 28, 2022
7f00cae
Try to fix babel config
luciajanikova Jul 28, 2022
4e57e8e
Try to fix babel config II
luciajanikova Jul 28, 2022
e619675
Revert naovdy-frontend import changes
luciajanikova Jul 28, 2022
ca3b637
Update ApplicationForDocumentCopy default_recipient_uri for staging
luciajanikova Jul 28, 2022
2521795
Add data utils routes
luciajanikova Jul 28, 2022
cdb0da5
Fixes for successful UPVS submission
luciajanikova Jul 29, 2022
d77e60a
Fix sender_uri
luciajanikova Aug 3, 2022
ec3129e
Add AddUpvsFormToWhiteListJob
luciajanikova Aug 3, 2022
9eec2da
Small text fixes + add or_sr listiny callback
luciajanikova Aug 3, 2022
6d71486
Divide filling form into 3 steps
luciajanikova Aug 9, 2022
c615c3e
Update routes, view templates
luciajanikova Aug 10, 2022
ace5ca6
Draft spinner
luciajanikova Aug 11, 2022
50c416b
Spinner finalization
luciajanikova Aug 18, 2022
a3a4790
Small frontend fixes
luciajanikova Aug 18, 2022
565f19f
Refactor FE
luciajanikova Sep 5, 2022
cc14282
Merge branch 'master' into eid-login
alhafoudh Sep 16, 2022
22f1fd9
Small updates
luciajanikova Oct 18, 2022
bc50f8e
Add two-thirds layout
luciajanikova Oct 18, 2022
6604926
Finalize app
luciajanikova Oct 20, 2022
f676284
Unify css with ORSR identifiers app
luciajanikova Oct 20, 2022
9147758
Unify line endlings
luciajanikova Oct 20, 2022
08b9fce
Fix back button
luciajanikova Oct 20, 2022
ed4f16f
Fix iframe height
luciajanikova Oct 20, 2022
3549d40
Merge branch 'master' of https://github.com/slovensko-digital/navody.…
luciajanikova Oct 20, 2022
240af08
Small fixes
luciajanikova Oct 20, 2022
72ad5b9
Fix structure.sql
luciajanikova Oct 20, 2022
76ceadd
Handle case when actor key value can be null
alhafoudh Oct 20, 2022
db5c8bb
Handle case when actor key value can be null
alhafoudh Oct 20, 2022
ed48def
Merge branch 'master' into eid-login
alhafoudh Oct 21, 2022
8c4c322
Try to fix iframe, acts view
luciajanikova Oct 21, 2022
35e56b4
Handle enter press
luciajanikova Oct 21, 2022
d172475
Update copy
luciajanikova Oct 22, 2022
6d0047b
Fix form builder indent
luciajanikova Oct 22, 2022
35a31d5
Update raising errors
luciajanikova Oct 22, 2022
87368eb
Add un/check all acts option
luciajanikova Oct 22, 2022
aa9f6e6
Disable eID login as a login method to app
luciajanikova Oct 22, 2022
432303f
Update copy
luciajanikova Oct 22, 2022
983e2a9
Add eID/SVM login info
luciajanikova Oct 22, 2022
ec812fa
Update links to documents
luciajanikova Oct 22, 2022
7587cd3
Update links to documents
luciajanikova Oct 22, 2022
367e020
Update routes
luciajanikova Oct 22, 2022
9faa6c5
Remova comments from routes
luciajanikova Oct 22, 2022
b23e400
Bump gems and JS dependencies (#528)
celuchmarek Oct 22, 2022
90c6d5c
ND-150 Homepage redizajn s kategóriami (#491)
celuchmarek Oct 22, 2022
8ac31aa
Merge branch 'master' of https://github.com/slovensko-digital/navody.…
luciajanikova Oct 22, 2022
0343c3f
Fix structure.sql
luciajanikova Oct 22, 2022
084a9a2
Fix structure sql II
luciajanikova Oct 22, 2022
f1dd421
Merge pull request #495 from slovensko-digital/feature/orsr-submission
luciajanikova Oct 22, 2022
1a4adab
fix homepage categories to tripplets in rows (#538)
celuchmarek Oct 22, 2022
e449412
350 duplikovanie elementov pri pouziti history goback (#533)
marianJ97 Oct 24, 2022
2b448ae
Svg logo (#535)
mar-vic Oct 24, 2022
d81e058
Setup readme (#529)
johnnypea Oct 24, 2022
19c48e8
Add deadline component, refs #147 (#277)
jsuchal Oct 25, 2022
420b0b6
rm journeys prefix from pages og image metadata tag (#541)
celuchmarek Nov 22, 2022
9f71e5b
Make code list queries case insensitive, Update checking stakeholder …
luciajanikova Dec 22, 2022
4773a21
Refactor
luciajanikova Dec 22, 2022
9e6f1ed
Merge pull request #554 from slovensko-digital/ND-159/small_fixes
luciajanikova Dec 22, 2022
1cabd96
add docker registry to gitlab config (#557)
celuchmarek Jan 12, 2023
fbc5431
Do not pre-define message of the deadline component (#543)
crutch Jan 18, 2023
b77a0a3
Bump rack from 2.2.4 to 2.2.6.2 (#558)
dependabot[bot] Jan 19, 2023
d09c07c
Bump globalid from 1.0.0 to 1.0.1 (#559)
dependabot[bot] Mar 23, 2023
5f82f3c
Bump ruby & gems (#567)
jsuchal Mar 24, 2023
2e7d789
set resource requests (#561)
celuchmarek Mar 24, 2023
1e43508
Migrate que table to new version (#572)
jsuchal Mar 25, 2023
dc1ecbb
Add no acts option
luciajanikova Mar 25, 2023
d5f75e6
Bump navody-digital-frontend npm package (#568)
alhafoudh Mar 25, 2023
4ee5198
Bonus actions (#569)
jsuchal Mar 25, 2023
ef50464
Do not show timeline for journeys without steps (#570)
crutch Mar 25, 2023
bda90e8
Faq order on index (#571)
crutch Mar 25, 2023
77b136c
Fix header dowpdown style for new govuk design (#573)
alhafoudh Mar 25, 2023
adef390
Bump js packages (#574)
jsuchal Mar 25, 2023
506cf57
User profile deletion (#492)
mar-vic Mar 25, 2023
a5eaac9
Add edit link to featured content in admin (#576)
mirrec Mar 25, 2023
0866d04
Add support to access Journey by URL #563 (#575)
mirrec Mar 25, 2023
98f8995
Save Upvs::Submissions to DB, Fix SVM login
luciajanikova Mar 25, 2023
05ac308
Merge branch 'master' of https://github.com/slovensko-digital/navody.…
luciajanikova Mar 25, 2023
b829758
Enhance submissions cleanup process (#577)
crutch Mar 25, 2023
696ccb1
Merge branch 'master' of https://github.com/slovensko-digital/navody.…
luciajanikova Mar 25, 2023
f6e772d
Fix logout
luciajanikova Mar 25, 2023
23d2c46
Fix structure.sql
luciajanikova Mar 25, 2023
4fbd6fa
Update text
luciajanikova Mar 25, 2023
b7ff425
Be able to know which Journey is outdated (#534)
mirrec Mar 25, 2023
9657399
Remove binding.pry & token from Upvs::Submission
luciajanikova Mar 25, 2023
a32962c
Law links enhancements (#579)
crutch Mar 25, 2023
17969ba
Update migration
luciajanikova Mar 27, 2023
f4bfb77
Merge branch 'master' of https://github.com/slovensko-digital/navody.…
luciajanikova Mar 27, 2023
9f22d13
Rename upvs_submissions finish route
luciajanikova Mar 27, 2023
30c149e
Set expires_at
luciajanikova Mar 27, 2023
36e9b80
add invisible captcha to login (#580)
celuchmarek Mar 30, 2023
10bbc81
Add expired scope & Add upvs submissions to cleanup task
luciajanikova Apr 3, 2023
bf0c503
Merge branch 'master' into feature/save_upvs_submissions_to_db
luciajanikova Apr 3, 2023
9dd7636
Fix setting expires_at
luciajanikova Apr 3, 2023
26064f6
Bump nokogiri from 1.14.2 to 1.14.3 (#581)
dependabot[bot] Apr 13, 2023
8541540
Merge branch 'master' into feature/save_upvs_submissions_to_db
luciajanikova Apr 13, 2023
db037cb
Merge pull request #578 from slovensko-digital/feature/save_upvs_subm…
luciajanikova Apr 13, 2023
5c3c728
Merge branch 'master' into fix/empty-or-sr-acts
luciajanikova Apr 13, 2023
cf67d7f
Update index text
luciajanikova Apr 17, 2023
37e9059
Merge branch 'fix/empty-or-sr-acts' of https://github.com/slovensko-d…
luciajanikova Apr 17, 2023
fd72b53
Merge pull request #582 from slovensko-digital/fix/empty-or-sr-acts
luciajanikova Apr 17, 2023
d0d1f0a
Que monitoring implemented (#586)
Jun 27, 2023
89f808e
add require 'que/active_record/model' (#589)
celuchmarek Jun 27, 2023
fdfac94
Updated the voting app with the new election date (30th September 202…
jsuchal Jul 11, 2023
35a090b
make /usr/bin/mkdir available for installing gems into the vscode ima…
tom-m Jul 12, 2023
1b91fc6
Fix voting subscription (#595)
jsuchal Aug 9, 2023
c10b399
update autodeploy version (#596)
celuchmarek Aug 15, 2023
9855edb
Vote app enable preukaz (#594)
celuchmarek Aug 23, 2023
7164672
Fix parliament vote app email template format on some iPhones (#599)
celuchmarek Sep 11, 2023
2f88a99
revert ruby to 3.2.1 because of unsuccessful build (#601)
celuchmarek Sep 11, 2023
3a15587
ND-231 Add UPVS submission tests (#600)
celuchmarek Sep 18, 2023
569b39e
Bump puma from 6.1.1 to 6.3.1 (#597)
dependabot[bot] Oct 6, 2023
7c28a0d
Bump semver from 5.7.1 to 5.7.2 (#591)
dependabot[bot] Oct 6, 2023
f08f326
Use env variables for parliament vote app dates (#603)
celuchmarek Oct 6, 2023
77bc8be
Add missing seeds & Update existing
luciajanikova Oct 6, 2023
906fb5e
Merge branch 'master' of https://github.com/slovensko-digital/navody.…
luciajanikova Oct 6, 2023
07339a9
Merge pull request #604 from slovensko-digital/update_seeds
luciajanikova Oct 6, 2023
6b97960
Finetune text for notification confirmation, closes #549 (#606)
jsuchal Oct 7, 2023
6fa5b72
Replace text xslt with html xslt
luciajanikova Oct 7, 2023
90a3319
Merge branch 'master' of https://github.com/slovensko-digital/navody.…
luciajanikova Oct 7, 2023
7a70d51
Merge pull request #607 from slovensko-digital/update_seeds
luciajanikova Oct 7, 2023
d4f757e
Add tests for category detail (#605)
mirrec Oct 7, 2023
1383a27
Add onboarding modal, refs #331 (#616)
jsuchal Oct 7, 2023
c2db554
set request body size to 50m on ingress (#629)
celuchmarek Jan 8, 2024
4d9e19e
ECO-240/improved-healthcheck (#632)
tomasdrga Jan 29, 2024
45eb0cc
Prezidentské voľby 2024 (#635)
celuchmarek Feb 8, 2024
66ea1c9
update og image for president vote app (#636)
celuchmarek Feb 8, 2024
2cf1d92
disable active topic in vote app (#637)
celuchmarek Feb 9, 2024
621afc0
update init page text (#638)
celuchmarek Mar 7, 2024
e04fd05
fix first round deadline and update homepage text (#639)
celuchmarek Mar 22, 2024
fa820b8
Merge branch 'eid-login' into feature/eid-login
cizmarty Apr 26, 2024
6fb5e03
Add login button, expect callback URL from UPVS to be always /login f…
cizmarty Apr 26, 2024
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
3 changes: 2 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ RUN apt install -y chromium-driver
RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import -
RUN curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -
RUN curl -sSL https://get.rvm.io | bash -s
RUN /bin/bash -l -c ". /etc/profile.d/rvm.sh && rvm install 2.7.5"
RUN /bin/bash -l -c ". /etc/profile.d/rvm.sh && rvm install 3.2.1"

# Install Rails
RUN ln -s /bin/mkdir /usr/bin/mkdir
RUN /bin/bash -l -c ". /etc/profile.d/rvm.sh && gem install rails webdrivers"
RUN chown -R vscode /usr/local/rvm

Expand Down
14 changes: 14 additions & 0 deletions .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ ADMIN_USERNAME=admin
ADMIN_PASSWORD=admin
GOOGLE_CLIENT_ID=
GOOGLE_CLIENT_SECRET=
AUTH_EID_BASE_URL=
AUTH_EID_PUBLIC_KEY=
AUTH_EID_PRIVATE_KEY=

APP_PARLIAMENT_VOTE_DATE=
APP_PARLIAMENT_DELIVERY_BY_POST_DEADLINE_DATE=
APP_PARLIAMENT_PICKUP_DEADLINE_DATE=
APP_PARLIAMENT_VOTE_BY_POST_DEADLINE_DATE=
APP_PARLIAMENT_REQUEST_SENDING_DEADLINE_DATE=

DEFAULT_EMAIL_FROM=navody@digital

Expand All @@ -14,6 +23,8 @@ AUTOFORM_ACCESS_TOKEN=
DATAHUB_URL=
DATAHUB_ACCESS_TOKEN=

DATAHUB_DATABASE_URL=

AWS_KEY_ID=
AWS_ACCESS_KEY=
AWS_REGION=
Expand All @@ -25,6 +36,9 @@ DISABLED_FEATURES=
RECAPTCHA_SITE_KEY=
RECAPTCHA_SECRET_KEY=

SLOVENSKO_SK_API_URL=
SLOVENSKO_SK_API_EFORM_SUB=

SITEMAP_BUCKET=
SITEMAP_ACCESS_KEY_ID=
SITEMAP_SECRET_ACCESS_KEY=
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/slovensko_digital_ci.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
name: Slovensko.Digital CI

on:
push:
on:
push:
branches: master
pull_request:
branches: '**'

jobs:
test:
runs-on: ubuntu-latest

env:
PGHOST: localhost
RAILS_ENV: test
SLOVENSKO_SK_API_URL: https://test.slovensko.digital

services:
postgres:
Expand All @@ -31,6 +32,9 @@ jobs:
bundler-cache: true

- run: yarn install
- run: bundle exec rails webpacker:compile
env:
NODE_OPTIONS: "--openssl-legacy-provider"
- run: bundle exec rails db:create db:structure:load --trace

- uses: paambaati/codeclimate-action@v2.7.5
Expand Down
63 changes: 63 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
image: alpine:latest

variables:
DOCKER_DRIVER: overlay2
DOCKER_BUILDKIT: 0
AUTO_DEVOPS_BUILD_CACHE: registry
AUTO_DEPLOY_IMAGE_VERSION: 'v2.47.0'

stages:
- build
- deploy

include:
- template: Jobs/Build.gitlab-ci.yml

staging:
extends: .auto-deploy
stage: deploy
script:
- auto-deploy check_kube_domain
- auto-deploy download_chart
- auto-deploy use_kube_context || true
- auto-deploy ensure_namespace
- auto-deploy create_secret
- auto-deploy deploy
environment:
name: staging
url: http://$CI_PROJECT_PATH_SLUG.$KUBE_INGRESS_BASE_DOMAIN
rules:
- if: '($CI_KUBERNETES_ACTIVE == null || $CI_KUBERNETES_ACTIVE == "") && ($KUBECONFIG == null || $KUBECONFIG == "")'
when: never
- when: on_success

production:
extends: .auto-deploy
stage: deploy
script:
- auto-deploy check_kube_domain
- auto-deploy download_chart
- auto-deploy use_kube_context || true
- auto-deploy ensure_namespace
- auto-deploy create_secret
- auto-deploy deploy
- auto-deploy persist_environment_url
environment:
name: production
url: http://$CI_PROJECT_PATH_SLUG.$KUBE_INGRESS_BASE_DOMAIN
artifacts:
paths: [environment_url.txt]
when: always
allow_failure: false
rules:
- if: '($CI_KUBERNETES_ACTIVE == null || $CI_KUBERNETES_ACTIVE == "") && ($KUBECONFIG == null || $KUBECONFIG == "")'
when: never
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
when: manual

# The latest build job generates a dotenv report artifact with a CI_APPLICATION_TAG
# that also includes the image digest. This configures Auto Deploy to receive
# this artifact and use the updated CI_APPLICATION_TAG for deployments.
.auto-deploy:
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:${AUTO_DEPLOY_IMAGE_VERSION}"
dependencies: [build]
26 changes: 24 additions & 2 deletions .gitlab/auto-deploy-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,23 @@ ingress:
nginx.ingress.kubernetes.io/server-snippet: |
location /sitemaps/sitemap.xml.gz {
return 302 https://navodydigital.s3.eu-central-1.amazonaws.com/sitemaps/sitemap.xml.gz;
}
}
nginx.ingress.kubernetes.io/proxy-body-size: 50m
service:
externalPort: 3000
internalPort: 3000
image:
secrets:
- name: skdigital-bonet-registry
livenessProbe.initialDelaySeconds: 20
readinessProbe.initialDelaySeconds: 20
readinessProbe.initialDelaySeconds: 20
application.migrateCommand: ["bundle", "exec", "rails", "db:migrate"]
resources:
requests:
cpu: 20m
memory: 450Mi
limits:
memory: 1Gi
workers:
clock:
replicaCount: "1"
Expand All @@ -27,6 +37,12 @@ workers:
command:
- "pgrep"
- "bundle"
resources:
requests:
cpu: 10m
memory: 250Mi
limits:
memory: 300Mi
worker:
replicaCount: "1"
command: ["bundle", "exec", "que", "-w1", "./config/environment.rb"]
Expand All @@ -43,3 +59,9 @@ workers:
command:
- "pgrep"
- "bundle"
resources:
requests:
cpu: 200m
memory: 250Mi
limits:
memory: 500Mi
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
16.15.1
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.5
3.2.1
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby 3.2.1
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ruby:2.7.5
FROM ruby:3.2.1

# Install packages
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
RUN curl -sL https://deb.nodesource.com/setup_16.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
RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
Expand Down
20 changes: 14 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.7.5'
ruby '3.2.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.1.4.1'
gem 'rails', '~> 6.1.7.3'
gem 'rails-i18n'
# Use postgresql as the database for Active Record
gem 'pg'
Expand Down Expand Up @@ -34,11 +34,14 @@ gem 'jbuilder'
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# Gems for tracking the statuses of jobs
gem 'que'
gem 'que-web'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', require: false

gem 'jwt'
gem 'omniauth'
gem 'omniauth-google-oauth2'
gem 'omniauth-rails_csrf_protection'
Expand All @@ -47,6 +50,7 @@ gem 'pry-rails'

gem 'aws-sdk-rails'
gem "aws-sdk-s3", require: false
gem 'aws-sdk-cloudwatch'

gem 'rollbar'
gem 'oj' # needed by rollbar
Expand All @@ -69,12 +73,14 @@ gem 'sib-api-v3-sdk'
gem 'recaptcha'
gem 'friendly_id'

gem 'invisible_captcha'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
gem 'dotenv-rails'
gem 'factory_bot_rails'
gem 'rspec-rails', '4.0.0.beta4'
gem 'rspec-rails', '4.0.2'
gem 'rspec_junit_formatter'
gem 'faker'
end
Expand All @@ -92,13 +98,15 @@ end

group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara'
gem 'capybara', "~> 3.39.2"
gem 'show_me_the_cookies'
gem 'selenium-webdriver'
gem 'webdrivers'
gem 'selenium-webdriver', "~> 4.9.0"
gem "webdrivers", "= 5.3.0"
gem 'simplecov', '< 0.18' # https://github.com/codeclimate/test-reporter/issues/413
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'hirb'

gem "rails-controller-testing", "~> 1.0"
Loading
Loading