ci(deploy): stop inheriting vanilla's fixed host ports (5432/8080/8983/4000)

Root cause of 'Bind for 0.0.0.0:5432 failed: port is already allocated' on 8603,
proven by 'docker compose config' on dev-6:

  dspacedb (container_name: dspacedb8603)
    ports:
      target: 5432, published: "5432"    <- vanilla docker-compose-rest.yml
      target: 5432, published: "10603"   <- /opt/dspace-envs/8603 overlay

Compose MERGES ports lists across -f files instead of replacing them, so the
per-instance overlay adds 10603 but still inherits vanilla's fixed 5432. Those
fixed ports are global to the dev host, so only one instance can own them --
dev-6 currently has customer/jcu holding 0.0.0.0:5432, :8080 and :8983, and
customer/mendelu holding :4000, so 8603 could never bind them.

Add docker/docker-compose-instance-ports.yml, which resets ports to [] between
the vanilla files and the instance overlay; the overlay then supplies the real
instance-scoped ports (10603/6603/11603/4603 for 8603). This keeps the fix in
git rather than requiring /opt/dspace-envs/8603/docker-compose.yml to be patched
on the machine -- mendelu and sav solve the same problem there with
'ports: !override', which is why they publish only 127.0.0.1:105xx.

start.sh took the same treatment: it ran compose with the vanilla files ONLY, so
its 'up' collided too. It now honours INSTANCE_OVERLAY.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: Milan Majchrák

.github/workflows/deploy.yml

@@ -91,16 +91,18 @@ jobs:
 
       - name: resolved compose ports for this instance
         run: |
-          echo "===== merged compose config (dspacedb ports) for -p dspace-$INSTANCE"
+          echo "===== ports WITH the instance-ports reset (this is what deploy actually uses)"
           docker compose --env-file "$ENVFILE" -p dspace-$INSTANCE \
             -f docker/docker-compose.yml -f docker/docker-compose-rest.yml \
+            -f docker/docker-compose-instance-ports.yml \
             -f "$CONFIG_PATH/docker-compose-rest.yml" -f "$CONFIG_PATH/docker-compose.yml" \
-            config 2>&1 | grep -nE '^  [a-z-]+:|container_name:|published:|target:|^\s+ports:' | head -60 \
+            config 2>&1 | grep -nE '^  [a-z-]+:|container_name:|published:|^\s+ports:' | head -40 \
             || echo "compose config failed"
-          echo "===== what start.sh alone would publish (NO instance overlay)"
+          echo "===== ports WITHOUT the reset (the vanilla fixed ports we are dropping)"
           docker compose --env-file "$ENVFILE" -p dspace-$INSTANCE \
             -f docker/docker-compose.yml -f docker/docker-compose-rest.yml \
-            config 2>&1 | grep -nE '^  [a-z-]+:|container_name:|published:|target:|^\s+ports:' | head -40 \
+            -f "$CONFIG_PATH/docker-compose-rest.yml" -f "$CONFIG_PATH/docker-compose.yml" \
+            config 2>&1 | grep -nE '^  [a-z-]+:|container_name:|published:|^\s+ports:' | head -40 \
             || echo "compose config failed"
 
       - name: postgres inside the instance db container
@@ -133,10 +135,11 @@ jobs:
         env:
           ADMIN_PASSWORD: ${{ secrets.DSPACE_ADMIN_PASSWORD }}
           USER_PASSWORD: ${{ secrets.DSPACE_USER_PASSWORD }}
+          INSTANCE_OVERLAY: ${{ env.CONFIG_PATH }}
         run: |
           ./start.sh dspace-$INSTANCE
           cd ../..
-          docker compose --env-file $ENVFILE -p dspace-$INSTANCE -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f $CONFIG_PATH/docker-compose-rest.yml -f $CONFIG_PATH/docker-compose.yml up -d --no-build --remove-orphans
+          docker compose --env-file $ENVFILE -p dspace-$INSTANCE -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f docker/docker-compose-instance-ports.yml -f $CONFIG_PATH/docker-compose-rest.yml -f $CONFIG_PATH/docker-compose.yml up -d --no-build --remove-orphans
 
   import-8603:
     runs-on: dspace-${{inputs.DEV_MACHINE}}-dep-1
@@ -201,6 +204,7 @@ jobs:
           echo "Running one-off DB migration via docker compose..."
           docker compose --env-file $ENVFILE -p dspace-${INSTANCE} \
             -f docker/docker-compose.yml -f docker/docker-compose-rest.yml \
+            -f docker/docker-compose-instance-ports.yml \
             -f $OVERLAY/docker-compose-rest.yml -f $OVERLAY/docker-compose.yml \
             run --rm --no-deps --entrypoint /bin/bash dspace \
             -c "while (!</dev/tcp/dspacedb/5432) >/dev/null 2>&1; do sleep 1; done; cd /dspace/bin && ./dspace database migrate ignored"

build-scripts/run/start.sh

@@ -10,14 +10,25 @@ echo "Using envfile: [$ENVFILE] for project: [$PROJECT]"
 
 source $ENVFILE
 
+# The vanilla compose files publish fixed host ports (5432/8080/8983/4000), which are global
+# to the machine. When INSTANCE_OVERLAY points at /opt/dspace-envs/<instance>, bring the
+# containers up through that overlay instead, with docker-compose-instance-ports.yml resetting
+# the fixed ports first -- otherwise this `up` fights whichever instance already owns them.
+COMPOSE_FILES="-f docker/docker-compose.yml -f docker/docker-compose-rest.yml"
+if [[ -n "$INSTANCE_OVERLAY" ]]; then
+    COMPOSE_FILES="$COMPOSE_FILES -f docker/docker-compose-instance-ports.yml -f $INSTANCE_OVERLAY/docker-compose-rest.yml -f $INSTANCE_OVERLAY/docker-compose.yml"
+    echo "Using instance overlay: [$INSTANCE_OVERLAY]"
+fi
+echo "Compose files: [$COMPOSE_FILES]"
+
 # docker-compose does not pull those that have `build` section?!
 echo "====="
 docker pull $DSPACE_UI_IMAGE
 
 pushd ../..
 echo "====="
-docker compose --env-file $ENVFILE -f docker/docker-compose.yml -f docker/docker-compose-rest.yml pull
-docker compose --env-file $ENVFILE -p $PROJECT -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d --no-build --remove-orphans
+docker compose --env-file $ENVFILE $COMPOSE_FILES pull
+docker compose --env-file $ENVFILE -p $PROJECT $COMPOSE_FILES up -d --no-build --remove-orphans
 popd
 
 # Create admin user

docker/docker-compose-instance-ports.yml

@@ -0,0 +1,21 @@
+# Drop the FIXED host ports that the vanilla docker-compose.yml / docker-compose-rest.yml
+# publish (dspace 8080, dspace-angular 4000+9876, dspacedb 5432, dspacesolr 8983).
+#
+# Those are global to the machine, so on a shared dev host only ONE instance can ever own
+# them: the second instance to deploy dies with
+#   "Bind for 0.0.0.0:5432 failed: port is already allocated".
+# Compose MERGES `ports` lists across -f files rather than replacing them, so a per-instance
+# overlay that only adds its own ports still inherits the fixed ones.
+#
+# Include this file AFTER the vanilla compose files and BEFORE the per-instance overlay in
+# /opt/dspace-envs/<instance>/: it resets the list, and the overlay then contributes the real
+# instance-scoped ports (e.g. 10603->5432).
+services:
+  dspace:
+    ports: !override []
+  dspace-angular:
+    ports: !override []
+  dspacedb:
+    ports: !override []
+  dspacesolr:
+    ports: !override []