openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rab...@apache.org
Subject [incubator-openwhisk-deploy-kube] branch master updated: Fix travis builds by combining PR70 and PR71 (#72)
Date Wed, 18 Oct 2017 16:02:12 GMT
This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git


The following commit(s) were added to refs/heads/master by this push:
     new 6526ed1  Fix travis builds by combining PR70 and PR71 (#72)
6526ed1 is described below

commit 6526ed166bb6a36b5f08e88ca573b552cee1ae08
Author: David Grove <dgrove-oss@users.noreply.github.com>
AuthorDate: Wed Oct 18 12:02:10 2017 -0400

    Fix travis builds by combining PR70 and PR71 (#72)
    
    * disable use of docker-runc by setting INVOKER_USE_RUNC to false
    
    Set envvar to disable use of docker-runc to pause/resume containers
    (will use docker pause/unpause instead).
    
    * define invoker envvars now required by OW PR#2689
    
    * move package update/install from init.sh into Dockerfile and force image pull
---
 kubernetes/couchdb/couchdb.yml       |  2 +-
 kubernetes/couchdb/docker/Dockerfile |  9 +++++++++
 kubernetes/couchdb/docker/init.sh    |  9 ---------
 kubernetes/invoker/invoker.yml       | 14 ++++++++++++++
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/kubernetes/couchdb/couchdb.yml b/kubernetes/couchdb/couchdb.yml
index f390da1..8696934 100644
--- a/kubernetes/couchdb/couchdb.yml
+++ b/kubernetes/couchdb/couchdb.yml
@@ -32,7 +32,7 @@ spec:
       restartPolicy: Always
       containers:
       - name: couchdb
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Always
         image: dgrove/whisk_couchdb
         command: ["/init.sh"]
         ports:
diff --git a/kubernetes/couchdb/docker/Dockerfile b/kubernetes/couchdb/docker/Dockerfile
index ea7dead..5616b38 100644
--- a/kubernetes/couchdb/docker/Dockerfile
+++ b/kubernetes/couchdb/docker/Dockerfile
@@ -10,9 +10,18 @@ RUN apt-get -y update && apt-get -y install \
   curl \
   sudo \
   python-dev \
+  python-pip \
   libffi-dev \
   libssl-dev
 
+RUN pip install --upgrade setuptools
+RUN pip install argcomplete
+RUN pip install couchdb
+RUN pip install --upgrade cffi
+RUN pip install markupsafe
+RUN pip install ansible==2.3.0.0
+RUN pip install -U pyopenssl
+
 COPY init.sh /init.sh
 RUN chmod +X /init.sh
 
diff --git a/kubernetes/couchdb/docker/init.sh b/kubernetes/couchdb/docker/init.sh
index 01d6ba3..f776bca 100755
--- a/kubernetes/couchdb/docker/init.sh
+++ b/kubernetes/couchdb/docker/init.sh
@@ -5,15 +5,6 @@ set -ex
 git clone https://github.com/apache/incubator-openwhisk /openwhisk
 
 pushd /openwhisk
-  # Install ansible requirements
-  ./tools/ubuntu-setup/pip.sh
-
-  # upgrade cffi for ansible error on Debian Jesse
-  pip install --upgrade cffi
-  sudo pip install markupsafe
-  sudo pip install ansible==2.3.0.0
-
-
   # if auth guest overwrite file
   if [ -n "$AUTH_GUEST" ]; then
     echo "$AUTH_GUEST" > /openwhisk/ansible/files/auth.guest
diff --git a/kubernetes/invoker/invoker.yml b/kubernetes/invoker/invoker.yml
index 70d95c6..b576297 100644
--- a/kubernetes/invoker/invoker.yml
+++ b/kubernetes/invoker/invoker.yml
@@ -55,6 +55,8 @@ spec:
             value: "latest"
           - name: "INVOKER_CONTAINER_NETWORK"
             value: "bridge"
+          - name: "INVOKER_USE_RUNC"
+            value: "false"
 
           # Properties for invoker image
           - name: "DOCKER_IMAGE_PREFIX"
@@ -68,6 +70,12 @@ spec:
           - name: "INVOKER_INSTANCES"
             value: "1"
 
+          # Invoker assigned name. Derived from hostname
+          - name: "INVOKER_NAME"
+            valueFrom:
+              fieldRef:
+                fieldPath: spec.nodeName
+
           # Java options
           - name: "JAVA_OPTS"
             value: "-Xmx2g"
@@ -82,6 +90,12 @@ spec:
           - name: "KAFKA_HOST_PORT"
             value: "9092"
 
+          # Redis properties
+          - name: "REDIS_HOST"
+            value: "redis.openwhisk"
+          - name: "REDIS_HOST_PORT"
+            value: "6379"
+
           # This property can change since it is generated via Ansible GroupVars
           - name: "RUNTIMES_MANIFEST"
             value: '{ "defaultImagePrefix": "openwhisk", "defaultImageTag": "latest", "runtimes":
{ "nodejs": [ { "kind": "nodejs", "image": { "name": "nodejsaction" }, "deprecated": true
}, { "kind": "nodejs:6", "default": true, "image": { "name": "nodejs6action" }, "deprecated":
false } ], "python": [ { "kind": "python", "image": { "name": "python2action" }, "deprecated":
false }, { "kind": "python:2", "default": true, "image": { "name": "python2action" }, "deprecated":
false }, { "kin [...]

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].

Mime
View raw message