Skip to content
This repository has been archived by the owner on Jul 2, 2024. It is now read-only.

modify dockerfile to use phusion passenger image #1

Draft
wants to merge 30 commits into
base: feature/docker-containerisation
Choose a base branch
from

Conversation

dreamfall
Copy link

initial changes

Gubbsy and others added 15 commits August 4, 2023 12:11
* Bump research memory allocation to 1GB

* Bump mem to 2GB on UATT & PROD, restore research to 256MB
* increased disk storage values for UAT and prod from 1 to 3GB
* validation for organisation name set to 255, spec written

* error message added to en & cy yml files, validade_length/too_long method added to organisation model.

* better rspec test written for organisation name validation

* deleted redundant validate_length method in organisation.rb
* conditionals added to update action in mission_controller which sets mission to empty string if no mission chosen for bugfix

* created ensure_mission_params method in organisation.rb, added not to explain method

* mission_controller_spec added both indirectly and directly testing the ensure_mission_params method
* added project title conditional to get main contact apps method

* added in a method to migrate and move application medium over 100k
* increased timeout criteria to 20 hours
…thod to prevent users email being updated (#1139)
Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [puma](https://github.com/puma/puma) from 4.3.12 to 5.6.7.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](puma/puma@v4.3.12...v5.6.7)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* method created in the project model to format the cash contribution secured value

* dash taken away from not sure in format secured for salesforce method, dasherize is needed for other values to work

* added cc build and further expect to spec for x_not_sure fix

* context added to spec to test project with no cc, better formatted method description

* formatting comments and line at eof
* inital regex alteration to enforce domains in email validation

* add tests for legal sig regex and registration

* tests written for email validation, legal sig model and user model

* comments added to explain regex in devise.rb and legalsig model

* deleted end of file extra lines

* misunderstanding, added EOF lines back in!

* eof line to user_spec

* took out debugging comments in user_spec

---------

Co-authored-by: eithel <[email protected]>
* feat/create org spec

* context for empty address fields with error tests added

* add org type tests

* rearranged tests in oragnisation spec, added invalid org type test

* taken contexts out, used factory organisations

* test org mission validation

* refactored spec, configured org factory to allow test suite to run properly, added further organisation tests

* all organisation tests added to file, need to refactor further

* refactored organisation factory and references

* organisation_spec refactored

* association tests added to organisation spec

* comment added about shoulda gem

* added EOF lines

---------

Co-authored-by: eithel <[email protected]>
@dreamfall dreamfall force-pushed the feature/docker-containerisation-phusion-image branch from 8564ea6 to 8fe66a6 Compare September 26, 2023 13:35
dreamfall and others added 5 commits September 26, 2023 18:02
Makes managing ruby with asdf easier.

Setting to 3.1.4 as that is the latest secure 3.1 patch version and what CI is using.
remove cf specific gem, fix build errors for assets compilation
- update redis url for all envs
- use ENV[""] instead of fetch without default values
- skip flipper and salesforce initialization during assets compilation
- Fix the gemfile.lock
Add back in the config for the other envs
We are running processes under the docker folder
@matthewford matthewford force-pushed the feature/docker-containerisation-phusion-image branch from e406792 to 9028a94 Compare September 26, 2023 17:06
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants