Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use latest aklite by default #3

Merged
merged 2 commits into from
Jul 10, 2024
Merged

Use latest aklite by default #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7763d8c
docker: Use the latest dev version of aklite
mike-sul Jul 10, 2024
1dac7b5
cli: Adjust client to the CLI API changes
mike-sul Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ services:
sotactl:
build:
context: .
args:
AKLITE_VER: master
dockerfile: Dockerfile

image: sotactl:latest
Expand Down
5 changes: 3 additions & 2 deletions src/cli.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <boost/process.hpp>

#include "aktualizr-lite/api.h"
#include "aktualizr-lite/aklite_client_ext.h"
#include "aktualizr-lite/cli/cli.h"
#include "cli.h"

Expand Down Expand Up @@ -112,7 +113,7 @@ static void print_status(aklite::cli::StatusCode ret) {
std::cout << std::endl;
}

static std::unique_ptr<AkliteClient> init_client(bool online_mode) {
static std::unique_ptr<AkliteClientExt> init_client(bool online_mode) {
boost::log::core::get()->set_filter(boost::log::trivial::severity >= boost::log::trivial::info);

std::vector<boost::filesystem::path> cfg_dirs;
Expand All @@ -132,7 +133,7 @@ static std::unique_ptr<AkliteClient> init_client(bool online_mode) {
}

try {
return std::make_unique<AkliteClient>(cfg_dirs, false, false);
return std::make_unique<AkliteClientExt>(cfg_dirs, false, false);
} catch (const std::exception& exc) {
LOG_ERROR << "Failed to initialize the client: " << exc.what();
return nullptr;
Expand Down
Loading