Skip to content

Commit fd8c461

Browse files
committed
Last line
Signed-off-by: susanachl <susanachavez8@hotmail.com>
1 parent cda80ca commit fd8c461

5 files changed

Lines changed: 5 additions & 19 deletions

File tree

.github/workflows/ros_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ jobs:
3838
"
3939
4040
volumes:
41-
keystore_ci:
41+
keystore_ci:

dicom_to_ros/dicom_to_ros/security/generate_keystore.sh

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22
set -e
33

4-
# Get the directory where this script is located to find permissions.xml
54
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
65

76
# This script generates the ROS 2 security keystore and keys for all nodes
@@ -43,9 +42,6 @@ fi
4342

4443
echo "Empty keystore volume detected. Generating fresh security artifacts..."
4544

46-
# WORKAROUND: `create_keystore` requires the target directory to not exist,
47-
# but we can't remove the volume mount point. So, we create it in a temporary
48-
# location and then move the contents into the empty volume.
4945
TMP_KEYSTORE_DIR=$(mktemp -d)
5046
ros2 security create_keystore "$TMP_KEYSTORE_DIR"
5147

@@ -55,22 +51,12 @@ rm -rf "$TMP_KEYSTORE_DIR"
5551

5652
ENCLAVE_NAME="/dicom_to_ros"
5753

58-
# The `create_enclave` command in Jazzy is designed to create the enclave
59-
# and all node keys defined in the policy file in a single step.
60-
# In ROS 2 Jazzy, the `create_enclave` command is intended to generate all
61-
# keys and permissions from a policy file in a single step.
6254
echo "Creating enclave and generating keys for all nodes from policy file..."
6355

64-
# The 'create_enclave' command and its arguments have changed in recent ROS 2 versions.
65-
# The modern approach is to create keys for each node individually and then
66-
# create the signed permissions file for the enclave.
67-
echo "Creating enclave and generating keys for all nodes from policy file..."
68-
# The modern `create_enclave` command handles generating all necessary keys and certificates.
6956
ros2 security create_enclave "$KEYSTORE_DIR" "$ENCLAVE_NAME"
7057

71-
# The `create_permission` command then signs the policy file using the generated enclave certificate.
7258
echo "Creating signed permissions for enclave: $ENCLAVE_NAME"
7359
ros2 security create_permission "$KEYSTORE_DIR" "$ENCLAVE_NAME" "$SCRIPT_DIR/permissions.xml"
7460

7561
# Store a checksum of the policy file to detect future changes.
76-
md5sum "$POLICY_FILE" > "$CHECKSUM_FILE"
62+
md5sum "$POLICY_FILE" > "$CHECKSUM_FILE"

dicom_to_ros/dicom_to_ros/security/permissions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,4 +152,4 @@
152152

153153
</enclave>
154154
</enclaves>
155-
</policy>
155+
</policy>

dicom_to_ros_demo/docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ services:
5353
volumes:
5454
docker_keystore:
5555
external: true
56-
name: docker_keystore
56+
name: docker_keystore

docker/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ fi
4040

4141
# Launch the application
4242
echo "[Step 4/4] Launching the DICOM to ROS pipeline..."
43-
exec ros2 launch dicom_to_ros dicom_nodes.launch.py
43+
exec ros2 launch dicom_to_ros dicom_nodes.launch.py

0 commit comments

Comments
 (0)