Pull image being deployed if no tar is given

Author: yamalight

src/docker/templates/image.js

@@ -20,15 +20,21 @@ exports.executeTemplate = async ({config, username, tempDockerDir, folder, resul
   // build docker image
   try {
     const {image, imageFile} = config;
-    util.writeStatus(resultStream, {message: `Deploying project from image: ${image}..`, level: 'info'});
+    const imageName = image.includes(':') ? image : `${image}:latest`;
+    util.writeStatus(resultStream, {message: `Deploying project from image: ${imageName}..`, level: 'info'});
 
     // import from tar if needed
     if (imageFile && imageFile.length) {
       util.writeStatus(resultStream, {message: `Importing image from file: ${imageFile}..`, level: 'info'});
       // get packed stream
       const tarStream = fs.createReadStream(path.join(tempDockerDir, folder, imageFile));
-      const importRes = await docker.daemon.loadImage(tarStream, {tag: image});
+      const importRes = await docker.daemon.loadImage(tarStream, {tag: imageName});
       util.logger.debug('Import result:', importRes);
+    } else {
+      // otherwise - pull given image to ensure it exists
+      util.writeStatus(resultStream, {message: `Pulling image: ${imageName}..`, level: 'info'});
+      const pullRes = await docker.pullImage(imageName);
+      util.logger.debug('Pull result:', pullRes);
     }
 
     // start image

src/routes/deploy.js

@@ -9,6 +9,7 @@ const logger = require('../logger');
 const util = require('../util');
 const {getConfig, tempDockerDir} = require('../config');
 const docker = require('../docker/docker');
+const {pullImage} = require('../docker/init');
 const {build} = require('../docker/build');
 const {start} = require('../docker/start');
 const getTemplates = require('../docker/templates');
@@ -42,6 +43,7 @@ const deploy = async ({username, folder, existing, resultStream}) => {
       daemon: docker,
       build,
       start,
+      pullImage,
     },
     util: Object.assign({}, util, {
       logger,

test/deploy.test.js

@@ -18,6 +18,7 @@ const {initNetwork} = require('../src/docker/network');
 
 // create tar streams
 const streamDockerImage = tar.pack(path.join(__dirname, 'fixtures', 'docker-image-project'));
+const streamDockerImageExternal = tar.pack(path.join(__dirname, 'fixtures', 'docker-image-external'));
 const streamDocker = tar.pack(path.join(__dirname, 'fixtures', 'docker-project'));
 const streamNode = tar.pack(path.join(__dirname, 'fixtures', 'node-project'));
 const streamNodeLock = tar.pack(path.join(__dirname, 'fixtures', 'node-lock-project'));
@@ -158,6 +159,52 @@ test('Should deploy simple project from image and image tar', async done => {
   done();
 });
 
+test('Should deploy simple project from external image', async done => {
+  const options = Object.assign(optionsBase, {
+    payload: streamDockerImageExternal,
+  });
+
+  const response = await fastify.inject(options);
+  // parse result into lines
+  const result = response.payload
+    .split('\n')
+    .filter(l => l && l.length)
+    .map(line => JSON.parse(line));
+
+  // find deployments
+  const completeDeployments = result.find(it => it.deployments && it.deployments.length).deployments;
+
+  // check response
+  expect(response.statusCode).toEqual(200);
+  expect(completeDeployments.length).toEqual(1);
+  expect(completeDeployments[0].Name.startsWith('/busybox')).toBeTruthy();
+
+  // check docker services
+  const allContainers = await docker.listContainers();
+  const containerInfo = allContainers.find(c => c.Names.includes(completeDeployments[0].Name));
+  const name = completeDeployments[0].Name.slice(1);
+
+  expect(containerInfo).toBeDefined();
+  expect(containerInfo.Labels['exoframe.deployment']).toEqual(name);
+  expect(containerInfo.Labels['exoframe.user']).toEqual('admin');
+  expect(containerInfo.Labels['exoframe.project']).toEqual('test-extimage-project');
+  expect(containerInfo.Labels['traefik.backend']).toEqual(`${name}.test`);
+  expect(containerInfo.Labels['traefik.docker.network']).toEqual('exoframe');
+  expect(containerInfo.Labels['traefik.enable']).toEqual('true');
+  expect(containerInfo.NetworkSettings.Networks.exoframe).toBeDefined();
+
+  const containerData = docker.getContainer(containerInfo.Id);
+  const container = await containerData.inspect();
+  expect(container.NetworkSettings.Networks.exoframe.Aliases.includes('testextimage')).toBeTruthy();
+  expect(container.HostConfig.RestartPolicy).toMatchObject({Name: 'no', MaximumRetryCount: 0});
+
+  // cleanup
+  const instance = docker.getContainer(containerInfo.Id);
+  await instance.remove({force: true});
+
+  done();
+});
+
 test('Should deploy simple node project', async done => {
   const options = Object.assign(optionsBase, {
     payload: streamNode,

test/fixtures/docker-image-external/exoframe.json

@@ -0,0 +1,7 @@
+{
+  "name": "test-docker-extimage-deploy",
+  "hostname": "testextimage",
+  "project": "test-extimage-project",
+  "restart": "no",
+  "image": "busybox"
+}