From dac9b68aeee4eee6ddc7d79a511a8700008abc41 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Wed, 20 Apr 2016 22:19:55 +0100 Subject: [PATCH] Combine init and prepare scripts --- build/scripts/init.sh | 12 ------------ build/scripts/prepare.sh | 30 +++++++++++++++++------------- 2 files changed, 17 insertions(+), 25 deletions(-) delete mode 100755 build/scripts/init.sh diff --git a/build/scripts/init.sh b/build/scripts/init.sh deleted file mode 100755 index cda6f0e..0000000 --- a/build/scripts/init.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -e -source /build/config -set -x - -## Install init process -mkdir -p /opt/init.d -mkdir -p /etc/container_environment -touch /etc/container_environment.sh -touch /etc/container_environment.json -chmod 700 /etc/container_environment -chmod 600 /etc/container_environment.sh /etc/container_environment.json diff --git a/build/scripts/prepare.sh b/build/scripts/prepare.sh index 66a462b..27b2a53 100755 --- a/build/scripts/prepare.sh +++ b/build/scripts/prepare.sh @@ -3,38 +3,42 @@ set -e source /build/config set -x -## Create directories +## Create directories and files mkdir /etc/container_environment mkdir /opt/init.d +touch /etc/container_environment.sh +touch /etc/container_environment.json +chmod 700 /etc/container_environment +chmod 600 /etc/container_environment.sh /etc/container_environment.json -## Temporarily disable dpkg fsync to make building faster. +# Temporarily disable dpkg fsync to make building faster. echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/02apt-speedup -## Prevent initramfs updates from trying to run grub and lilo. -## https://journal.paul.querna.org/articles/2013/10/15/docker-ubuntu-on-rackspace/ -## http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=594189 +# Prevent initramfs updates from trying to run grub and lilo. +# https://journal.paul.querna.org/articles/2013/10/15/docker-ubuntu-on-rackspace/ +# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=594189 export_env INITRD no -## Enable sources and backports in APT +# Enable sources and backports in APT echo 'deb-src http://httpredir.debian.org/debian/ jessie main' >> /etc/apt/sources.list echo 'deb http://httpredir.debian.org/debian/ jessie-backports main contrib non-free' >> /etc/apt/sources.list echo 'deb-src http://httpredir.debian.org/debian/ jessie-backports main contrib non-free' >> /etc/apt/sources.list apt update ## Fix some issues with APT packages -## See https://github.com/dotcloud/docker/issues/1024 +# See https://github.com/dotcloud/docker/issues/1024 dpkg-divert --local --rename --add /sbin/initctl ln -sf /bin/true /sbin/initctl -## Replace the 'ischroot' tool to make it always return true -## Prevent initscripts updates from breaking /dev/shm -## https://journal.paul.querna.org/articles/2013/10/15/docker-ubuntu-on-rackspace/ -## https://bugs.launchpad.net/launchpad/+bug/974584 +# Replace the 'ischroot' tool to make it always return true +# Prevent initscripts updates from breaking /dev/shm +# https://journal.paul.querna.org/articles/2013/10/15/docker-ubuntu-on-rackspace/ +# https://bugs.launchpad.net/launchpad/+bug/974584 dpkg-divert --local --rename --add /usr/bin/ischroot ln -sf /bin/true /usr/bin/ischroot -## Fix known issue with user accounts -## https://github.com/docker/docker/issues/6345#issuecomment-49245365 +# Fix known issue with user accounts +# https://github.com/docker/docker/issues/6345#issuecomment-49245365 ln -sf /bin/true /usr/bin/chfn ## Install HTTPS support for APT