Merge pull request #100 from firecow/image-entrypoint-echo-variable

Add environment variables to docker create

Author: ZobairQ

src/job.ts

@@ -309,11 +309,16 @@ export class Job {
 
             let dockerCmd = ``;
             if (privileged) {
-                dockerCmd += `docker create --privileged -u 0:0 -i ${this.image} `;
+                dockerCmd += `docker create --privileged -u 0:0 -i `;
             } else {
-                dockerCmd += `docker create -u 0:0 -i ${this.image} `;
+                dockerCmd += `docker create -u 0:0 -i `;
             }
-            dockerCmd += `sh -c "\n`
+
+            for (const [key, value] of Object.entries(this.expandedVariables)) {
+                dockerCmd += `-e ${key}="${String(value).trim()}" `
+            }
+
+            dockerCmd += `${this.image} sh -c "\n`
             dockerCmd += `if [ -x /usr/local/bin/bash ]; then\n`
             dockerCmd += `\texec /usr/local/bin/bash \n`;
             dockerCmd += `elif [ -x /usr/bin/bash ]; then\n`;
@@ -332,6 +337,7 @@ export class Job {
             dockerCmd += `\techo shell not found\n`;
             dockerCmd += `\texit 1\n`;
             dockerCmd += `fi\n"`
+
             const {stdout: containerId} = await Utils.spawn(dockerCmd, this.cwd, {...process.env, ...this.expandedVariables,});
             this.containerId = containerId.replace("\n", "");
 

tests/cases.test.ts

@@ -131,6 +131,7 @@ test('image <test-entrypoint>', async () => {
 
     expect(mockProcessStdout).toHaveBeenCalledWith("/\n");
     expect(mockProcessStdout).toHaveBeenCalledWith("Hello from 'firecow/gitlab-ci-local-test-image' image entrypoint\n");
+    expect(mockProcessStdout).toHaveBeenCalledWith("I am epic multiline value\n");
     expect(mockProcessStdout).toHaveBeenCalledWith("/builds\n");
     expect(mockProcessStdout).toHaveBeenCalledWith("Test Entrypoint\n");
     expect(mockProcessStdout).toHaveBeenCalledWith("I'm a test file\n");

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

@@ -7,7 +7,14 @@ test-job:
     - echo "Test something"
 
 test-entrypoint:
+  # This image have an `echo ${MULTILINE_VARIABLE}` in its entry point
   image: firecow/gitlab-ci-local-test-image
+  variables:
+    MULTILINE_VARIABLE: |
+      I am
+      epic
+      multiline
+      value
   script:
     - pwd
     - echo "Test Entrypoint"