Merge branch 'develop' into 11744-cors-echo-origin-vary

Author: ErykKul

doc/sphinx-guides/source/container/dev-usage.rst

@@ -145,13 +145,13 @@ Accessing Harvesting Log Files
 
 \1. Open a terminal and access the Dataverse container.
 
-Run the following command to access the Dataverse container (assuming your container is named dataverse-1):
+Run the following command to access the Dataverse container:
 
 .. code-block::
 
-  docker exec -it dataverse-1 bash
+  docker exec -it dev_dataverse bash
 
-This command opens an interactive shell within the dataverse-1 container.
+This command opens an interactive shell within the dev_dataverse container.
 
 \2. Navigate to the log files directory.
 

doc/sphinx-guides/source/developers/tips.rst

@@ -124,7 +124,7 @@ Here's an example of using these credentials from within the PostgreSQL containe
 
 .. code-block:: bash
 
-    pdurbin@beamish dataverse % docker exec -it postgres-1 bash
+    pdurbin@beamish dataverse % docker exec -it dev_postgres bash
     root@postgres:/# export PGPASSWORD=secret
     root@postgres:/# psql -h localhost -U dataverse dataverse
     psql (16.3 (Debian 16.3-1.pgdg120+1))

docker/util/intellij/cpwebapp.sh

@@ -9,15 +9,26 @@ PROJECT_DIR="$1"
 FILE_TO_COPY="$2"
 RELATIVE_PATH="${FILE_TO_COPY#"${PROJECT_DIR}/"}"
 
-# Check if RELATIVE_PATH starts with 'src/main/webapp', otherwise ignore
+# Only act on files under src/main/webapp
 if [[ "$RELATIVE_PATH" == "src/main/webapp"* ]]; then
-    # Extract version from POM, so we don't need to have Maven on the PATH
-    VERSION=$(grep -oPm1 "(?<=<revision>)[^<]+" "$PROJECT_DIR/modules/dataverse-parent/pom.xml")
+  POM="$PROJECT_DIR/modules/dataverse-parent/pom.xml"
 
-    # Construct the target path by cutting off the local prefix and prepend with in-container path
-    RELATIVE_PATH_WITHOUT_WEBAPP="${RELATIVE_PATH#src/main/webapp/}"
-    TARGET_PATH="/opt/payara/appserver/glassfish/domains/domain1/applications/dataverse-$VERSION/${RELATIVE_PATH_WITHOUT_WEBAPP}"
+  # Extract <revision> in a portable way
+  VERSION="$(awk -F'[<>]' '/<revision>/{print $3; exit}' "$POM")"
 
-    # Copy file to container
-    docker cp "$FILE_TO_COPY" "dev_dataverse:$TARGET_PATH"
+  if [[ -z "${VERSION:-}" ]]; then
+    echo "Error: Could not extract <revision> from $POM" >&2
+    exit 1
+  fi
+
+  CONTAINER="dev_dataverse"
+
+  # Build target path
+  RELATIVE_PATH_WITHOUT_WEBAPP="${RELATIVE_PATH#src/main/webapp/}"
+  TARGET_PATH="/opt/payara/appserver/glassfish/domains/domain1/applications/dataverse-$VERSION/${RELATIVE_PATH_WITHOUT_WEBAPP}"
+
+  # Copy file into container
+  docker cp "$FILE_TO_COPY" "$CONTAINER:$TARGET_PATH"
+
+  echo "Copied $FILE_TO_COPY → $CONTAINER:$TARGET_PATH"
 fi