Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
f94d32a
Add try/catch to dat_to_csv, formatting
romleiaj Jan 28, 2026
3f8197c
Add function to compress jpegs with nvJPEG, and an optional flag to t…
romleiaj Jan 12, 2026
d2c0b59
Pull in updated PhaseOne image and camera SDK versions that support G…
romleiaj Jan 12, 2026
a55fb15
Revert "Pull in updated PhaseOne image and camera SDK versions that s…
romleiaj Jan 26, 2026
63eb293
Fix namespace
romleiaj Jan 28, 2026
312dcef
Build in one-step now
romleiaj Jan 28, 2026
f53d767
Add more error handling around phase one debayering queues, since the…
romleiaj Jan 26, 2026
b70d1c1
Recreate the to_process file each time, guaranteeing all files will b…
romleiaj Jan 28, 2026
d5ae8a5
Add defaults for use_nvjpeg
romleiaj Apr 30, 2026
30da331
Provisioning updates
romleiaj Apr 30, 2026
61f635f
Add script to seed redis config, update provisioning to use it.
romleiaj May 1, 2026
e5ad032
Update defaults
romleiaj May 4, 2026
e16e317
Have safe default
romleiaj May 4, 2026
e1c4425
Remove local ROS calls in startup
romleiaj May 4, 2026
5cb05d7
Update redis default bind
romleiaj May 4, 2026
9467285
Move order of aptitude install so only one cache update is required
romleiaj May 4, 2026
0fce41e
Move the KAMERA_DIR env variable into the supervisor conf, so only on…
romleiaj May 6, 2026
0bee638
Create global variables at the supervisord level, consolidating confi…
romleiaj May 7, 2026
cf2369b
Store image tags in a .env variable, less name duplication
romleiaj May 7, 2026
c2cdb3e
Eliminate the tmuxinator dependency, just call tmux directly.
romleiaj May 7, 2026
fcf795d
Revert KAMERA DIR setting, hard paths are required for supervisor
romleiaj May 7, 2026
b449e02
Rollback supervisord changes as well.
romleiaj May 7, 2026
5a5411f
Source env directly before docker startup
romleiaj May 7, 2026
a13e7af
Call env.sh only once
romleiaj May 7, 2026
b27d3d7
Remove 'version' tags from compose files to comply
romleiaj May 7, 2026
370470f
Cleanup roskv, remove benedict dependency, collapse RedisEnvoy into o…
romleiaj May 1, 2026
b7a1896
Pass correct arg to redis envoy
romleiaj May 1, 2026
c5367c9
Update naming convention for hostnames
romleiaj Jun 10, 2026
3f752ef
Update nayak with new naming convention as well
romleiaj Jun 10, 2026
cec1f71
Move up hosts to top-level cfg
romleiaj Jun 10, 2026
20dfece
Remove cruft, consolidate redis config
romleiaj Jun 10, 2026
09a3a97
makefile, provisioning updates
romleiaj Jun 10, 2026
187696a
Cleanup docker build chain, add concrete build steps to the makefile
romleiaj Jun 12, 2026
cd344df
Begin port to noetic GUI, moving all images to ubuntu 20.04
romleiaj Jun 15, 2026
517a2d4
Port all WX py2 code to WX py3
romleiaj Jun 15, 2026
0a115a3
Turn off docker compose 'base' so build order follows depends_on order
romleiaj Jun 15, 2026
088aed7
No bake isn't listened to, switch to explicit docker compose builds
romleiaj Jun 15, 2026
9721554
Move GUI supporting packages from py2 -> py3 syntax
romleiaj Jun 15, 2026
3655482
Remove some old scripts
romleiaj Jun 15, 2026
c4167aa
Remove some unused functions in the GUI, make sure casing matches in …
romleiaj Jun 15, 2026
5e5271a
Remove references to files / dirs that no longer exist
romleiaj Jun 15, 2026
d279f55
Remove old syntax from gui.dockerfile
romleiaj Jun 15, 2026
8d825a6
Modernize gui.dockerfile a little more
romleiaj Jun 15, 2026
1bd7ed2
Remove kamera pip install - the gui doesn't need it
romleiaj Jun 15, 2026
7b115cb
Escape host config queries to support hyphens in hostnames
romleiaj Jun 15, 2026
e7916dc
Remove custom tini install, use docker's built-in init stack
romleiaj Jun 15, 2026
4956d60
Remove local ros calls
romleiaj Jun 15, 2026
92395f8
Remove py2 relative imports, use absolute
romleiaj Jun 15, 2026
f5ffd31
Load defaults based on system name, not from within gui
romleiaj Jun 15, 2026
735a48d
Add psutil pip package, generate locales so GUI doesn't flop initially
romleiaj Jun 15, 2026
b76a56f
Move AddSpacer to Add for wx4
romleiaj Jun 15, 2026
5be8c9c
Make config conflict resolution a little more verbose / useful
romleiaj Jun 15, 2026
0b3468a
Numerous classic -> phoenix GUI fixes
romleiaj Jun 15, 2026
0ce2147
Move SSD / NAS checks to side thread so GUI doesn't hang, make hosts …
romleiaj Jun 15, 2026
8132c0b
Hopefully a resolution to our mysterious X Windows errors
romleiaj Jun 15, 2026
dc6de45
Revert last commit, ipc:host seems like the actual solution
romleiaj Jun 15, 2026
6d154b5
Render font size after pane is created, to avoid clipping text
romleiaj Jun 15, 2026
5fd1cda
More scaling / unsquishing fixes for buttons and panels
romleiaj Jun 15, 2026
d570aba
Split INS data into 2 columns for vertical space savings
romleiaj Jun 15, 2026
d9f16dc
Increase width for camera dropdown, make about dialog open
romleiaj Jun 15, 2026
c779330
Squeeze vertical block
romleiaj Jun 15, 2026
3954bd7
More spacing adjustments.
romleiaj Jun 15, 2026
b9531ca
Move observer back to its own row, expand camera settings a bit
romleiaj Jun 15, 2026
358aece
Darker gray for disabled controls, spacing changes
romleiaj Jun 15, 2026
3c304a7
Make sure disabled values are shown
romleiaj Jun 15, 2026
598a735
Remove race condition on detector guage starting red
romleiaj Jun 15, 2026
9a19e09
Change volume mounts to match
romleiaj Jun 15, 2026
5924d91
Use repo dir, not ws dir
romleiaj Jun 15, 2026
d2fd8d0
Point to correct logo file
romleiaj Jun 15, 2026
256e13d
Spacing
romleiaj Jun 15, 2026
e56d317
Change divider
romleiaj Jun 15, 2026
09cca67
Move completely to noetic - remove kinetic shims
romleiaj Jun 15, 2026
587f807
Add viame to leader build
romleiaj Jun 15, 2026
5f085c8
Remove WS_DIR variable, make REPO_DIR use consistent
romleiaj Jun 15, 2026
5fd0e3c
Add defaults for debug in provisioning to avoid crashes in certain nodes
romleiaj Jun 15, 2026
599ec71
Remove hyphens from hostnames - does not play nicely with ROS. Exampl…
romleiaj Jun 15, 2026
801925e
Move host filtering to a general helper function, use across all node…
romleiaj Jun 15, 2026
57800d6
Update netplans for taiga systems
romleiaj Jun 15, 2026
5760e2e
Add core to leader docker build
romleiaj Jun 15, 2026
88d40cd
Move location of netplan yaml
romleiaj Jun 15, 2026
af2564b
Reconfigure start/stop scripts to use center/left/right convention, r…
romleiaj Jun 16, 2026
8636374
Update startup script to be more general, new naming scheme
romleiaj Jun 16, 2026
509d2a6
Add script to install desktop shortcuts
romleiaj Jun 16, 2026
16e7a0d
Add desktop install to leader provision
romleiaj Jun 16, 2026
797bb3d
Remove unused runscripts, collapse swap dockerd to one script
romleiaj Jun 16, 2026
f6610b5
Add local push/pull docker config, automatically start registry conta…
romleiaj Jun 16, 2026
c6d5758
Add kamerad to leader
romleiaj Jun 16, 2026
ef0503e
Add a docker restart to ansible
romleiaj Jun 16, 2026
d95b593
Leave docker configuration for configure step
romleiaj Jun 16, 2026
f5960d9
Rollback to per-machine netplans, the specificity is needed
romleiaj Jun 16, 2026
79ffbb5
Add sys2 netplan
romleiaj Jun 16, 2026
75fb3aa
Remove eth speed max scripts - obe
romleiaj Jun 16, 2026
fac608e
Got a little too carried away, need these scripts
romleiaj Jun 16, 2026
366a445
Make scripts executable, strs be f-strs
romleiaj Jun 16, 2026
7eb08fd
Pin NFS version, make nas mount dir beforehand
romleiaj Jun 16, 2026
2a3feed
Whoops didn't need that folder creation
romleiaj Jun 16, 2026
166637a
Rollback hosts to a per-machine config, as the NAS requires a distinc…
romleiaj Jun 16, 2026
6881213
Numerous gui updates to bring it closer to previous behavior
romleiaj Jun 16, 2026
5a404d9
Let gain breathe a little
romleiaj Jun 16, 2026
d3f5f10
Update some necessary defaults
romleiaj Jun 16, 2026
d3cbbb9
Grey out contrast control, as server uses it
romleiaj Jun 16, 2026
f97bc16
Fix startup spacing
romleiaj Jun 16, 2026
e7aedd3
Shrink observer box, minimize prints
romleiaj Jun 16, 2026
6a1ee5e
Some minor GUI adjustments
romleiaj Jun 16, 2026
a3586ee
Update some defaults, add warning if no pipefile
romleiaj Jun 16, 2026
d87932e
Make pipefile loading a little more robust
romleiaj Jun 16, 2026
5f9a380
More robust host filtering for detectors
romleiaj Jun 16, 2026
757b2f8
Don't try to copy perms to avoid NAS noise in copy
romleiaj Jun 16, 2026
ac3b033
We don't use that image manager, change the data migration script
romleiaj Jun 16, 2026
10b1eee
More gui spacing
romleiaj Jun 16, 2026
e6297c1
Add ansible for system stop / starts
romleiaj Jun 16, 2026
9983644
Add task to symlink nas to desktop (for convenience)
romleiaj Jun 17, 2026
5623fee
Add power management to kamerad, adding supervisor tasks for startup …
romleiaj Jun 17, 2026
488912d
Cleanup old power scripts, update desktop to point at new endpoints
romleiaj Jun 17, 2026
738e3b6
Cut out threading and redis from power management, just make it a sim…
romleiaj Jun 17, 2026
6f6ce60
Add tailscale to system install
romleiaj Jun 17, 2026
0f0af03
Define clear boundaries for each configuration file - yaml contains s…
romleiaj Jun 17, 2026
57c0764
Remove all old license strings, replace GUI license with Apache 2.0.
romleiaj Jun 17, 2026
eed9654
Make the icons a little prettier
romleiaj Jun 17, 2026
c1932ed
Make them a little less scary
romleiaj Jun 17, 2026
7e4cd72
Remove seal icon (it was a sea lion :( )
romleiaj Jun 17, 2026
df01c30
Provisioning updates
romleiaj Jun 17, 2026
508dfcc
nayak-specific config, no ir or uv cameras
romleiaj Jun 17, 2026
a40a6fd
Add default camera config jsons, change default system state to match
romleiaj Jun 17, 2026
87be3d8
Add shutter enum mapping for electronic / leaf shutter on phase one c…
romleiaj Jun 17, 2026
da96f51
More configuration updates, move pipefile to within camera_cfgs,
romleiaj Jun 17, 2026
387e29f
Numerous GUI changes, the biggest being dropdowns for phase one shutt…
romleiaj Jun 17, 2026
01e3f83
Display speed instead of exposure in ms
romleiaj Jun 18, 2026
0d2711f
If any camera parameter changes, light up the 'set' button so its obv…
romleiaj Jun 18, 2026
f9a18d9
Make kamerad run on startup, and autorestart. Make kamera_run just la…
romleiaj Jun 18, 2026
84ca79c
Delete gui icon
romleiaj Jun 18, 2026
85c12be
Resolve 2 bugs in phase one camera driver. The 'total' counter is now…
romleiaj Jun 18, 2026
2b8e6b8
Add more color indicators, properly display debayer frames
romleiaj Jun 18, 2026
f6fce23
The camera config box was hiding some important elements - stretch it…
romleiaj Jun 18, 2026
11ffe8f
Make sure camera configurations are written to disk on save
romleiaj Jun 18, 2026
3594e78
Remove OBE camera models file, pivot to kamera one in gui
romleiaj Jun 18, 2026
c4c1389
Properly label icons
romleiaj Jun 18, 2026
d99ab27
Need that new line
romleiaj Jun 18, 2026
9ecd610
Add 'local stratum 3' to nayak sys config, this should have been upda…
romleiaj Jun 29, 2026
1be6a6b
Turn those strings to ints, fixing incorrect yellow INS panel
romleiaj Jun 30, 2026
8e0e277
Add changelog
romleiaj Jul 13, 2026
ba818f7
Rollback to unless-stopped so halt properly works
romleiaj Jul 5, 2026
0f79a39
Add a sleep, remove old files
romleiaj Jul 5, 2026
16710e2
Add int wrappers to debug, change dropdown, minor live updates
romleiaj Jul 5, 2026
0752f21
Make the shutdown script check for system state, rather than exiting …
romleiaj Jul 5, 2026
d0771f6
Increase height to show shapefile box
romleiaj Jul 5, 2026
8c48c06
Restore host_shutdown.sh and host_reboot.sh, still used by the superv…
romleiaj Jul 21, 2026
5026e07
v0.5.0 release
romleiaj Jul 21, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 30 additions & 0 deletions .github/workflows/gui-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: GUI build

on:
push:
paths:
- ".github/workflows/gui-build.yml"
- "docker/base/gui-deps.dockerfile"
- "docker/gui.dockerfile"
- "docker-compose.yml"
- "Makefile"
pull_request:
paths:
- ".github/workflows/gui-build.yml"
- "docker/base/gui-deps.dockerfile"
- "docker/gui.dockerfile"
- "docker-compose.yml"
- "Makefile"

# NOTE: This is config validation only, not an image build. A real `make gui`
# build requires the published Noetic core-deps image as a base and a display
# for the wx smoke test. Upgrade this to an actual layer build (e.g. build
# gui-deps against a published core-deps) when CI infrastructure allows.
jobs:
validate-compose:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Validate gui compose config
run: docker compose --profile gui config
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
**__pycache__
**.swp
**.pyc
**.DS_Store
uv.lock
artifacts
build
devel
Expand Down
106 changes: 106 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
# Changelog

All notable changes to KAMERA are documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [0.5.0] - 2026-07-21

### Added

- Dropdown selectors for Phase One shutter speed, gain, and aperture, with proper
electronic/leaf shutter mapping.
- The 'Set' button lights up whenever a camera parameter changes, making pending
changes obvious.
- Optional GPU JPEG compression via nvJPEG, enabled with the `/sys/arch/use_nvjpeg` flag.
- Power management (system startup/shutdown/reboot) as a simple stateful REST API,
managed by kamerad and supervisor.
- kamerad runs on system startup and auto-restarts.
- Default camera configuration JSONs ship with the repo; defaults load based on the
system name.
- Additional color status indicators in the GUI, and a warning when no detector
pipefile is configured.
- Ansible tasks for system stop/start and docker restarts.
- Local docker registry on leader machines for distributing images to the rest of
the system; leader machines also build the core and VIAME images.
- Tailscale installed with the system for remote access.
- Desktop shortcuts installed during provisioning, including a convenience symlink
to the NAS.
- Script to seed the redis configuration during provisioning.
- nayak system support: tailored configuration (no IR/UV cameras) and a local
stratum-3 NTP server so systems stay synchronized offline.

### Changed

- GUI ported to ROS Noetic: all images now build on Ubuntu 20.04 with Python 3 and
wxPython 4.
- Save is now a single button: it finalizes changes, writes camera configurations to
disk, and refreshes the main panel dropdown.
- Shutter speed is displayed directly instead of exposure in milliseconds.
- Flight number entry is more forgiving and no longer errors on every change.
- Contrast control is greyed out when the server manages it; disabled controls now
show their values in a clearer disabled style.
- GUI layout overhauled: INS data in two columns, wider camera dropdowns, working
About dialog, and many scaling fixes to eliminate clipped text and squished panels.
- Icons refreshed and properly labeled.
- `kamera_run` now just launches the GUI when the system is already up, so a
separate GUI desktop icon is no longer needed.
- Hostnames follow a new center/left/right convention (hyphen-free for ROS
compatibility), and start/stop scripts use it uniformly.
- Startup calls tmux directly, and environment/image-tag configuration is
consolidated into supervisord globals and a `.env` file.
- Clear configuration boundaries: yaml files hold static, system-specific options;
`system_state.json` holds mutable, GUI-facing state.
- Configuration conflict resolution reports what changed instead of failing silently.
- redis configuration consolidated.
- Docker build chain cleaned up: concrete makefile steps and explicit compose builds
that respect `depends_on` order.
- NFS version pinned and NAS mount points created ahead of mounting, for more
reliable NAS access.
- GUI relicensed under Apache 2.0; old license headers removed.

### Fixed

- INS panel incorrectly showing yellow (string vs. int comparison).
- ~10-frame lag in the image counter display; the frame buffer is also flushed when
archiving stops, so counts stay accurate.
- GUI no longer hangs during SSD / NAS health checks (moved to a background thread).
- Race condition where the detector gauge started red.
- Intermittent X Windows errors when launching the GUI (containers now use
`ipc: host`).
- Phase One debayering failures: added error handling around queue writes and
removed a hardcoded output path.
- The image-processing queue is recreated on each run, guaranteeing every file gets
processed.
- Detector pipefile loading is more robust.

### Removed

- Legacy ROS Kinetic / Python 2 code paths and shims.
- tmuxinator dependency.

## [0.4.0] - 2025-07-28

_Released before this changelog was introduced; see the git history for details._

## [0.3.0] - 2025-03-25

_Released before this changelog was introduced; see the git history for details._

## [0.2.0] - 2025-01-12

_Released before this changelog was introduced; see the git history for details._

## [0.1.0] - 2024-11-23

_Released before this changelog was introduced; see the git history for details._

[Unreleased]: https://github.com/Kitware/kamera/compare/v0.5.0...develop
[0.5.0]: https://github.com/Kitware/kamera/compare/v0.4.0...v0.5.0
[0.4.0]: https://github.com/Kitware/kamera/compare/v0.3.0...v0.4.0
[0.3.0]: https://github.com/Kitware/kamera/compare/v0.2.0...v0.3.0
[0.2.0]: https://github.com/Kitware/kamera/compare/v0.1.0...v0.2.0
[0.1.0]: https://github.com/Kitware/kamera/releases/tag/v0.1.0
71 changes: 40 additions & 31 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,45 +1,54 @@
CMD ?= bash
runtime ?= runc
network ?= host
name ?= kamera
DAQDEV ?= mcc_daq
REPO_DIR ?= $(shell realpath ${PWD})
REPO_DIR_BASEDIR ?= $(shell dirname $(REPO_DIR))
ROS_MASTER_URI ?= not_set_your_config_is_bad
## Docker buildkit - disable by setting to 0 if you have issues

DAQPATH = $(shell readlink -f "/dev/$(DAQDEV)")
PROJ_DIR=/root/kamera
WS_DIR=/root/kamera
ROS_DISTRO=noetic
BRANCH=latest

.PHONY: info
info:
@echo REPO_DIR_BASEDIR=$(REPO_DIR_BASEDIR)
@echo ROS_MASTER_URI=$(ROS_MASTER_URI)
@echo REDIS_HOST=$(REDIS_HOST)

.PHONY: build
ROS_DISTRO ?= noetic

.PHONY: build core viame gui postflight follower leader all clean

build:
docker compose build

.PHONY: nuvo
nuvo:
docker compose --profile nuvo build
## --- individual layer targets ---

core:
docker compose --profile core build core-ros
docker compose --profile core build core-deps
docker compose --profile core build

.PHONY: viame
viame:
docker compose --profile viame build viame-base
docker compose --profile viame build

.PHONY: gui
gui:
ROS_DISTRO=kinetic docker compose --profile gui build
docker compose --profile gui build core-ros
docker compose --profile gui build core-deps
docker compose --profile gui build gui-deps
docker compose --profile gui build gui

.PHONY: postflight
postflight:
docker compose --profile pf build

.PHONY: clean
## --- deployment-target targets ---

# Follower node: headless sensor node — core + VIAME + postproc
follower:
docker compose --profile follower build core-ros
docker compose --profile follower build core-deps
docker compose --profile follower build viame-base
docker compose --profile follower build

# Leader node: operator workstation — GUI + VIAME + postproc
leader:
docker compose --profile leader build core-ros
docker compose --profile leader build core-deps
docker compose --profile leader build viame-base
docker compose --profile leader build gui-deps
docker compose --profile leader build

# Everything
all:
docker compose --profile all build core-ros
docker compose --profile all build core-deps
docker compose --profile all build viame-base
docker compose --profile all build gui-deps
docker compose --profile all build

clean:
rm -rf .ros .catkin_tools .cmake .config build* devel* logs*
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2024 Kitware, Inc.
KAMERA
=============================================================

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
5 changes: 5 additions & 0 deletions compose/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
KAMERA_CORE_IMAGE=kitware/kamera:core
KAMERA_KAMERAD_IMAGE=kitware/kamera:kamerad
KAMERA_VIAME_IMAGE=kitware/kamera:viame
KAMERA_POSTPROC_IMAGE=kitware/kamera:postproc
KAMERA_GUI_IMAGE=kitware/kamera:gui
6 changes: 3 additions & 3 deletions compose/cam_ir.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
## Auxiliary node to attach to master
version: '3.7'
services:
cam_ir:
container_name: "cam-ir-${CAM_FOV}"
image: kitware/kamera:core
image: ${KAMERA_CORE_IMAGE}
init: true
tty: true
environment:
ROS_MASTER_URI: "${ROS_MASTER_URI}"
Expand All @@ -23,5 +23,5 @@ services:
- "/mnt:/mnt"
- "${PWD}/src:${DOCKER_KAMERA_DIR}/src:ro"
command: ["/entry/cam_ir.sh"]
restart: unless-stopped
restart: no
...
6 changes: 3 additions & 3 deletions compose/cam_param_monitor.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
## Core processes
version: '3.7'
services:
cam_param_monitor:
container_name: cam_param_monitor
image: kitware/kamera:core
image: ${KAMERA_CORE_IMAGE}
init: true
tty: true
environment:
ROS_MASTER_URI: "${ROS_MASTER_URI}"
Expand All @@ -20,5 +20,5 @@ services:
- "/mnt:/mnt"
- "${PWD}/src:${DOCKER_KAMERA_DIR}/src:ro"
command: ["/entry/cam_param_monitor.sh"]
restart: unless-stopped
restart: no
...
6 changes: 3 additions & 3 deletions compose/cam_rgb.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
## Auxiliary node to attach to master
version: '3.7'
services:
## =========================== headless nodes =============================
cam_rgb:
container_name: "cam-rgb-${CAM_FOV}"
image: kitware/kamera:core
image: ${KAMERA_CORE_IMAGE}
init: true
tty: true
environment:
ROS_MASTER_URI: "${ROS_MASTER_URI}"
Expand All @@ -25,7 +25,7 @@ services:
- "${PWD}/src:${DOCKER_KAMERA_DIR}/src:ro"
command: ["/entry/cam_phaseone.sh"]
#command: ["bash"]
restart: unless-stopped
restart: no
deploy:
resources:
reservations:
Expand Down
6 changes: 3 additions & 3 deletions compose/cam_uv.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
## Auxiliary node to attach to master
version: '3.7'
services:
## =========================== headless nodes =============================
cam_uv:
container_name: "cam-uv-${CAM_FOV}"
image: kitware/kamera:core
image: ${KAMERA_CORE_IMAGE}
init: true
tty: true
environment:
ROS_MASTER_URI: "${ROS_MASTER_URI}"
Expand All @@ -25,5 +25,5 @@ services:
- "${PWD}/src:${DOCKER_KAMERA_DIR}/src:ro"
# command: ["bash"]
command: ["/entry/cam_prosilica.sh", "uv"]
restart: unless-stopped
restart: no
...
6 changes: 3 additions & 3 deletions compose/daq.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
## Bring up the core nodes (aside from roscore)
version: '3.7'
services:
daq:
container_name: daq
image: kitware/kamera:core
image: ${KAMERA_CORE_IMAGE}
init: true
tty: true
devices:
- "${MCC_DAQ}:${MCC_DAQ}"
Expand All @@ -23,5 +23,5 @@ services:
- "/mnt:/mnt"
- "${PWD}/src:${DOCKER_KAMERA_DIR}/src:ro"
command: ["/entry/daq.sh"]
restart: unless-stopped
restart: no
...
4 changes: 2 additions & 2 deletions compose/detections.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
## Core processes
version: '3.7'
services:
## =========================== headless nodes =============================
detections:
image: kitware/kamera:postproc
image: ${KAMERA_POSTPROC_IMAGE}
init: true
network_mode: host
environment:
REDIS_HOST: "${REDIS_HOST}"
Expand Down
6 changes: 3 additions & 3 deletions compose/detector.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
## container configuration for viame interactive building
# use compose v2 to use runtime config
version: '2.4'

services:
## ========================== viame =============================
detector:
container_name: "viame-${CAM_FOV}"
image: kitware/kamera:viame
image: ${KAMERA_VIAME_IMAGE}
init: true
tty: true
environment:
REDIS_HOST: "${REDIS_HOST}"
Expand All @@ -26,7 +26,7 @@ services:
- "/mnt:/mnt"
- "${PWD}/src:${DOCKER_KAMERA_DIR}/src:ro"
command: ["/entry/viame.sh"]
restart: unless-stopped
restart: no
deploy:
resources:
reservations:
Expand Down
4 changes: 2 additions & 2 deletions compose/flight_summary.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
## Core processes
version: '3.7'
services:
## =========================== headless nodes =============================
flight_summary:
image: kitware/kamera:postproc
image: ${KAMERA_POSTPROC_IMAGE}
init: true
network_mode: host
environment:
REDIS_HOST: "${REDIS_HOST}"
Expand Down
Loading
Loading