Skip to content

Implement docker container commit #1

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

Open
fedemengo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Implement docker container commit #1

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
7709f57
Implement 'docker commit'
fedemengo Mar 9, 2019
13809cc
Implement 'docker commit'
fedemengo Mar 12, 2019
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
10 changes: 10 additions & 0 deletions include/DockerClientpp/DockerClient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,16 @@ class DockerClient {

json downloadImage(const string &imageName, const string &tag={}, const json &config={});

/**
* @brief Create a new image from container
*
* @param identifier container's id or name
* @param description of the commit
* @param tag name for the image
* @config configuration parameter for creating the image
*/
json commitImage(const string &idOrName, const string &repo, const string &message, const string &tag={}, const json &config={});

void killContainer(const std::string &idOrName);

int waitContainer(const std::string &idOrName);
Expand Down
47 changes: 46 additions & 1 deletion src/DockerClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ class DockerClient::Impl {
string inspectExecution(const string &id);
string getContainerStats(const string &id);
json downloadImage(const string &imageName, const string &tag, const json &config);
void killContainer(const std::string &idOrName);
json commitImage(const string &idOrName, const string &repo, const string &message, const string &tag, const json &config);
void killContainer(const std::string &idOrName);
int waitContainer(const std::string &idOrName);
string getLogs(const string &id,bool stdoutFlag=true, bool stderrFlag=true, int tail=-1);
ExecRet executeCommand(const string &identifier, const vector<string> &cmd);
Expand Down Expand Up @@ -289,6 +290,47 @@ json DockerClient::Impl::downloadImage(const string &imageName, const string &ta

}

json DockerClient::Impl::commitImage(const string &idOrName, const string &repo, const string &message, const string &tag, const json &config) {
string post_data = config.dump();
Header header = createCommonHeader(post_data.size());
Uri uri = "/commit";

std::string cleanMessage(message);
std::replace(cleanMessage.begin(), cleanMessage.end(), ' ', '+');

QueryParam query_param{
{"container", idOrName},
{"repo", repo},
{"comment", cleanMessage},
{"tag", tag}
};
shared_ptr<Response> res =
http_client.Post(uri, header, query_param, post_data);
std::string body;
if(!res->body.empty()){
body = "["+res->body+']';
std::replace( body.begin(), body.end(), '\n', ',');
std::replace( body.begin(), body.end(), '\r', ' ');
std::size_t found = body.find_last_of(',');
body[found]=' ';
}
switch (res->status_code) {
case 201: {
json newbody = json::parse(body);
return newbody;
}
case 400: {
throw DockerOperationError(uri, res->status_code,
"Bad request format");
}
default: {
json body = json::parse(res->body);
throw DockerOperationError(uri, res->status_code,
body["message"].get<string>());
}
}
}

string DockerClient::Impl::inspectExecution(const string &id) {
Header header = createCommonHeader(0);
Uri uri = "/exec/" + id + "/json";
Expand Down Expand Up @@ -426,6 +468,9 @@ json DockerClient::downloadImage(const string &imageName, const string &tag, con
return m_impl->downloadImage(imageName,tag,config);
}

json DockerClient::commitImage(const string &idOrName, const string &repo, const string &message, const string &tag, const json &config){
return m_impl->commitImage(idOrName, repo, message, tag, config);
}

void DockerClient::startContainer(const string &identifier) {
m_impl->startContainer(identifier);
Expand Down