Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 19 additions & 24 deletions .github/workflows/build-publish-terrain-intelligence-generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ jobs:
echo "- Wrapper scripts (545 commands)" >> $GITHUB_STEP_SUMMARY
echo "- VICAR operations (gen, list, copy, stretch)" >> $GITHUB_STEP_SUMMARY
echo "- vicario converter (PNG, JPEG, TIFF)" >> $GITHUB_STEP_SUMMARY
echo "- VISOR sample data access" >> $GITHUB_STEP_SUMMARY
echo "- VISOR data not bundled (external mount)" >> $GITHUB_STEP_SUMMARY
echo "- Python/Pillow dependencies" >> $GITHUB_STEP_SUMMARY
echo "- Docker exec pattern (terrain-intelligence-generator)" >> $GITHUB_STEP_SUMMARY
echo "- File persistence to host" >> $GITHUB_STEP_SUMMARY
Expand Down Expand Up @@ -375,25 +375,17 @@ jobs:
'
echo ""

# Test 11: VISOR sample data access
# Test 11: Verify VISOR data is NOT bundled (should be mounted at runtime)
echo "============================================"
echo "Test 11: VISOR sample data"
echo "Test 11: VISOR data not bundled"
echo "============================================"
docker run --rm ${IMAGE_TAG} bash -c '
if [ -d "$VISOR_SAMPLES" ]; then
SAMPLE_COUNT=$(find $VISOR_SAMPLES -type f 2>/dev/null | wc -l)
echo "✓ VISOR sample data accessible ($SAMPLE_COUNT files)"
if [ ! -d "$VISOR_SAMPLES" ] && [ ! -d "$VISOR_CALIB" ]; then
echo "✓ VISOR data not bundled (mount at runtime as documented)"
else
echo "✗ ERROR: VISOR sample data not found"
exit 1
fi

if [ -d "$VISOR_CALIB" ]; then
CALIB_COUNT=$(find $VISOR_CALIB -type f 2>/dev/null | wc -l)
echo "✓ VISOR calibration data accessible ($CALIB_COUNT files)"
else
echo "✗ ERROR: VISOR calibration data not found"
exit 1
echo "✗ WARNING: VISOR data found in image (should be external)"
[ -d "$VISOR_SAMPLES" ] && echo " - VISOR_SAMPLES exists"
[ -d "$VISOR_CALIB" ] && echo " - VISOR_CALIB exists"
fi
'
echo ""
Expand Down Expand Up @@ -530,11 +522,10 @@ jobs:
- VICAR image processing tools (pre-built binaries)
- TAE (Terminal Application Executive)
- MARS terrain processing tools
- Python 3.9 runtime
- Vicario - VICAR to PNG/JPEG/TIFF converter
- VISOR calibration files (Phoenix, MER missions)
- VISOR sample data for testing
- All necessary runtime dependencies
- Python 3.9 runtime
- Vicario - VICAR to PNG/JPEG/TIFF converter
- Runtime-ready for external calibration/data mounts
- All necessary runtime dependencies

### Quick Start

Expand Down Expand Up @@ -568,9 +559,13 @@ jobs:
- `opensource` - Latest open-source build
- `latest` - Latest stable release

### Data Locations Inside Container
- VISOR calibrations: `/usr/local/vicar/visor_data/calib`
- VISOR sample data: `/usr/local/vicar/visor_data/samples`
### Mount Points for External Data
Mount calibration/sample data at runtime:
- VISOR calibrations: `-v /path/to/calib:/usr/local/vicar/visor_calib:ro`
- VISOR samples: `-v /path/to/samples:/usr/local/vicar/visor_samples:ro`
- MARS calibration: `-v /path/to/mars_calib:/usr/local/vicar/mars_calib:ro`

See Dockerfile comments for download instructions.

### Source Code
- VICAR: https://github.com/NASA-AMMOS/VICAR
Expand Down
2 changes: 1 addition & 1 deletion terrain-intelligence-generator/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ ENV WORKSPACE=/usr/local/vicar
ENV VICSYS=DEVELOPMENT
ENV SHELL=/bin/bash
ENV PATH="${V2TOP}/p2/lib/x86-64-linx:${V2TOP}/tae53/bin/x86_64_linx:${PATH}"
ENV LD_LIBRARY_PATH="${V2TOP}/olb/x86-64-linx:${V2TOP}/p2/lib/x86-64-linx:${V2TOP}/mars/lib/x86-64-linx:${LD_LIBRARY_PATH}"
ENV LD_LIBRARY_PATH="${V2TOP}/olb/x86-64-linx:${V2TOP}/p2/lib/x86-64-linx:${V2TOP}/mars/lib/x86-64-linx"

# Enable PowerTools (CodeReady Builder) for additional packages
RUN dnf install -y dnf-plugins-core && \
Expand Down
1 change: 0 additions & 1 deletion terrain-intelligence-generator/docker/mars_calibration_m20

This file was deleted.

Loading