feat: allow to define image instead of building them (#161)

* feat: allow to define image instead of building them

* docs: add note in README

Author: Bemilie

README.md

@@ -150,6 +150,7 @@ The configuration includes the following parameters:
 * `package.patterns`: you can leave this parameter at default, or enable it to include/exclude directories to/from the deployment
 * `functions`: configuration of your functions. It is a `.yml` dictionary, and the key is the function name 
   * `handler` (Required): file or function which will be executed. See the next section for runtime specific handlers
+  * `registryImage` (Containers only, Optional): name of the registry image. If no registry image is provided, the image will be build locally using the Dockerfile.
   * `env` (Optional): environment variables specific to the current function
   * `secret` (Optional): secret environment variables specific to the current function, see [this example project](./examples/secrets)
   * `minScale` (Optional): how many function instances we keep running (default: 0)

deploy/lib/createContainers.js

@@ -86,6 +86,7 @@ module.exports = {
       cpu_limit: container.cpuLimit,
       min_scale: container.minScale,
       max_scale: container.maxScale,
+      registry_image: container.registryImage,
       max_concurrency: container.maxConcurrency,
       timeout: container.timeout,
       privacy: container.privacy,
@@ -119,7 +120,7 @@ module.exports = {
       cpu_limit: container.cpuLimit,
       min_scale: container.minScale,
       max_scale: container.maxScale,
-      registry_image: `${this.namespace.registry_endpoint}/${container.name}:latest`,
+      registry_image: container.registryImage ? container.registryImage : `${this.namespace.registry_endpoint}/${container.name}:latest`,
       max_concurrency: container.maxConcurrency,
       timeout: container.timeout,
       privacy: container.privacy,

examples/container/serverless.yml

@@ -19,14 +19,15 @@ custom:
   containers:
     first:
       directory: my-container
+      # registryImage: ""
+      # port: 8080
       # description: ""
       # minScale: 1
       # memoryLimit: 256
       # cpuLimit: 140
       # maxScale: 2
       # maxConcurrency: 50
       # timeout: "20s"
-      # port: 8080
       # httpOption: redirected
       # Local environment variables - used only in given function
       env:

tests/containers/containers.test.js

@@ -7,10 +7,13 @@ const Docker = require('dockerode');
 const tar = require('tar-fs');
 
 const { getTmpDirPath, replaceTextInFile } = require('../utils/fs');
-const { getServiceName, sleep, serverlessDeploy, serverlessRemove} = require('../utils/misc');
+const { getServiceName, sleep, serverlessDeploy, serverlessRemove,
+  serverlessInvoke
+} = require('../utils/misc');
 const { ContainerApi, RegistryApi } = require('../../shared/api');
 const { CONTAINERS_API_URL, REGISTRY_API_URL } = require('../../shared/constants');
 const { execSync, execCaptureOutput } = require('../../shared/child-process');
+const { it } = require('@jest/globals');
 
 const serverlessExec = path.join('serverless');
 
@@ -133,11 +136,22 @@ describe('Service Lifecyle Integration Test', () => {
 
   it('should invoke updated container from scaleway', async () => {
     await sleep(30000);
-
     let output = execCaptureOutput(serverlessExec, ['invoke', '--function', containerName]);
     expect(output).to.be.equal('{"message":"Container successfully updated"}');
   });
 
+  it('should deploy with registry image specified', () => {
+    replaceTextInFile('serverless.yml', '# registryImage: ""', 'registryImage: docker.io/library/nginx:latest');
+    replaceTextInFile('serverless.yml', '# port: 8080', 'port: 80');
+    serverlessDeploy();
+  });
+
+  it('should invoke updated container with specified registry image', async () => {
+    await sleep(30000);
+    let output = execCaptureOutput(serverlessExec, ['invoke', '--function', containerName]);
+    expect(output).to.contain('Welcome to nginx!');
+  });
+
   it('should remove service from scaleway', async () => {
     serverlessRemove();
     try {