diff --git a/CMakeLists.txt b/CMakeLists.txt index 25f7597b1..96f25c0c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/cmake/assets/docker/Dockerfile b/cmake/assets/docker/Dockerfile deleted file mode 100644 index e44d7b0c8..000000000 --- a/cmake/assets/docker/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM nodered/node-red:2.2.3 -RUN npm install node-red-dashboard -RUN npm install node-red-contrib-ui-actions -RUN npm install node-red-node-ui-table -RUN npm install node-red-contrib-ui-level diff --git a/cmake/assets/run_nodered_template.sh.in b/cmake/assets/run_nodered_template.sh.in index 58c90fa2c..fcb0fea26 100755 --- a/cmake/assets/run_nodered_template.sh.in +++ b/cmake/assets/run_nodered_template.sh.in @@ -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 diff --git a/cmake/config-run-nodered-script.cmake b/cmake/config-run-nodered-script.cmake index 048413424..83089c935 100644 --- a/cmake/config-run-nodered-script.cmake +++ b/cmake/config-run-nodered-script.cmake @@ -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()