summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKelley Spoon <kelley.spoon@linaro.org>2018-02-14 16:26:52 -0600
committerKelley Spoon <kelley.spoon@linaro.org>2018-02-14 16:26:52 -0600
commitfa70a51b077f2d9c29096c6be971f89b44ff2807 (patch)
tree2dbd0d938b9d941940c89bd38481fea61655acb7
parentad1298809df5ebf9d8a9c2a8b6435359c4e806a2 (diff)
downloaddocker-ansible-baseimage-add_ansible.tar.gz
Add latest ansible back to baseimage and try to clean up pkgs to save space.add_ansible
-rw-r--r--Dockerfile_trusty9
-rw-r--r--Dockerfile_xenial9
2 files changed, 8 insertions, 10 deletions
diff --git a/Dockerfile_trusty b/Dockerfile_trusty
index 445ea98..46d6f35 100644
--- a/Dockerfile_trusty
+++ b/Dockerfile_trusty
@@ -7,13 +7,12 @@ FROM ubuntu:14.04
LABEL maintainer="Ben Copeland <ben.copeland@linaro.org>"
-RUN apt-get update
+ENV DEBIAN_FRONTEND=noninteractive
-#RUN apt-get install -y software-properties-common python-software-properties
-#RUN apt-add-repository ppa:ansible/ansible
+RUN apt-get update -y && apt-get install -y software-properties-common python-software-properties
+RUN apt-add-repository -y ppa:ansible/ansible
-# Update apt cache
-RUN apt-get update && apt-get install -y ansible vim bash openssh-server python-apt sudo cron
+RUN apt-get update -y && apt-get install -y ansible vim bash openssh-server python-apt sudo cron && apt-get clean -y
RUN mkdir -p /root/.ssh/
ADD pubkeys /root/.ssh/authorized_keys
diff --git a/Dockerfile_xenial b/Dockerfile_xenial
index d750189..91c5abc 100644
--- a/Dockerfile_xenial
+++ b/Dockerfile_xenial
@@ -7,13 +7,12 @@ FROM ubuntu:16.04
LABEL maintainer="Ben Copeland <ben.copeland@linaro.org>"
-RUN apt-get update
+ENV DEBIAN_FRONTEND=noninteractive
-#RUN apt-get install -y software-properties-common python-software-properties
-#RUN apt-add-repository ppa:ansible/ansible
+RUN apt-get update -y && apt-get install -y software-properties-common python-software-properties
+RUN apt-add-repository -y ppa:ansible/ansible
-# Update apt cache
-RUN apt-get update && apt-get install -y ansible vim bash openssh-server python-apt sudo cron
+RUN apt-get update -y && apt-get install -y ansible vim bash openssh-server python-apt sudo cron && apt-get clean -y
RUN mkdir -p /root/.ssh/
ADD pubkeys /root/.ssh/authorized_keys