From 2f4ea5e42f9e1a3b559393416bc293ed2bdba825 Mon Sep 17 00:00:00 2001
From: Jacob Cody Wimer <jacob.wimer@gmail.com>
Date: Tue, 26 Nov 2019 15:03:01 -0500
Subject: [PATCH] Added some extra automation for dev container and fixed
 deploy test. Deploy test needs devise and rails secrets since it runs in prod

---
 bin/rails-dev-run.sh           | 7 ++++++-
 deploy/deploy-test.sh          | 6 +++++-
 deploy/docker-compose-test.yml | 4 ++++
 deploy/rails-dev-Dockerfile    | 1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/bin/rails-dev-run.sh b/bin/rails-dev-run.sh
index df0ade9..5732622 100755
--- a/bin/rails-dev-run.sh
+++ b/bin/rails-dev-run.sh
@@ -1,10 +1,15 @@
 #!/bin/bash -e
 project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
 
+USER_ID=$(id -u ${USER})
+# Get group id for username
+GROUP_ID=$(cut -d: -f3 < <(getent group ${USER}))
+
 if [ $# != 1 ]; then
   echo "Please enter docker image name for the rails development environment"
   exit 1
 fi
 
 docker build -t $1 -f ${project_dir}/deploy/rails-dev-Dockerfile ${project_dir}
-docker run -it -p 3000:3000 -v ${project_dir}:/rails $1 /bin/bash
\ No newline at end of file
+docker run -it -p 3000:3000 -v ${project_dir}:/rails $1 /bin/bash
+sudo chown -R ${USER}:${USER} ${project_dir}
\ No newline at end of file
diff --git a/deploy/deploy-test.sh b/deploy/deploy-test.sh
index adab91b..74d3cfa 100755
--- a/deploy/deploy-test.sh
+++ b/deploy/deploy-test.sh
@@ -5,4 +5,8 @@ project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
 docker-compose -f ${project_dir}/deploy/docker-compose-test.yml kill
 docker-compose -f ${project_dir}/deploy/docker-compose-test.yml build
 docker-compose -f ${project_dir}/deploy/docker-compose-test.yml up -d
-echo Make sure your local mysql database has a wrestlingtourney db
+# echo Make sure your local mysql database has a wrestlingtourney db
+docker exec -it deploy_app_1 rake db:create
+docker exec -it deploy_app_1 rake db:migrate
+echo To seed data run:
+echo docker exec -it deploy_app_1 rake db:seed
\ No newline at end of file
diff --git a/deploy/docker-compose-test.yml b/deploy/docker-compose-test.yml
index ed3b74b..7aacb14 100644
--- a/deploy/docker-compose-test.yml
+++ b/deploy/docker-compose-test.yml
@@ -21,6 +21,8 @@ services:
       - WRESTLINGDEV_DB_PORT=3306
       - MEMCACHIER_SERVERS=memcached:11211
       - MEMCACHIER_PASSWORD=
+      - WRESTLINGDEV_DEVISE_SECRET_KEY=2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa
+      - WRESTLINGDEV_SECRET_KEY_BASE=077cdbef5c2ccf22543fb17a67339f234306b7fa2e1e4463d851c444c10a5611829a2290b253da78339427f131571fac9a42c83d960b2d25ecc10a4a0a7ce1a2
     networks:
       database:
       caching:
@@ -54,6 +56,8 @@ services:
       - WRESTLINGDEV_DB_PORT=3306
       - MEMCACHIER_SERVERS=memcached:11211
       - MEMCACHIER_PASSWORD=
+      - WRESTLINGDEV_DEVISE_SECRET_KEY=2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa
+      - WRESTLINGDEV_SECRET_KEY_BASE=077cdbef5c2ccf22543fb17a67339f234306b7fa2e1e4463d851c444c10a5611829a2290b253da78339427f131571fac9a42c83d960b2d25ecc10a4a0a7ce1a2
     networks:
       database:
       caching:
diff --git a/deploy/rails-dev-Dockerfile b/deploy/rails-dev-Dockerfile
index 7da080a..8e31ecf 100644
--- a/deploy/rails-dev-Dockerfile
+++ b/deploy/rails-dev-Dockerfile
@@ -5,6 +5,7 @@ RUN apt-get -qq update \
     build-essential \
     sqlite3 \
     nodejs \
+    sudo \
   && apt-get -qq clean \
   && rm -rf \
     /var/lib/apt/lists/* \