Merge pull request #80 from firecow/fix-entrypoint-pwd-and-output

Fixed entrypoint pwd, and made sure entrypoint output actually gets caught

Author: ZobairQ

src/job.ts

@@ -301,7 +301,7 @@ export class Job {
             process.stdout.write(`${this.getJobNameString()} ${magentaBright('pulled')} in ${magenta(prettyHrtime(endTime))}\n`);
 
             let dockerCmd = ``;
-            dockerCmd += `docker run -u 0:0 -d -i -w //builds/ ${this.image} `;
+            dockerCmd += `docker create -u 0:0 -i ${this.image} `;
             dockerCmd += `sh -c "\n`
             dockerCmd += `if [ -x /usr/local/bin/bash ]; then\n`
             dockerCmd += `\texec /usr/local/bin/bash \n`;
@@ -331,7 +331,7 @@ export class Job {
             process.stdout.write(`${this.getJobNameString()} ${magentaBright('copied')} in ${magenta(prettyHrtime(endTime))}\n`);
         }
 
-        const cp = childProcess.spawn(this.containerId ? `docker attach ${this.containerId}` : `bash -e`, {
+        const cp = childProcess.spawn(this.containerId ? `docker start --attach -i ${this.containerId}` : `bash -e`, {
             shell: 'bash',
             stdio: ['pipe', 'pipe', 'pipe'],
             cwd: this.cwd,
@@ -340,6 +340,7 @@ export class Job {
         cp.stdin.write(`set -eo pipefail\n`);
 
         if (this.image) {
+            cp.stdin.write(`cd /builds/\n`);
             cp.stdin.write(`chown root:root -R .\n`);
             cp.stdin.write(`chmod a+w -R .\n`);
         }

tests/cases.test.ts

@@ -100,6 +100,20 @@ test('image <test-job>', async () => {
     expect(mockProcessStdout).toHaveBeenCalledWith("Test something\n");
 });
 
+test('image <test-entrypoint>', async () => {
+    await defaultCmd.handler({
+        cwd: 'tests/test-cases/image',
+        job: 'test-entrypoint'
+    });
+
+    expect(mockProcessStdout).toHaveBeenCalledWith("/\n");
+    expect(mockProcessStdout).toHaveBeenCalledWith("Hello from 'firecow/gitlab-ci-local-test-image' image entrypoint\n");
+    expect(mockProcessStdout).toHaveBeenCalledWith("/builds\n");
+    expect(mockProcessStdout).toHaveBeenCalledWith("Test Entrypoint\n");
+    expect(mockProcessStdout).toHaveBeenCalledWith("I'm a test file\n");
+
+});
+
 test('no-script <test-job>', async () => {
     try {
         await defaultCmd.handler({

tests/test-cases/image/.gitlab-ci.yml

@@ -5,3 +5,10 @@ test-job:
   image: ${PHP_IMAGE_URL}
   script:
     - echo "Test something"
+
+test-entrypoint:
+  image: firecow/gitlab-ci-local-test-image
+  script:
+    - pwd
+    - echo "Test Entrypoint"
+    - cat test-file.txt

tests/test-cases/image/test-file.txt

@@ -0,0 +1 @@
+I'm a test file