Skip to content

Commit

Permalink
Refactor run-nodered script
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de>
  • Loading branch information
andistorm committed Aug 6, 2024
1 parent 665eb1d commit 488dcfa
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 17 deletions.
6 changes: 0 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,6 @@ endif()
# FIXME (aw): this should be optional
add_subdirectory(config)

# install docker related files
install(
DIRECTORY "cmake/assets/docker"
DESTINATION "${CMAKE_INSTALL_DATADIR}/everest"
)

ev_install_project()

# configure clang-tidy if requested
Expand Down
5 changes: 0 additions & 5 deletions cmake/assets/docker/Dockerfile

This file was deleted.

9 changes: 6 additions & 3 deletions cmake/assets/run_nodered_template.sh.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
cd @EVEREST_DOCKER_DIR@
docker build -t everest-nodered .
docker run --rm --network host --name everest_nodered --mount type=bind,source=@FLOW_FILE@,target=/data/flows.json everest-nodered
docker volume create nodered-config-volume
docker create -v nodered-config-volume:/data --name nodered-config-container tianon/true:latest true
docker cp @FLOW_FILE@ nodered-config-container:/data/flows.json
docker rm nodered-config-container

docker run --rm --network host --name everest_nodered --mount type=volume,source=nodered-config-volume,target=/data ghcr.io/everest/everest-dev-environment/nodered:v0.7.0
3 changes: 0 additions & 3 deletions cmake/config-run-nodered-script.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ function(generate_nodered_run_script)
set(SCRIPT_OUTPUT_FILE "${SCRIPT_OUTPUT_PATH}/nodered-${OPTNS_OUTPUT}.sh")
endif()

# other necessary variables
set(EVEREST_DOCKER_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/everest/docker")

configure_file("${EVEREST_CONFIG_ASSET_DIR}/run_nodered_template.sh.in" ${SCRIPT_OUTPUT_FILE})

endfunction()

0 comments on commit 488dcfa

Please sign in to comment.