[GitHub] csantanapr closed pull request #4052: Switch from alpine to jessie-slim for runner utility images

[GitBox <gi...@apache.org>]

csantanapr closed pull request #4052: Switch from alpine to jessie-slim for runner utility images
URL: https://github.com/apache/incubator-openwhisk/pull/4052
 
 
   

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/tools/ansibleRunner/Dockerfile b/tools/ansibleRunner/Dockerfile
index decddcf6d9..5d01a15ee2 100644
--- a/tools/ansibleRunner/Dockerfile
+++ b/tools/ansibleRunner/Dockerfile
@@ -1,28 +1,19 @@
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
 
-from alpine
+from debian:jessie-slim
 
 ENV DOCKER_VERSION 1.12.0
 
-RUN apk --no-cache add \
-  bash \
+RUN apt-get update && apt-get install -y \
   curl \
   git \
-  libc6-compat \
-  libffi \
-  openssl \
+  libffi-dev \
   python \
-  py-pip \
+  python-pip \
   wget \
   zip
 
-RUN apk --no-cache add --virtual build-dependencies \
-  python-dev \
-  build-base \
-  libffi-dev \
-  openssl-dev
-
 # Install docker client
 RUN wget --no-verbose https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz && \
 tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker && \
@@ -34,6 +25,4 @@ RUN pip install --upgrade setuptools
 RUN pip install ansible==2.5.2
 RUN pip install jinja2==2.9.6
 
-RUN apk del build-dependencies
-
 CMD ["/usr/bin/ansible-playbook", "/task/playbook.yml"]
diff --git a/tools/scriptRunner/Dockerfile b/tools/scriptRunner/Dockerfile
index 432e510d82..5cc2be2303 100644
--- a/tools/scriptRunner/Dockerfile
+++ b/tools/scriptRunner/Dockerfile
@@ -1,12 +1,10 @@
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
 
-FROM node:alpine
+FROM node:slim
 
-RUN apk --no-cache add \
-  bash \
+RUN apt-get update && apt-get install -y \
   git \
-  libc6-compat \
   wget \
   zip
 


 

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services