Move export of ENV_VARS

- Docker entry point is top level so this is where the environment
  variables must be extracted
- Otherwise shelling into the container and also db:seed does not
  execute properly

Author: TheOneFromNorway

bin/docker-entrypoint

@@ -6,6 +6,18 @@ if [ -z "${LD_PRELOAD+x}" ]; then
   export LD_PRELOAD
 fi
 
+
+# Extract ENV_VARS into set of variables and export them to the shell
+if [ -n "$ENV_VARS" ]; then
+  IFS=',' read -ra ADDR <<< "$ENV_VARS"
+  for i in "${ADDR[@]}"; do
+    if [[ "$i" == *"="* ]]; then
+      export "${i?}"
+      echo "Exported: $i"
+    fi
+  done
+fi
+
 # When starting the container then create or migrate existing database
 if [ "$1" == "./bin/docker-start" ]; then
   ./bin/rails db:prepare:ignore_concurrent_migration_exceptions

bin/docker-start

@@ -2,17 +2,6 @@
 
 BIN_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-# Extract ENV_VARS into set of variables and export them to the shell
-if [ -n "$ENV_VARS" ]; then
-  IFS=',' read -ra ADDR <<< "$ENV_VARS"
-  for i in "${ADDR[@]}"; do
-    if [[ "$i" == *"="* ]]; then
-      export "${i?}"
-      echo "Exported: $i"
-    fi
-  done
-fi
-
 if [ "$SERVER_TYPE" == "web" ]; then
   echo "Starting web server..."
   exec "$BIN_DIR"/thrust "$BIN_DIR"/rails server

script/shell.sh

@@ -161,5 +161,5 @@ aws ecs execute-command --region "$region" \
     --cluster "$cluster_name" \
     --task "$task_id" \
     --container "$container_name" \
-    --command "/bin/bash" \
+    --command "/rails/bin/docker-entrypoint /bin/bash" \
     --interactive