Skip to content

Commit

Permalink
Merge pull request #1823 from projectcypress/master
Browse files Browse the repository at this point in the history 
merge 6_27
  • Loading branch information
@dczulada
dczulada authored Jun 27, 2023
2 parents 5f7d7c3 + 7114d00 commit 31e35f1
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 74 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ADD Gemfile.lock /home/app/cypress/Gemfile.lock

RUN chown -R app:app .

RUN su app -c 'bundle install --without development test'
RUN su app -c 'bundle install'

ADD . /home/app/cypress

Expand Down
139 changes: 70 additions & 69 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,67 +33,67 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.4.3)
actionpack (= 7.0.4.3)
activesupport (= 7.0.4.3)
actioncable (7.0.5.1)
actionpack (= 7.0.5.1)
activesupport (= 7.0.5.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.4.3)
actionpack (= 7.0.4.3)
activejob (= 7.0.4.3)
activerecord (= 7.0.4.3)
activestorage (= 7.0.4.3)
activesupport (= 7.0.4.3)
actionmailbox (7.0.5.1)
actionpack (= 7.0.5.1)
activejob (= 7.0.5.1)
activerecord (= 7.0.5.1)
activestorage (= 7.0.5.1)
activesupport (= 7.0.5.1)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.4.3)
actionpack (= 7.0.4.3)
actionview (= 7.0.4.3)
activejob (= 7.0.4.3)
activesupport (= 7.0.4.3)
actionmailer (7.0.5.1)
actionpack (= 7.0.5.1)
actionview (= 7.0.5.1)
activejob (= 7.0.5.1)
activesupport (= 7.0.5.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.4.3)
actionview (= 7.0.4.3)
activesupport (= 7.0.4.3)
rack (~> 2.0, >= 2.2.0)
actionpack (7.0.5.1)
actionview (= 7.0.5.1)
activesupport (= 7.0.5.1)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.4.3)
actionpack (= 7.0.4.3)
activerecord (= 7.0.4.3)
activestorage (= 7.0.4.3)
activesupport (= 7.0.4.3)
actiontext (7.0.5.1)
actionpack (= 7.0.5.1)
activerecord (= 7.0.5.1)
activestorage (= 7.0.5.1)
activesupport (= 7.0.5.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.4.3)
activesupport (= 7.0.4.3)
actionview (7.0.5.1)
activesupport (= 7.0.5.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.4.3)
activesupport (= 7.0.4.3)
activejob (7.0.5.1)
activesupport (= 7.0.5.1)
globalid (>= 0.3.6)
activemodel (7.0.4.3)
activesupport (= 7.0.4.3)
activerecord (7.0.4.3)
activemodel (= 7.0.4.3)
activesupport (= 7.0.4.3)
activestorage (7.0.4.3)
actionpack (= 7.0.4.3)
activejob (= 7.0.4.3)
activerecord (= 7.0.4.3)
activesupport (= 7.0.4.3)
activemodel (7.0.5.1)
activesupport (= 7.0.5.1)
activerecord (7.0.5.1)
activemodel (= 7.0.5.1)
activesupport (= 7.0.5.1)
activestorage (7.0.5.1)
actionpack (= 7.0.5.1)
activejob (= 7.0.5.1)
activerecord (= 7.0.5.1)
activesupport (= 7.0.5.1)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.4.3)
activesupport (7.0.5.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -280,7 +280,7 @@ GEM
highline (1.7.10)
http-cookie (1.0.5)
domain_name (~> 0.5)
i18n (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
image_processing (1.12.2)
Expand Down Expand Up @@ -316,9 +316,9 @@ GEM
rb-inotify (~> 0.9, >= 0.9.10)
local_time (2.0.1)
log4r (1.1.10)
loofah (2.19.1)
loofah (2.21.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
nokogiri (>= 1.12.0)
macaddr (1.7.2)
systemu (~> 2.6.5)
mail (2.8.1)
Expand All @@ -335,8 +335,8 @@ GEM
mime-types-data (3.2022.0105)
mini_magick (4.12.0)
mini_mime (1.1.2)
mini_portile2 (2.8.1)
minitest (5.18.0)
mini_portile2 (2.8.2)
minitest (5.18.1)
minitest-rails (7.0.0)
minitest (~> 5.10)
railties (~> 7.0.0)
Expand Down Expand Up @@ -366,7 +366,7 @@ GEM
multi_test (1.1.0)
mustache (1.1.1)
nested_form (0.3.2)
net-imap (0.3.4)
net-imap (0.3.6)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -377,8 +377,8 @@ GEM
net-protocol
netrc (0.11.0)
newrelic_rpm (8.15.0)
nio4r (2.5.8)
nokogiri (1.14.3)
nio4r (2.5.9)
nokogiri (1.14.5)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
orm_adapter (0.5.0)
Expand All @@ -400,33 +400,34 @@ GEM
pry-nav (1.0.0)
pry (>= 0.9.10, < 0.15)
public_suffix (5.0.1)
racc (1.6.2)
rack (2.2.6.4)
racc (1.7.1)
rack (2.2.7)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.4.3)
actioncable (= 7.0.4.3)
actionmailbox (= 7.0.4.3)
actionmailer (= 7.0.4.3)
actionpack (= 7.0.4.3)
actiontext (= 7.0.4.3)
actionview (= 7.0.4.3)
activejob (= 7.0.4.3)
activemodel (= 7.0.4.3)
activerecord (= 7.0.4.3)
activestorage (= 7.0.4.3)
activesupport (= 7.0.4.3)
rails (7.0.5.1)
actioncable (= 7.0.5.1)
actionmailbox (= 7.0.5.1)
actionmailer (= 7.0.5.1)
actionpack (= 7.0.5.1)
actiontext (= 7.0.5.1)
actionview (= 7.0.5.1)
activejob (= 7.0.5.1)
activemodel (= 7.0.5.1)
activerecord (= 7.0.5.1)
activestorage (= 7.0.5.1)
activesupport (= 7.0.5.1)
bundler (>= 1.15.0)
railties (= 7.0.4.3)
railties (= 7.0.5.1)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
activesupport (>= 5.0.1.rc1)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
rails-perftest (0.0.7)
rails_best_practices (1.23.2)
activesupport
Expand All @@ -436,9 +437,9 @@ GEM
json
require_all (~> 3.0)
ruby-progressbar
railties (7.0.4.3)
actionpack (= 7.0.4.3)
activesupport (= 7.0.4.3)
railties (7.0.5.1)
actionpack (= 7.0.5.1)
activesupport (= 7.0.5.1)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand Down Expand Up @@ -538,10 +539,10 @@ GEM
test_xml (0.1.8)
diffy (~> 3.0)
nokogiri (>= 1.3.2)
thor (1.2.1)
thor (1.2.2)
thread_safe (0.3.6)
tilt (2.0.11)
timeout (0.3.2)
timeout (0.4.0)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (2.0.6)
Expand Down Expand Up @@ -588,7 +589,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.7)
zeitwerk (2.6.8)
zip-zip (0.3)
rubyzip (>= 1.0.0)

Expand Down
5 changes: 3 additions & 2 deletions contrib/cypress.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"aws_secret_key": "",
"default_user": "ubuntu",
"default_pwd": "CypressPwd",
"cypress_version": "cypress_7.0.6",
"cypress_version": "cypress_7.1.0",
"cvu_version": "cypress-validation-utility_3.2.2-production-1510258734",
"chef_version": "13.8.5",
"vpc_id": "",
Expand All @@ -17,12 +17,13 @@
"access_key": "{{user `aws_access_key`}}",
"secret_key": "{{user `aws_secret_key`}}",
"region": "us-east-1",
"source_ami": "ami-0e081ed4ce61c1fb2",
"source_ami": "ami-003d3d03cfe1b0468",
"instance_type": "t2.small",
"vpc_id": "{{user `vpc_id`}}",
"subnet_id": "{{user `subnet_id`}}",
"ami_virtualization_type": "hvm",
"ssh_username": "ubuntu",
"temporary_key_pair_type": "ed25519",
"ami_name": "cypress_{{ user `cypress_version` }}",
"ami_groups": "all",
"ami_block_device_mappings": [ {
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
networks:
- cypress-net
mongodb:
image: mongo:4.4.14
image: mongo:6.0.6
volumes:
- /data/db
- ./mongo:/etc/mongo
Expand Down
2 changes: 1 addition & 1 deletion mongo/docker_mongod.conf
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
setParameter:
maxBSONDepth: 500
maxBSONDepth: 250

0 comments on commit 31e35f1

Please sign in to comment.