run docker logs

meedan · Sep 23, 2024 · 2ee1918 · 2ee1918
1 parent cc3d9b6
commit 2ee1918
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/ci-test-pr.yml b/.github/workflows/ci-test-pr.yml
@@ -89,7 +89,8 @@ jobs:
       run: |
         docker compose -f docker-test.yml exec -e TEST_RETRY_COUNT=$TEST_RETRY_COUNT -e DEPLOY_ENV=ci -T pender bundle exec rails routes
         echo 'ran routes'
-         docker compose -f docker-test.yml exec -e TEST_RETRY_COUNT=$TEST_RETRY_COUNT -e DEPLOY_ENV=ci -T pender bundle exec rake "parallel:test"
+        docker compose --tail 50 pender
+        docker compose -f docker-test.yml exec -e TEST_RETRY_COUNT=$TEST_RETRY_COUNT -e DEPLOY_ENV=ci -T pender bundle exec rake "parallel:test"
         echo 'ran parallel:test not 3'
         #        docker compose -f docker-test.yml exec -e TEST_RETRY_COUNT=$TEST_RETRY_COUNT -e DEPLOY_ENV=ci -T pender bundle exec rake parallel:spec
         # echo 'ran parallel:spec'

diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
@@ -27,7 +27,7 @@ if [ "${APP}" = 'pender' ] ; then
   port ${SERVER_PORT}
 EOF
 
-  if [ "${DEPLOY_ENV}" = 'local' ||  "${DEPLOY_ENV}" = 'test' ] ; then
+  if [ "${DEPLOY_ENV}" = 'local' ||  "${RAILS_ENV}" = 'test' ] ; then
     rm -f "${DIRPATH}/pids/server-${DEPLOY_ENV}.pid"
     bundle exec puma -C "${PUMA}"
   else # qa, live etc