Merge pull request #122 from aidewoode/dev

Fix error of can not found SECRET_KEY_BASE on worker

Dockerfile

@@ -34,6 +34,8 @@ RUN bundle exec rails assets:precompile SECRET_KEY_BASE=fake_secure_for_compile
 
 RUN cp config/nginx/nginx.conf /etc/nginx/nginx.conf
 
+ENTRYPOINT ["docker/entrypoint.sh"]
+
 EXPOSE 3000
 
 CMD ["docker/production_start.sh"]

docker/entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [ -z ${SECRET_KEY_BASE+x} ]; then
+  echo "Generating SECRET_KEY_BASE environment variable."
+  echo "Please attention, all old sessions will become invalid."
+  echo "You can set SECRET_KEY_BASE environment variable on docker service,"
+  echo "to avoid generate SECRET_KEY_BASE every time when service start up."
+  export SECRET_KEY_BASE=$(rails secret)
+fi
+
+exec "$@"

docker/production_start.sh

@@ -1,13 +1,5 @@
 #!/bin/sh
 
-if [ -z ${var+x} ]; then
-  echo "Generating SECRET_KEY_BASE environment variable."
-  echo "Please attention, all old sessions will become invalid."
-  echo "You can set SECRET_KEY_BASE environment variable on docker service,"
-  echo "to avoid generate SECRET_KEY_BASE every time when service start up."
-  export SECRET_KEY_BASE=$(rails secret)
-fi
-
 # Prepare Database
 rails db:prepare