openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From csantan...@apache.org
Subject [incubator-openwhisk-runtime-docker] branch master updated: adds jq perl zip git (#12)
Date Sun, 04 Feb 2018 07:08:11 GMT
This is an automated email from the ASF dual-hosted git repository.

csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-docker.git


The following commit(s) were added to refs/heads/master by this push:
     new 0b379b2  adds jq perl zip git (#12)
0b379b2 is described below

commit 0b379b22998c128fd2959cb91d9f41848a2a3dab
Author: Carlos Santana <csantana23@gmail.com>
AuthorDate: Sun Feb 4 02:08:09 2018 -0500

    adds jq perl zip git (#12)
---
 core/actionProxy/Dockerfile                                        | 7 ++-----
 .../test/scala/actionContainers/ActionProxyContainerTests.scala    | 6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

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"

-- 
To stop receiving notification emails like this one, please contact
csantanapr@apache.org.

Mime
View raw message