Fix migration problems

Author: milanmajchrak

.github/workflows/deploy.yml

@@ -148,15 +148,7 @@ jobs:
 
           echo "Terminating any remaining database connections..."
           docker exec $DDBNAME /bin/bash -c "psql -p 10563 -U dspace -d postgres -c \"
-          SELECT pg_terminate_backend(pg_stat_activity.pid)
-          FROM pg_stat_activity
-          WHERE pg_stat_activity.datname = 'dspace'
-            AND pg_stat_activity.pid <> pg_backend_pid();
-          \""
-
-          echo "Checking and releasing any existing advisory locks..."
-          docker exec $DDBNAME /bin/bash -c "psql -p 10563 -U dspace -d dspace -c \"
-          SELECT pg_advisory_unlock_all();
+          SELECT pg_terminate_backend(pid) FROM pg_locks WHERE locktype = 'advisory';
           \""
 
           echo "Waiting for connections and locks to fully terminate..."

docker/docker-compose-rest.yml

@@ -97,10 +97,13 @@ services:
       # It used to fail when the `server` folder did not exist in `/webapps`.
       # This will create a symlink from the webapps directory to the server directory with the custom namespace
       # (e.g. /dspace/webapps/server -> /dspace/webapps/repository#server)
+      # removed from `while`, because: not needed here
+      # There is problem in the database when `database migrate` is called here and then from the import run from the
+      # `deploy action`
+      # /dspace/bin/dspace database migrate force
+      # /dspace/bin/start-handle-server
       - |
         while (!</dev/tcp/dspacedb/${PG_PORT}) > /dev/null 2>&1; do sleep 1; done;
-        /dspace/bin/dspace database migrate force
-        /dspace/bin/start-handle-server
         ./custom_run.sh
   # DSpace database container
   dspacedb: