From 5c7482e5fdefac5de76e8c91d49cc6956d070762 Mon Sep 17 00:00:00 2001 From: Ivan Mikushin Date: Thu, 2 Jun 2016 16:05:14 -0700 Subject: [PATCH] Bump ubuntu-console to 16.04 Also, minor image cleanups (use cached layers to build faster). --- images/10-resizefs/Dockerfile | 2 +- images/10-selinuxtools/Dockerfile | 3 ++- images/10-ubuntuconsole/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/images/10-resizefs/Dockerfile b/images/10-resizefs/Dockerfile index c3e7b3ce..8b15f8a0 100644 --- a/images/10-resizefs/Dockerfile +++ b/images/10-resizefs/Dockerfile @@ -1,5 +1,5 @@ FROM rancher/os-resizefs-base -# FROM amd64=ubuntu:14.04.4 arm64=aarch64/ubuntu:14.04 arm=armhf/ubuntu:14.04 +# FROM amd64=ubuntu:16.04 arm64=aarch64/ubuntu:16.04 arm=armhf/ubuntu:16.04 RUN apt-get update && \ apt-get install -y --no-install-recommends cloud-guest-utils parted && \ apt-get clean && rm -rf /var/lib/apt/lists/* diff --git a/images/10-selinuxtools/Dockerfile b/images/10-selinuxtools/Dockerfile index 64f69b09..b8dbfd0f 100644 --- a/images/10-selinuxtools/Dockerfile +++ b/images/10-selinuxtools/Dockerfile @@ -1,6 +1,7 @@ FROM rancher/os-fedoraconsole-base +# FROM amd64=fedora:23 arm64=rancher/aarch64-fedora:23 arm=armv7/armhf-fedora:23 RUN dnf upgrade -y && \ - dnf install -y iptables openssh-server rsync sudo vim less ca-certificates psmisc htop + dnf install -y iptables openssh-server rsync sudo vim less ca-certificates psmisc htop procps-ng RUN rm -rf /etc/ssh/*key* RUN rm -fr /sbin/poweroff /sbin/shutdown /sbin/reboot /sbin/halt /usr/sbin/poweroff /usr/sbin/shutdown /usr/sbin/reboot /usr/sbin/halt RUN ln -s /sbin/agetty /sbin/getty diff --git a/images/10-ubuntuconsole/Dockerfile b/images/10-ubuntuconsole/Dockerfile index 3f90a157..2b492ec4 100644 --- a/images/10-ubuntuconsole/Dockerfile +++ b/images/10-ubuntuconsole/Dockerfile @@ -1,5 +1,5 @@ FROM rancher/os-ubuntuconsole-base -# FROM amd64=ubuntu:14.04.4 arm64=aarch64/ubuntu:14.04 arm=armhf/ubuntu:14.04 +# FROM amd64=ubuntu:16.04 arm64=aarch64/ubuntu:16.04 arm=armhf/ubuntu:16.04 RUN apt-get update && \ apt-get upgrade --no-install-recommends -y && \ apt-get install -y --no-install-recommends iptables openssh-server rsync vim curl ca-certificates psmisc htop