1
0
mirror of https://github.com/rancher/os.git synced 2025-09-17 15:40:47 +00:00

Merge pull request #977 from imikushin/console-tweaks

Bump ubuntu-console to 16.04, add man
This commit is contained in:
Darren Shepherd
2016-06-02 20:47:27 -06:00
3 changed files with 4 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
FROM rancher/os-resizefs-base 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 && \ RUN apt-get update && \
apt-get install -y --no-install-recommends cloud-guest-utils parted && \ apt-get install -y --no-install-recommends cloud-guest-utils parted && \
apt-get clean && rm -rf /var/lib/apt/lists/* apt-get clean && rm -rf /var/lib/apt/lists/*

View File

@@ -1,6 +1,7 @@
FROM rancher/os-fedoraconsole-base FROM rancher/os-fedoraconsole-base
# FROM amd64=fedora:23 arm64=rancher/aarch64-fedora:23 arm=armv7/armhf-fedora:23
RUN dnf upgrade -y && \ 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 -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 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 RUN ln -s /sbin/agetty /sbin/getty

View File

@@ -1,5 +1,5 @@
FROM rancher/os-ubuntuconsole-base 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 && \ RUN apt-get update && \
apt-get upgrade --no-install-recommends -y && \ apt-get upgrade --no-install-recommends -y && \
apt-get install -y --no-install-recommends iptables openssh-server rsync vim curl ca-certificates psmisc htop apt-get install -y --no-install-recommends iptables openssh-server rsync vim curl ca-certificates psmisc htop