From fbe1a0b2ec3a3de02da3727288559c9497ac1c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20M=2E=20Thi=C3=A9ry?= <nthiery@users.sf.net>
Date: Mon, 23 Nov 2015 11:44:42 +0100
Subject: [PATCH] Mise a jour commentaires
---
.../docker-compile-and-run.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/test~coding~readingCppPrograms.fr/docker-compile-and-run.cpp b/test~coding~readingCppPrograms.fr/docker-compile-and-run.cpp
index b0584b8..bc0fde9 100644
--- a/test~coding~readingCppPrograms.fr/docker-compile-and-run.cpp
+++ b/test~coding~readingCppPrograms.fr/docker-compile-and-run.cpp
@@ -112,14 +112,14 @@ void docker_exec(string docker_id, vector<string> args) {
vector<string> docker_args = {"exec", "-i", docker_id};
for (auto arg: args)
docker_args.push_back(arg);
- //docker_oldexec(docker_id, command);
exec(docker, docker_args);
}
void docker_cp(string docker_id, string source, string target) {
// See http://stackoverflow.com/questions/22907231/copying-files-from-host-to-docker-container
- // Better replace with 'docker cp' of docker 1.8
- exec(docker, {"exec", "-i", docker_id, "/bin/bash", "-c", "cat > "+target,},
+ // TODO: replace with 'docker cp' of docker 1.8 when possible
+ exec(docker,
+ {"exec", "-i", docker_id, "/bin/bash", "-c", "cat > "+target,},
source, "", "");
}
--
GitLab