fix(jobs): will pull the docker image of the runner before starting it (

#62)
Zooz · Feb 20, 2019 · 4ebf829 · 4ebf829
1 parent aa69465
commit 4ebf829
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -41,9 +41,6 @@ jobs:
     - run: npm run unit-tests
     - store_artifacts:
         path: ./coverage
-    - run:
-        name: pull zooz/predator-runner:latest
-        command: ssh remote-docker \ docker pull zooz/predator-runner:latest
     - run:
         name: Integration tests with docker engine and sqlite configuration
         command: npm run integration-tests

diff --git a/src/jobs/models/docker/jobConnector.js b/src/jobs/models/docker/jobConnector.js
@@ -18,7 +18,22 @@ if (dockerConfig.host) {
 }
 let docker = new Docker(dockerConnection);
 
+const pullImage = async (dockerImage) => {
+    let dockerImageStream = await docker.pull(dockerImage);
+    return new Promise((resolve, reject) => {
+        docker.modem.followProgress(dockerImageStream, (err) => {
+            if (!err) {
+                return resolve();
+            } else {
+                return reject(err);
+            }
+        });
+    });
+};
+
 module.exports.runJob = async (dockerJobConfig) => {
+    await pullImage(dockerJobConfig.dockerImage);
+
     let envVarArray = Object.keys(dockerJobConfig.environmentVariables).map((envVar) => {
         return `${envVar}=${dockerJobConfig.environmentVariables[envVar]}`;
     });

diff --git a/tests/unit-tests/jobs/models/docker/jobConnector-test.js b/tests/unit-tests/jobs/models/docker/jobConnector-test.js
@@ -5,7 +5,7 @@ let rewire = require('rewire');
 let jobConnector = rewire('../../../../../src/jobs/models/docker/jobConnector');
 describe('Docker job connector tests', function () {
     let sandbox, createContainerStub, listContainersStub, getContainerStub, containerStopStub,
-        startContainerStub;
+        startContainerStub, pullStub, modemStub, followProgressStub;
 
     let dockerJobConfig = {
         environmentVariables: {
@@ -37,10 +37,20 @@ describe('Docker job connector tests', function () {
 
         getContainerStub.resolves({ stop: containerStopStub });
 
+        pullStub = sandbox.stub();
+
+        followProgressStub = sandbox.stub();
+        followProgressStub.yields();
+        modemStub = {
+            followProgress: followProgressStub
+        };
+
         jobConnector.__set__('docker', {
             createContainer: createContainerStub,
             listContainers: listContainersStub,
-            getContainer: getContainerStub
+            getContainer: getContainerStub,
+            pull: pullStub,
+            modem: modemStub
         });
     });
 
@@ -53,6 +63,9 @@ describe('Docker job connector tests', function () {
             dockerJobConfig.parallelism = 3;
             let jobResponse = await jobConnector.runJob(dockerJobConfig);
 
+            should(pullStub.callCount).eql(1);
+            should(pullStub.args[0][0]).eql('image');
+
             should(createContainerStub.callCount).eql(3);
 
             createContainerStub.callCount.should.eql(3);
@@ -96,6 +109,17 @@ describe('Docker job connector tests', function () {
             startContainerStub.callCount.should.eql(1);
         });
 
+        it('Fail to create a job - error on pulling image', async () => {
+            followProgressStub.yields(new Error('Failure pulling image'));
+
+            try {
+                await jobConnector.runJob(dockerJobConfig);
+                throw new Error('Should not get here');
+            } catch (error) {
+                error.should.eql(new Error('Failure pulling image'));
+            }
+        });
+
         it('Fail to create a job - error on create containers', async () => {
             createContainerStub.rejects(new Error('Failure to create docker'));