From ce9af220cf818dc8b17637da4cdff5558ff1ae57 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman@redhat.com>
Date: Mon, 26 Mar 2018 11:55:36 +0200
Subject: [PATCH] [OCF-75] dockerskeleton: Switch to CentOS 7

https://issues.jboss.org/browse/OCF-75
---
 docker/runtimes/dockerskeleton/Dockerfile | 27 ++++++++++++++++++-----
 resources/vars.sh                         |  3 +++
 tools/travis/test.sh                      |  3 ++-
 3 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100755 resources/vars.sh

diff --git a/docker/runtimes/dockerskeleton/Dockerfile b/docker/runtimes/dockerskeleton/Dockerfile
index d5d6db3..e8042b4 100644
--- a/docker/runtimes/dockerskeleton/Dockerfile
+++ b/docker/runtimes/dockerskeleton/Dockerfile
@@ -1,6 +1,23 @@
-# Dockerfile for docker skeleton (useful for running blackbox binaries, scripts, or Python 3 actions) .
-FROM openwhisk/dockerskeleton:1.1.0
+# Latest images from Mar 22nd
+FROM jboss/base@sha256:39bcf23f34ca58db0769121674d2a82aa4ea2ae9c956e280cb0ba1ef64c68b51
 
-# OpenShift compatibility
-RUN chgrp -R 0 /actionProxy \
-  && chmod -R g+rwX /actionProxy
+ARG OPENWHISK_RUNTIME_VERSION="dockerskeleton@1.2.0"
+
+ENV FLASK_PROXY_PORT 8080
+
+USER root
+
+RUN yum -y --setopt=tsflags=nodocs install epel-release \
+  && yum -y --setopt=tsflags=nodocs install python-pip \
+  && yum clean all \
+  && rm -rf /var/cache/yum \
+  && pip install --no-cache-dir gevent==1.2.1 flask==0.12 \
+  && mkdir -p /action /actionProxy \
+  && curl -sSL https://raw.githubusercontent.com/apache/incubator-openwhisk-runtime-docker/$OPENWHISK_RUNTIME_VERSION/core/actionProxy/actionproxy.py -o /actionProxy/actionproxy.py \
+  && curl -sSL https://raw.githubusercontent.com/apache/incubator-openwhisk-runtime-docker/$OPENWHISK_RUNTIME_VERSION/core/actionProxy/stub.sh -o /action/exec \
+  && chmod +x /action/exec \
+  && for d in /action /actionProxy; do chown jboss:root -R $d; chmod -R g+rwX $d; done
+
+USER 1000
+
+CMD ["/bin/bash", "-c", "cd /actionProxy && python -u actionproxy.py"]
diff --git a/resources/vars.sh b/resources/vars.sh
new file mode 100755
index 0000000..e1ddcf5
--- /dev/null
+++ b/resources/vars.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "{\"activation_id\":\"${__OW_ACTIVATION_ID}\",\"action_name\":\"${__OW_ACTION_NAME}\",\"deadline\":\"${__OW_DEADLINE}\",\"api_key\":\"${__OW_API_KEY}\",\"api_host\":\"${__OW_API_HOST}\",\"namespace\":\"${__OW_NAMESPACE}\"}"
diff --git a/tools/travis/test.sh b/tools/travis/test.sh
index 17fe285..1bc7561 100755
--- a/tools/travis/test.sh
+++ b/tools/travis/test.sh
@@ -74,9 +74,10 @@ wsk -i action create testsh-vars-js6 resources/vars.js --kind nodejs:6
 wsk -i action create testsh-vars-js8 resources/vars.js --kind nodejs:8
 wsk -i action create testsh-vars-java resources/vars.jar --main Vars
 wsk -i action create testsh-vars-php7 resources/vars.php --kind php:7.1
+wsk -i action create testsh-vars-sh resources/vars.sh --native
 
 # Invoke them, and delete them
-for i in {py2,py3,js6,js8,java,php7}; do
+for i in {py2,py3,js6,js8,java,php7,sh}; do
     invoke testsh-vars-$i
     wsk -i action delete testsh-vars-$i
 done