Skip to content

Commit

Permalink
Merge pull request #305 from mateusz-hobgarski-red/release/v3.8
Browse files Browse the repository at this point in the history
RDK-45299: Release v3.8.1
  • Loading branch information
mateusz-hobgarski-red authored Jan 9, 2024
2 parents 4d3af5d + 2320c3d commit e315f4a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ cmake_minimum_required( VERSION 3.7.0 )
include(GNUInstallDirs)

# Project setup
project( Dobby VERSION "3.8.0" )
project( Dobby VERSION "3.8.1" )


# Set the major and minor version numbers of dobby (also used by plugins)
set( DOBBY_MAJOR_VERSION 3 )
set( DOBBY_MINOR_VERSION 8 )
set( DOBBY_MICRO_VERSION 0 )
set( DOBBY_MICRO_VERSION 1 )

set(INSTALL_CMAKE_DIR lib/cmake/Dobby)

Expand Down
12 changes: 12 additions & 0 deletions daemon/lib/source/DobbyManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -842,6 +842,18 @@ int32_t DobbyManager::startContainerFromSpec(const ContainerId &id,
return -1;
}

// Set Apparmor profile
if (mSettings->apparmorSettings().enabled)
{
config->setApparmorProfile(mSettings->apparmorSettings().profileName);
}

// Set pids limit
if (mSettings->pidsSettings().enabled)
{
config->setPidsLimit(mSettings->pidsSettings().limit);
}

// Load the RDK plugins from disk (if necessary)
std::map<std::string, Json::Value> rdkPlugins = config->rdkPlugins();
AI_LOG_DEBUG("There are %zd rdk plugins to run", rdkPlugins.size());
Expand Down

0 comments on commit e315f4a

Please sign in to comment.