release v0.8.3; optimize base Docker image size (localstack#487)

whummer · web-flow · commit 5bfb6b723097 · 2017-11-25T18:01:11.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -44,8 +44,7 @@ script:
   #   but instead reinstall using 2.x here, as that allows us to use some cached libs etc.
   - "make reinstall-p2 > /dev/null"
   - make init
-  - DEBUG=1 LAMBDA_EXECUTOR=docker make test
-  - LAMBDA_EXECUTOR=local USE_SSL=1 make test
+  - DEBUG=1 LAMBDA_EXECUTOR=docker USE_SSL=1 make test
   # run Java tests
   - make test-java-if-changed
   # build Docker image, and push it (if on master branch)
diff --git a/README.md b/README.md
@@ -327,6 +327,7 @@ localstack web
 
 ## Change Log
 
+* v0.8.3: Fix DDB stream events for UPDATE operations; fix DDB streams sequence numbers; fix transfer-encoding for DDB; fix requests with missing content-length header; support non-ascii content in DynamoDB items; map external port for SQS queue URLs; default to LAMBDA_REMOTE_DOCKER=true if running in Docker; S3 lifecycle support; reduce Docker image size
 * v0.8.2: Fix S3 bucket notification configuration; CORS headers for API Gateway; fix >128k S3 multipart uploads; return valid ShardIDs in DynamoDB Streams; fix hardcoded "ddblocal" DynamoDB TableARN; import default service ports from localstack-client; fix S3 bucket policy response; Execute lambdas asynchronously if the source is a topic
 * v0.8.1: Improvements in Lambda API: publish-version, list-version, function aliases; use single map with Lambda function details; workaround for SQS .fifo queues; add test for S3 upload; initial support for SSM; fix regex to replace SQS queue URL hostnames; update linter (single quotes); use `docker.for.mac.localhost` to connect to LocalStack from Docker on Mac; fix b64 encoding for Java Lambdas; fix path of moto_server command
 * v0.8.0: Fix request data in `GenericProxyHandler`; add `$PORT_WEB_UI` and `$HOSTNAME_EXTERNAL` configs; API Gateway path parameters; enable flake8 linting; add config for service backend URLs; use ElasticMQ instead of moto for SQS; expose `$LOCALSTACK_HOSTNAME`; custom environment variable support for Lambda; improve error logging and installation for Java/JUnit; add support for S3 REST Object POST
diff --git a/bin/Dockerfile.base b/bin/Dockerfile.base
@@ -4,11 +4,18 @@ MAINTAINER Waldemar Hummer (waldemar.hummer@gmail.com)
 LABEL authors="Waldemar Hummer (waldemar.hummer@gmail.com)"
 
 # install some common libs
-RUN apk add --no-cache autoconf automake build-base ca-certificates curl docker git \
+RUN apk add --no-cache autoconf automake build-base ca-certificates curl git \
         libffi-dev libtool linux-headers make openssl openssl-dev python python-dev \
         py-pip supervisor tar xz zip && \
     update-ca-certificates
 
+# install Docker (CLI only)
+RUN docker_version=17.05.0-ce; \
+  curl -fsSLO https://get.docker.com/builds/Linux/x86_64/docker-$docker_version.tgz \
+  && tar xzvf docker-$docker_version.tgz \
+  && mv docker/docker /usr/local/bin \
+  && rm -r docker docker-$docker_version.tgz
+
 # Install Java - taken from official repo:
 # https://github.com/docker-library/openjdk/blob/master/8-jdk/alpine/Dockerfile)
 ENV LANG C.UTF-8
@@ -24,7 +31,6 @@ ENV JAVA_ALPINE_VERSION 8.131.11-r2
 RUN set -x && apk add --no-cache openjdk8="$JAVA_ALPINE_VERSION" \
     && [ "$JAVA_HOME" = "$(docker-java-home)" ]
 
-
 # Install Maven - taken from official repo:
 # https://github.com/carlossg/docker-maven/blob/master/jdk-8/Dockerfile)
 ARG MAVEN_VERSION=3.5.2
@@ -50,6 +56,8 @@ ADD requirements.txt .
 RUN mkdir -p /opt/code/localstack/localstack/infra && \
     wget -O /tmp/localstack.es.zip \
         https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.3.0.zip && \
+    wget -O /tmp/elasticmq-server.jar \
+        https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-0.13.8.jar && \
     (cd localstack/infra/ && unzip -q /tmp/localstack.es.zip && \
         mv elasticsearch* elasticsearch && rm /tmp/localstack.es.zip) && \
     mkdir -p /opt/code/localstack/localstack/infra/dynamodb && \
@@ -72,3 +80,11 @@ ADD localstack/dashboard/web/package.json localstack/dashboard/web/package.json
 
 # install web dashboard dependencies
 RUN make install-web
+
+# install npm dependencies
+ADD localstack/package.json localstack/package.json
+RUN cd localstack && npm install
+
+# clean up (layers are later squashed into a single one)
+RUN rm -rf /root/.npm; \
+  apk del --purge autoconf automake build-base linux-headers openssl-dev python-dev
diff --git a/localstack/constants.py b/localstack/constants.py
@@ -2,7 +2,7 @@
 import localstack_client.config
 
 # LocalStack version
-VERSION = '0.8.2'
+VERSION = '0.8.3'
 
 # default AWS region
 if 'DEFAULT_REGION' not in os.environ:
@@ -71,6 +71,8 @@
 # installation constants
 ELASTICSEARCH_JAR_URL = 'https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.3.0.zip'
 DYNAMODB_JAR_URL = 'https://s3-us-west-2.amazonaws.com/dynamodb-local/dynamodb_local_latest.zip'
+ELASTICMQ_JAR_URL = 'https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-0.13.8.jar'
+STS_JAR_URL = 'http://central.maven.org/maven2/com/amazonaws/aws-java-sdk-sts/1.11.14/aws-java-sdk-sts-1.11.14.jar'
 
 # API endpoint for analytics events
 API_ENDPOINT = 'https://api.localstack.cloud/v1'
diff --git a/localstack/services/awslambda/lambda_api.py b/localstack/services/awslambda/lambda_api.py
@@ -266,6 +266,11 @@ def run_lambda(func, event, context, func_arn, suppress_output=False, async=Fals
         runtime = arn_to_lambda.get(func_arn).runtime
         handler = arn_to_lambda.get(func_arn).handler
         environment = arn_to_lambda.get(func_arn).envvars
+
+        # configure USE_SSL in environment
+        if config.USE_SSL:
+            environment['USE_SSL'] = '1'
+
         if use_docker():
             handler_args = '"%s"' % handler
             entrypoint = ''
diff --git a/localstack/services/install.py b/localstack/services/install.py
@@ -6,7 +6,7 @@
 import shutil
 import logging
 import tempfile
-from localstack.constants import (DEFAULT_SERVICE_PORTS,
+from localstack.constants import (DEFAULT_SERVICE_PORTS, ELASTICMQ_JAR_URL, STS_JAR_URL,
     ELASTICSEARCH_JAR_URL, DYNAMODB_JAR_URL, LOCALSTACK_MAVEN_VERSION)
 from localstack.utils.common import download, parallelize, run, mkdir, save_file, unzip, rm_rf
 
@@ -24,8 +24,6 @@
 TMP_ARCHIVE_DDB = os.path.join(tempfile.gettempdir(), 'localstack.ddb.zip')
 TMP_ARCHIVE_STS = os.path.join(tempfile.gettempdir(), 'aws-java-sdk-sts.jar')
 TMP_ARCHIVE_ELASTICMQ = os.path.join(tempfile.gettempdir(), 'elasticmq-server.jar')
-URL_STS_JAR = 'http://central.maven.org/maven2/com/amazonaws/aws-java-sdk-sts/1.11.14/aws-java-sdk-sts-1.11.14.jar'
-URL_ELASTICMQ_JAR = 'https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-0.13.8.jar'
 URL_LOCALSTACK_FAT_JAR = ('http://central.maven.org/maven2/' +
     'cloud/localstack/localstack-utils/{v}/localstack-utils-{v}-fat.jar').format(v=LOCALSTACK_MAVEN_VERSION)
 
@@ -52,7 +50,7 @@ def install_elasticmq():
         run('mkdir -p %s' % INSTALL_DIR_ELASTICMQ)
         # download archive
         if not os.path.exists(TMP_ARCHIVE_ELASTICMQ):
-            download(URL_ELASTICMQ_JAR, TMP_ARCHIVE_ELASTICMQ)
+            download(ELASTICMQ_JAR_URL, TMP_ARCHIVE_ELASTICMQ)
         shutil.copy(TMP_ARCHIVE_ELASTICMQ, INSTALL_DIR_ELASTICMQ)
 
 
@@ -90,7 +88,7 @@ def install_amazon_kinesis_client_libs():
     if not os.path.exists(INSTALL_DIR_KCL):
         mkdir(INSTALL_DIR_KCL)
         if not os.path.exists(TMP_ARCHIVE_STS):
-            download(URL_STS_JAR, TMP_ARCHIVE_STS)
+            download(STS_JAR_URL, TMP_ARCHIVE_STS)
         shutil.copy(TMP_ARCHIVE_STS, INSTALL_DIR_KCL)
     # Compile Java files
     from localstack.utils.kinesis import kclipy_helper
