fixed copy-local, fixed creating workdir

Author: edwardstock

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.12)
 project(dockerpack
-        VERSION 0.1.1
+        VERSION 0.1.2
         DESCRIPTION "DockerPack is a small simple docker-based local stateful CI to test and deploy projects that should be built on multiple environments."
         LANGUAGES CXX
         )

RELEASE_NOTES.md

@@ -1,5 +1,9 @@
 # Release notes
 
+## 0.1.2
+* Fixed creating working directory
+* Fixed --copy-local
+
 ## 0.1.1
 * Automatically create workdir if not exists
 * Added `--copy-local` argument. This function skips `checkout` command and copy all from current directory to working directory

dockerpack.yml

@@ -1,11 +1,12 @@
+debug: true
 commands_verbose: true
 checkout: git clone --recursive https://github.com/edwardstock/dockerpack.git .
 
 commands:
   make_project:
     steps:
       - bash cfg/package_make.sh -t package
-      - bash _build/package_upload.sh -t bintray
+      - bash _build/package_upload.sh -t bintray --dry-run
 
 multijob:
   images:

src/config.cpp

@@ -63,7 +63,7 @@ void dockerpack::config::parse(bool copy_local) {
         }
     }
     if (copy_local) {
-        copy_paths.push_back(m_cwd + " " + workdir);
+        copy_paths.push_back(m_cwd + "/. " + workdir);
     }
 
     if (config["include"]) {

src/docker.cpp

@@ -45,14 +45,14 @@ void dockerpack::docker::ensure_workdir(const dockerpack::job_ptr_t& job, const
     }
     std::stringstream cmd_builder;
     cmd_builder << "docker exec ";
-    cmd_builder << job->job_name() << " ";
 
     if (!job->envs.empty()) {
         for (const auto& kv : job->envs) {
             cmd_builder << "-e " << kv.first << "=" << kv.second << " ";
         }
     }
 
+    cmd_builder << job->job_name() << " ";
     cmd_builder << "bash -c \"";
     cmd_builder << "mkdir -p " << workdir;
     cmd_builder << "\"";
@@ -64,6 +64,9 @@ void dockerpack::docker::ensure_workdir(const dockerpack::job_ptr_t& job, const
     dockerpack::execmd cmd(cmd_builder.str());
     int status = 0;
     const std::string result = cmd.run(&status);
+    if (status) {
+        throw std::runtime_error("unable to create " + workdir);
+    }
 }
 
 bool dockerpack::docker::check_docker_exists() {

version

@@ -1 +1 @@
-0.1.1
+0.1.2