#16 - updated jessie and ubuntu dockerfiles

Author: joshuacherry

docker/jessie64/Dockerfile

@@ -5,23 +5,22 @@ FROM debian:jessie
 # Colour output.
 ENV TERM=xterm
 
-RUN apt-get update -y \
-    && apt-get install -y apt-transport-https software-properties-common
-
-COPY chef.asc /tmp/chef.asc
-COPY chef-stable.list /etc/apt/sources.list.d/chef-stable.list
-
 RUN echo deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main >> /etc/apt/sources.list \
     && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 \
-    && apt-key add /tmp/chef.asc \
     && apt-get update -y \
     && apt-get --no-install-recommends install -y \
       software-properties-common \
       ansible \
-      inspec=1.25.0-1 \
       wget \
       coreutils \
       net-tools \
     && apt-get autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
+
+## https://downloads.chef.io/inspec/1.24.0
+RUN wget -q https://packages.chef.io/files/stable/inspec/1.24.0/ubuntu/14.04/inspec_1.24.0-1_amd64.deb \
+  && echo "33e8ab3dd4ed7eb2285310ae9d0a32e0cc45d5b6d057a29541f93870c2f9e30a  inspec_1.24.0-1_amd64.deb" \
+  | sha256sum -c \
+  && dpkg -i inspec_1.24.0-1_amd64.deb \
+  && rm inspec_1.24.0-1_amd64.deb

docker/jessie64/chef-stable.list

@@ -6,7 +6,10 @@ FROM ubuntu:trusty
 ENV TERM=xterm
 
 RUN apt-get update -y \
-    && apt-get install -y apt-transport-https software-properties-common
+    && apt-get install -y apt-transport-https software-properties-common \
+    && apt-get autoremove \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
 COPY chef.asc /tmp/chef.asc
 COPY chef-stable.list /etc/apt/sources.list.d/chef-stable.list

docker/jessie64/chef.asc

@@ -6,7 +6,10 @@ FROM ubuntu:xenial
 ENV TERM=xterm
 
 RUN apt-get update -y \
-    && apt-get install -y apt-transport-https software-properties-common
+    && apt-get install -y apt-transport-https software-properties-common \
+    && apt-get autoremove \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
 COPY chef.asc /tmp/chef.asc
 COPY chef-stable.list /etc/apt/sources.list.d/chef-stable.list