Update scripts for hybrid setup

spree · Jan 16, 2023 · 31c56e4 · 31c56e4
1 parent c2e5bcd
commit 31c56e4
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -67,19 +67,19 @@ docker-compose up
 #### Run setup script
 
 ```bash
-bin/start-hybrid
+bin/setup-hybrid
 ```
 
 After loading all docker dependencies launch local server with:
 
 ```bash
-bin/rails s
+bin/start-hybrid
 ```
 
 #### (Optional) Import sample data such as products, categories, etc
 
 ```bash
-docker-compose run web rake spree_sample:load
+bundle exec rake spree_sample:load
 ```
 
 ### Without Docker (not recommended for beginners)

diff --git a/bin/setup-hybrid b/bin/setup-hybrid
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -o errexit
+
+export DB_HOST=127.0.0.1
+export DB_PORT=5432
+
+rm -rf .env
+cp -f .env.sample .env
+bin/start-dependency-containers
+(bundle check || bundle install)
+bundle exec rails db:drop
+bundle exec rails db:create
+bundle exec rails db:migrate
+bundle exec rails db:seed
+rm -rf tmp/latest.dump
diff --git a/bin/start-dependency-containers b/bin/start-dependency-containers
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -o errexit
+
+docker-compose up -d redis postgres
+bin/wait-for-services
diff --git a/bin/start-hybrid b/bin/start-hybrid
@@ -1,2 +1,9 @@
-bin/setup &&
-docker-compose up redis postgres
+#!/bin/bash
+set -o errexit
+
+export DB_HOST=127.0.0.1
+export DB_PORT=5432
+
+bin/start-dependency-containers
+
+bundle exec rails server