ADD: updated simcontrol and dockerfile

This commit is contained in:
hwinkel
2023-10-29 16:54:57 +01:00
parent 46287b0f8a
commit 9778aec6a1
7 changed files with 25 additions and 5 deletions

18
.vscode/c_cpp_properties.json vendored Normal file
View File

@@ -0,0 +1,18 @@
{
"configurations": [
{
"name": "Linux",
"includePath": [
"${workspaceFolder}/**",
"${workspaceFolder}/libs/**"
],
"defines": [],
"compilerPath": "/usr/bin/clang-13",
"cStandard": "c17",
"cppStandard": "c++14",
"intelliSenseMode": "linux-clang-x64",
"configurationProvider": "ms-vscode.cmake-tools"
}
],
"version": 4
}

View File

@@ -31,7 +31,7 @@ COPY build/libs/SimCore/libs/geographiclib/src/libGeographicLib.so.23 /usr/lib/
COPY build/libs/KubeControl/libs/yaml-cpp/libyaml-cpp.so.0.8 /usr/lib/ COPY build/libs/KubeControl/libs/yaml-cpp/libyaml-cpp.so.0.8 /usr/lib/
COPY build/libs/KubeControl/libs/curlpp/libcurlpp.so.1 /usr/lib/ COPY build/libs/KubeControl/libs/curlpp/libcurlpp.so.1 /usr/lib/
# COPY build/libs/EntityLibrary/libs/SimCore/libs/crossguid/libcrossguid.so.0 /usr/lib/ # COPY build/libs/EntityLibrary/libs/SimCore/libs/crossguid/libcrossguid.so.0 /usr/lib/
COPY build/libs/SimCore/libs/crossguid/libcrossguid.so.0 /usr/lib/ # COPY build/libs/SimCore/libs/crossguid/libcrossguid.so.0 /usr/lib/
COPY build/libs/ixwebsocket/libixwebsocket.so.0.1.0 /usr/lib/ COPY build/libs/ixwebsocket/libixwebsocket.so.0.1.0 /usr/lib/

View File

@@ -2,5 +2,7 @@ cd build/
make -j8 make -j8
cd .. cd ..
TAG="kmaster.ti.unibw-hamburg.de:30808/simcontrol:latest" TAG="kmaster.ti.unibw-hamburg.de:30808/simcontrol:latest"
# sudo buildah bud --pull -f "Dockerfile" -t ${TAG}
# buildah push ${TAG}
docker build --pull --rm -f "Dockerfile" -t ${TAG} "." docker build --pull --rm -f "Dockerfile" -t ${TAG} "."
docker image push ${TAG} docker image push ${TAG}

View File

@@ -37,7 +37,7 @@ namespace SimControl {
online_(online),CommandPort_(CommandPort),GroundTruthAddr_(GroundTruthAddr),GroundTruthPort_(GroundTruthPort),Namespace_(Namespace),ID_(SimCore::Identifier(xg::newGuid())) online_(online),CommandPort_(CommandPort),GroundTruthAddr_(GroundTruthAddr),GroundTruthPort_(GroundTruthPort),Namespace_(Namespace),ID_(SimCore::Identifier(xg::newGuid()))
{ {
// BroadcastListener_ = std::make_shared<WHISPER::InternalUDPListener>("239.0.0.1",10000); // BroadcastListener_ = std::make_shared<WHISPER::InternalUDPListener>("239.0.0.1",10000);
BroadcastListener_ = std::make_shared<WHISPER::InternalUDPListener>(GroundTruthPort_,GroundTruthAddr_); BroadcastListener_ = std::make_shared<WHISPER::InternalUDPListener>(GroundTruthAddr_,GroundTruthPort_);
BroadcastListener_->registerMessageCallback(std::bind(&SimControl::HandleBroadcastMessage,this,std::placeholders::_1)); BroadcastListener_->registerMessageCallback(std::bind(&SimControl::HandleBroadcastMessage,this,std::placeholders::_1));
BroadcastListener_->connect(); BroadcastListener_->connect();