summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordosire <sytses@gmail.com>2014-02-21 08:47:00 +0100
committerdosire <sytses@gmail.com>2014-02-21 08:47:00 +0100
commit339c172f944d99b359014bf9dd10e5fb2ea95043 (patch)
treee66274fdb486914619d5b188b8768ad093042d0d
parentb47e5319ebb80524aa8596716e52e54909150d50 (diff)
downloadgitlab-ce-339c172f944d99b359014bf9dd10e5fb2ea95043.tar.gz
This doesn't help with the ulimit error.
-rw-r--r--Dockerfile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Dockerfile b/Dockerfile
index 9fb1f653546..693e513064a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,11 @@ EXPOSE 80
RUN apt-get -y update
RUN apt-get -y install curl build-essential libxml2-dev libxslt-dev git
+# Suppress Upstart and init.d errors
+# http://lalyos.github.io/blog/2013/10/01/fixing-startup-on-docker/
+RUN dpkg-divert --local --rename --add /sbin/initctl
+RUN ln -s /bin/true /sbin/initctl
+
# Thanks to Paul Czarkowski "paul@paulcz.net" for
# http://tech.paulcz.net/2013/09/creating-immutable-servers-with-chef-and-docker-dot-io.html
ADD https://www.opscode.com/chef/install.sh install.sh