#68 Added enviorment parameter for both build args and env pass through. Added proper testcase to test both use case

Author: navarasu

examples/use-docker-file-with-enviornment/Dockerfile

@@ -0,0 +1,11 @@
+FROM lambci/lambda:build-ruby2.7
+
+RUN gem update bundler
+
+ARG USE_HTTPARTY
+ENV USE_HTTPARTY=${USE_HTTPARTY}
+ARG NOKOGIRI_VERSION
+ENV NOKOGIRI_VERSION=${NOKOGIRI_VERSION}
+
+CMD "/bin/bash"
+

examples/use-docker-file-with-enviornment/Gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+if ENV['USE_HTTPARTY']
+  gem 'httparty', '0.18.1'
+else
+  gem 'http'
+end
+if ENV['NOKOGIRI_VERSION']
+  gem 'nokogiri', ENV['NOKOGIRI_VERSION']
+else
+  gem 'nokogiri'
+end

examples/use-docker-file-with-enviornment/handler.rb

@@ -0,0 +1,7 @@
+require 'httparty'
+
+def hello(event:, context:)
+  body = HTTParty.get("https://github.com").body
+
+  { statusCode: 200, body: body }
+end

examples/use-docker-file-with-enviornment/serverless.yml

@@ -0,0 +1,20 @@
+service: use-docker-file-with-enviornment
+
+plugins:
+  - serverless-ruby-layer
+
+custom:
+  rubyLayer:
+    use_docker: true
+    docker_file: Dockerfile
+    environment:
+      - USE_HTTPARTY
+      - NOKOGIRI_VERSION=1.10.10
+
+provider:
+  name: aws
+  runtime: ruby2.7
+
+functions:
+  hello:
+    handler: handler.hello

examples/use-docker-with-enviornment/Gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+if ENV['USE_HTTPARTY']
+  gem 'httparty', '0.18.1'
+else
+  gem 'http'
+end
+if ENV['NOKOGIRI_VERSION']
+  gem 'nokogiri', ENV['NOKOGIRI_VERSION']
+else
+  gem 'nokogiri'
+end

examples/use-docker-with-enviornment/handler.rb

@@ -0,0 +1,7 @@
+require 'httparty'
+
+def hello(event:, context:)
+  body = HTTParty.get("https://github.com").body
+
+  { statusCode: 200, body: body }
+end

examples/use-docker-with-enviornment/serverless.yml

@@ -0,0 +1,19 @@
+service: use-docker-with-enviornment
+
+plugins:
+  - serverless-ruby-layer
+
+custom:
+  rubyLayer:
+    use_docker: true
+    environment:
+      - USE_HTTPARTY
+      - NOKOGIRI_VERSION=1.10.10
+
+provider:
+  name: aws
+  runtime: ruby2.7
+
+functions:
+  hello:
+    handler: handler.hello

lib/bundle.js

@@ -70,16 +70,19 @@ function bundleInstall(){
       fs.copySync(docker_file_path,
                   path.join(this.ruby_layer,'Dockerfile'))
       buildDocker = true
-    }else if (this.options.docker_yums) {
+    }else if (this.options.docker_yums || this.options.environment) {
       docker_steps =['FROM lambci/lambda:build-'+this.serverless.service.provider.runtime]
-      this.options.docker_yums.forEach(function(package_name) {
-        docker_steps.push('RUN yum install -y '+package_name)
-      })
+      if (this.options.docker_yums) {
+        this.options.docker_yums.forEach(function(package_name) {
+          docker_steps.push('RUN yum install -y '+package_name)
+        })
+      }
       docker_steps.push('RUN gem update bundler')
-      if(this.options.docker_env_variable){
-        this.options.docker_env_variable.forEach(function(build_arg) {
-          docker_steps.push('ARG ' + build_arg)
-          docker_steps.push('ENV ' + build_arg + '=${' + build_arg + '}')
+      if(this.options.environment){
+        this.options.environment.forEach(function(env_arg) {
+          env_arg_name = env_arg.split('=')[0]
+          docker_steps.push('ARG ' + env_arg_name)
+          docker_steps.push('ENV ' + env_arg_name + '=${' + env_arg_name + '}')
         })
       }
       docker_steps.push('CMD "/bin/bash"')
@@ -90,16 +93,10 @@ function bundleInstall(){
       this.cli.log("Building docker for bundle install")
       docker_name ='ruby-layer:docker'
       docker_args = ['build', '-t', docker_name, '-f', 'Dockerfile']
-      if(this.options.docker_build_args){
-        this.options.docker_build_args.forEach(function(build_arg) {
-          docker_args.push('--build-arg')
-          docker_args.push(build_arg)
-        })
-      }
-      if(this.options.docker_env_variable){
-        this.options.docker_env_variable.forEach(function(build_arg) {
+      if(this.options.environment){
+        this.options.environment.forEach(function(env_arg) {
           docker_args.push('--build-arg')
-          docker_args.push(build_arg)
+          docker_args.push(env_arg)
         })
       }
       docker_args.push('.')

test/test.js

@@ -58,6 +58,14 @@ let test_data = [
     '/gems/', '/specifications/','/gems/httparty-0.18.1/', '/gems/mime-types-data-3.2020.1104/', '/gems/multi_xml-0.6.0/', '/gems/mime-types-3.3.1/',
     '/gems/nokogiri-1.11.3-x86_64-linux/', '/gems/racc-1.5.2/', '/extensions/x86_64-linux/', '/gems/mini_portile2-2.5.1/' ],
     function_files: ['Gemfile', 'Gemfile.lock', 'handler.rb'], include_functions: ['Hello'], exclude_functions:[], check_version: true },
+
+  { folder: 'use-docker-with-enviornment', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/gems/', '/plugins/',
+    '/specifications/','/extensions/x86_64-linux/','/gems/httparty/', '/gems/mime-types-data/', '/gems/multi_xml/', '/gems/mime-types/', 
+    '/gems/nokogiri/', '/gems/mini_portile2/'], function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[] },
+
+  { folder: 'use-docker-file-with-enviornment', gem_zip_dirs: ['/','/bin/','/build_info/','/doc/','/extensions/', '/gems/', '/plugins/',
+    '/specifications/','/extensions/x86_64-linux/','/gems/httparty/', '/gems/mime-types-data/', '/gems/multi_xml/', '/gems/mime-types/', 
+    '/gems/nokogiri/', '/gems/mini_portile2/'], function_files: ['handler.rb'], include_functions: ['Hello'], exclude_functions:[] },
 ]
 
 describe('serverless package', function () {