Skip to content

Commit

Permalink
Switch from alpine to jessie-slim for runner utility images (apache#4052
Browse files Browse the repository at this point in the history
)
  • Loading branch information
dgrove-oss authored and csantanapr committed Oct 5, 2018
1 parent 37791d7 commit f8e689f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 19 deletions.
19 changes: 4 additions & 15 deletions tools/ansibleRunner/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 && \
Expand All @@ -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"]
6 changes: 2 additions & 4 deletions tools/scriptRunner/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down

0 comments on commit f8e689f

Please sign in to comment.