csantanapr closed pull request #12: adds jq perl zip git URL: https://github.com/apache/incubator-openwhisk-runtime-docker/pull/12
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/core/actionProxy/Dockerfile b/core/actionProxy/Dockerfile index 6ec4ff4..47dd4f0 100644 --- a/core/actionProxy/Dockerfile +++ b/core/actionProxy/Dockerfile @@ -2,11 +2,8 @@ FROM python:3.6.1-alpine # Upgrade and install basic Python dependencies. -RUN apk add --no-cache bash \ - && apk add --no-cache --virtual .build-deps \ - bzip2-dev \ - gcc \ - libc-dev \ +RUN apk add --no-cache bash perl jq zip git \ + && apk add --no-cache --virtual .build-deps bzip2-dev gcc libc-dev \ && pip install --upgrade pip setuptools six \ && pip install --no-cache-dir gevent==1.2.1 flask==0.12 \ && apk del .build-deps diff --git a/tests/src/test/scala/actionContainers/ActionProxyContainerTests.scala b/tests/src/test/scala/actionContainers/ActionProxyContainerTests.scala index 1471d12..bcf5602 100644 --- a/tests/src/test/scala/actionContainers/ActionProxyContainerTests.scala +++ b/tests/src/test/scala/actionContainers/ActionProxyContainerTests.scala @@ -71,8 +71,7 @@ class ActionProxyContainerTests extends BasicActionRunnerTests with WskActorSyst |print $ARGV[0]; """.stripMargin.trim - // excluding perl as it not installed in alpine based image - Seq(("bash", bash), ("python", python)) + Seq(("bash", bash), ("python", python), ("perl", perl)) } val stdUnicodeSamples = { @@ -123,8 +122,7 @@ class ActionProxyContainerTests extends BasicActionRunnerTests with WskActorSyst |print "{ \"api_host\": \"$a\", \"api_key\": \"$b\", \"namespace\": \"$c\", \"action_name\": \"$d\", \"activation_id\": \"$e\", \"deadline\": \"$f\" }"; """.stripMargin.trim - // excluding perl as it not installed in alpine based image - Seq(("bash", bash), ("python", python)) + Seq(("bash", bash), ("python", python), ("perl", perl)) } behavior of "openwhisk/dockerskeleton" ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services