localstack
diff --git a/‎Makefile
Lines changed: 1 addition & 1 deletion b/‎Makefile
Lines changed: 1 addition & 1 deletion
diff --git a/‎bin/localstack
Lines changed: 1 addition & 1 deletion b/‎bin/localstack
Lines changed: 1 addition & 1 deletion
diff --git a/‎localstack/services/awslambda/lambda_api.py
Lines changed: 6 additions & 4 deletions b/‎localstack/services/awslambda/lambda_api.py
Lines changed: 6 additions & 4 deletions
diff --git a/‎localstack/services/install.py
Lines changed: 6 additions & 3 deletions b/‎localstack/services/install.py
Lines changed: 6 additions & 3 deletions
@@ -44,7 +44,7 @@ init:              ## Initialize the infrastructure, make sure all libs are down
 	$(VENV_RUN); PYTHONPATH=. exec python localstack/services/install.py libs
 
 infra<
10000
/span>:             ## Manually start the local infrastructure for testing
-	($(VENV_RUN); exec bin/localstack start)
+	($(VENV_RUN); exec bin/localstack start --host)
 
 docker-build:      ## Build Docker image
 	docker build -t $(IMAGE_NAME) .
 
@@ -23,7 +23,7 @@ import glob
 import json
 import traceback
 
-PARENT_FOLDER = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))
+PARENT_FOLDER = os.path.realpath(os.path.join(os.path.dirname(os.path.realpath(__file__)), '..'))
 venv_dir = os.path.join(PARENT_FOLDER, '.venv')
 if os.path.isdir(venv_dir):
     for path in glob.glob(os.path.join(venv_dir, 'lib/python*/site-packages')):
 
@@ -465,8 +465,6 @@ def execute(event, context):
 
 
 def set_archive_code(code, lambda_name, zip_file_content=None):
-    # get file content
-    zip_file_content = zip_file_content or get_zip_bytes(code)
 
     # get metadata
     lambda_arn = func_arn(lambda_name)
@@ -483,6 +481,9 @@ def set_archive_code(code, lambda_name, zip_file_content=None):
         # this folder to TMP_FILES or similar).
         return code['S3Key']
 
+    # get file content
+    zip_file_content = zip_file_content or get_zip_bytes(code)
+
     # Save the zip file to a temporary file that the lambda executors can reference
     code_sha_256 = base64.standard_b64encode(hashlib.sha256(zip_file_content).digest())
     lambda_details.get_version('$LATEST')['CodeSize'] = len(zip_file_content)
@@ -514,8 +515,9 @@ def generic_handler(event, context):
 
     if code_passed:
         lambda_cwd = lambda_cwd or set_archive_code(code_passed, lambda_name)
-        # Save the zip file to a temporary file that the lambda executors can reference
-        zip_file_content = get_zip_bytes(code_passed)
+        if not is_local_mount:
+            # Save the zip file to a temporary file that the lambda executors can reference
+            zip_file_content = get_zip_bytes(code_passed)
     else:
         lambda_cwd = lambda_cwd or lambda_details.cwd
 
 
@@ -31,6 +31,9 @@
 URL_LOCALSTACK_FAT_JAR = ('https://repo1.maven.org/maven2/' +
     'cloud/localstack/localstack-utils/{v}/localstack-utils-{v}-fat.jar').format(v=LOCALSTACK_MAVEN_VERSION)
 
+# Target version for javac, to ensure compatibility with earlier JREs
+JAVAC_TARGET_VERSION = '1.8'
+
 # set up logger
 LOGGER = logging.getLogger(__name__)
 
@@ -151,7 +154,7 @@ def install_amazon_kinesis_client_libs():
     java_files = '%s/utils/kinesis/java/cloud/localstack/*.java' % ROOT_PATH
     class_files = '%s/utils/kinesis/java/cloud/localstack/*.class' % ROOT_PATH
     if not glob.glob(class_files):
-        run('javac -cp "%s" %s' % (classpath, java_files))
+        run('javac -target %s -cp "%s" %s' % (JAVAC_TARGET_VERSION, classpath, java_files))
 
 
 def install_lambda_java_libs():
@@ -225,7 +228,7 @@ def download_and_extract():
             logging.basicConfig(level=logging.INFO)
             logging.getLogger('requests').setLevel(logging.WARNING)
             install_all_components()
-            print('Done.')
-        elif sys.argv[1] == 'testlibs':
+        if sys.argv[1] in ('libs', 'testlibs'):
             # Install additional libraries for testing
             install_amazon_kinesis_client_libs()
+        print('Done.')