Drop 'need' -> 'use net' sedding, now that gentoo-openrc handles it

With:

  rc_provide="... net"

OpenRC understands that it's not responsible for filling the net
dependency, so there's no need to tweak the scripts themselves.

diff --git a/buildbot/Dockerfile.template b/buildbot/Dockerfile.template
index 6df4a466b621fedf0a2ca9d749b66fac5eba505d..b0e278b20aa677009af95ac1e2d2c17ca4992907 100644 (file)
--- a/buildbot/Dockerfile.template
+++ b/buildbot/Dockerfile.template
@@ -35,9 +35,6 @@ RUN eselect news read new
 RUN rc-update add buildmaster default
 RUN rc-update add buildslave default
 
-# Container networking happens automatically
-RUN sed -i 's/need net$/use net/' /etc/init.d/*
-
 RUN buildbot create-master /var/lib/buildmaster
 RUN mv /var/lib/buildmaster/master.cfg.sample /var/lib/buildmaster/master.cfg
 RUN buildslave create-slave /var/lib/buildslave localhost:9989 example-slave pass

diff --git a/docker-registry/Dockerfile.template b/docker-registry/Dockerfile.template
index 73c6c452da1596dd653744720e1b811734082645..5efbe43ade343738f277b0603b3a3231af6a2e09 100644 (file)
--- a/docker-registry/Dockerfile.template
+++ b/docker-registry/Dockerfile.template
@@ -35,8 +35,5 @@ RUN eselect news read new
 RUN git clone git://github.com/dotcloud/docker-registry.git
 RUN cp --no-clobber docker-registry/config/config_sample.yml docker-registry/config/config.yml
 
-# Container networking happens automatically
-RUN sed -i 's/need net$/use net/' /etc/init.d/*
-
 CMD cd docker-registry && ./setup-configs.sh && ./run.sh --preload
 EXPOSE 5000

diff --git a/elasticsearch/Dockerfile.template b/elasticsearch/Dockerfile.template
index e4ccfe22747f04f865e5d5a1d024ab9bd77c76d8..8657cc7f545147df2e95368c1361469420dc9dc4 100644 (file)
--- a/elasticsearch/Dockerfile.template
+++ b/elasticsearch/Dockerfile.template
@@ -36,7 +36,4 @@ RUN sed -i 's/^\(source src { system(); internal();\) };$/\1 udp(ip(127.0.0.1) p
 RUN sed -i 's/^\(rootLogger: .*\), file$/\1, syslog/' /etc/elasticsearch/logging.yml
 RUN sed -i 's/^\(appender:\)$/\1\n  syslog:\n    type: syslog\n    syslogHost: localhost:514\n    facility: daemon\n    laout:\n      type: pattern\n      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"\n/' /etc/elasticsearch/logging.yml
 
-# Container networking happens automatically
-RUN sed -i 's/need net$/use net/' /etc/init.d/*
-
 EXPOSE 9200

diff --git a/hubot/Dockerfile.template b/hubot/Dockerfile.template
index 28537b63b434e7ae98e2919efd875ac705246aba..c77914c9a65bf0ec3bdcf917a3e1c5709b9c2add 100644 (file)
--- a/hubot/Dockerfile.template
+++ b/hubot/Dockerfile.template
@@ -61,9 +61,6 @@ RUN sed -i 's/\([[:space:]]*\)\("dependencies": {\)/\1\2\n\1  "connect_router":
 RUN cd hubot && npm install
 RUN git clone git://github.com/jenrzzz/hubot-logger.git && cp hubot-logger/logger.coffee hubot/node_modules/hubot-scripts/src/scripts/
 
-# Container networking happens automatically
-RUN sed -i 's/need net$/use net/' /etc/init.d/*
-
 CMD cd hubot && REDIS_URL="${REDIS_PORT}" LOG_REDIS_URL="${REDIS_PORT}" PORT=80 exec bin/hubot --name "${HUBOT_IRC_NICK:-hubot}" -a irc
 EXPOSE 80
 EXPOSE 8000

diff --git a/memcached/Dockerfile.template b/memcached/Dockerfile.template
index 018224f262b81519e86dfcb0d62572b1f31f28c9..2841982a37eadf185e1b0b058098e64012bb0edf 100644 (file)
--- a/memcached/Dockerfile.template
+++ b/memcached/Dockerfile.template
@@ -29,8 +29,5 @@ RUN emerge -v net-misc/memcached
 RUN eselect news read new
 RUN rc-update add memcached default
 
-# Container networking happens automatically
-RUN sed -i 's/need net$/use net/' /etc/init.d/*
-
 CMD sed -i "s/^MEMUSAGE=.*/MEMUSAGE=\"${MEMUSAGE}\"/" /etc/conf.d/memcached && rc default && exec tail-syslog
 EXPOSE 11211

diff --git a/nginx/Dockerfile.template b/nginx/Dockerfile.template
index 7ba73a31453b8fcb751650b21d223623f8e9a851..b3c8825899e5aca1734c966b8f6fee4bfefd45ab 100644 (file)
--- a/nginx/Dockerfile.template
+++ b/nginx/Dockerfile.template
@@ -35,7 +35,4 @@ RUN sed -i 's/listen 127.0.0.1;/listen 80 default_server;/' /etc/nginx/nginx.con
 RUN sed -i 's/server_name localhost;/server_name _;/' /etc/nginx/nginx.conf
 RUN mkdir /var/www/localhost/htdocs
 
-# Container networking happens automatically
-RUN sed -i 's/need net$/use net/' /etc/init.d/*
-
 EXPOSE 80

diff --git a/ngircd/Dockerfile.template b/ngircd/Dockerfile.template
index 5d1200924875d44b94299b258689e0d80f6c2fd7..392c9e87db728418c8e715ebb689e3030b2cd975 100644 (file)
--- a/ngircd/Dockerfile.template
+++ b/ngircd/Dockerfile.template
@@ -42,8 +42,5 @@ RUN sed -i 's/;AdminInfo2 = Location/AdminInfo2 = ${LOCATION}/' /etc/ngircd/ngir
 RUN sed -i 's/;AdminEMail = admin@irc.server/AdminEMail = ${EMAIL}/' /etc/ngircd/ngircd.conf
 RUN sed -i 's/Info = Server Info Text/Info = ${INFO}/' /etc/ngircd/ngircd.conf
 
-# Container networking happens automatically
-RUN sed -i 's/need net$/use net/' /etc/init.d/*
-
 CMD setup-ngircd-config-from-environment && rc default && exec tail-syslog
 EXPOSE 6667

diff --git a/package-cache/Dockerfile.template b/package-cache/Dockerfile.template
index d9771fa7c36b65f7c956fcca677d024f7303d830..11129cff9a971dd29625d370509dd6057b4a5643 100644 (file)
--- a/package-cache/Dockerfile.template
+++ b/package-cache/Dockerfile.template
@@ -37,7 +37,4 @@ RUN echo 'PC_OPTS="-vvv"' >> /etc/conf.d/package-cache
 Run echo 'PC_USER="root"' >> /etc/conf.d/package-cache
 Run echo 'PC_GROUP="root"' >> /etc/conf.d/package-cache
 
-# Container networking happens automatically
-RUN sed -i 's/need net$/use net/' /etc/init.d/*
-
 EXPOSE 80

diff --git a/postgresql/Dockerfile.template b/postgresql/Dockerfile.template
index c01b264a7acbe5d1f1f785699c3f7fbd62700bdc..3eae7fc09d60ab252fd046c001643cb058521600 100644 (file)
--- a/postgresql/Dockerfile.template
+++ b/postgresql/Dockerfile.template
@@ -38,7 +38,4 @@ RUN echo host  all  all  0.0.0.0/0  trust >> $(echo /etc/postgresql*/pg_hba.conf
 # Setup logging
 RUN sed -i "s/\(#log_destination =.*\)/log_destination = 'syslog'\n\1/" /etc/postgresql*/postgresql.conf
 
-# Container networking happens automatically
-RUN sed -i 's/need net$/use net/' /etc/init.d/*
-
 EXPOSE 5432

diff --git a/redis/Dockerfile.template b/redis/Dockerfile.template
index 2cb2886cbc72e98550e996c9e495450a8e04cc6d..85005728dd7d128bba4f487097feb10969373972 100644 (file)
--- a/redis/Dockerfile.template
+++ b/redis/Dockerfile.template
@@ -32,9 +32,6 @@ RUN rc-update add redis default
 # Bind to all interfaces
 RUN sed -i 's/bind /#bind /' /etc/redis.conf
 
-# Container networking happens automatically
-RUN sed -i 's/need net$/use net/' /etc/init.d/*
-
 # A configurable environment variable (e.g. CONFIG_URL) would be nice.
 # Until then, hardcode the tweaks I need.
 RUN sed -i 's/\(# maxmemory-policy.*\)/\1\nmaxmemory-policy allkeys-lru/' /etc/redis.conf

diff --git a/salt-minion/Dockerfile.template b/salt-minion/Dockerfile.template
index 2908ea368497b7d9ee807ea169906721fa5dd545..3e0088a605875a3afef6392a88b0e89a4adab042 100644 (file)
--- a/salt-minion/Dockerfile.template
+++ b/salt-minion/Dockerfile.template
@@ -64,7 +64,4 @@ RUN sed -i 's|^\([[:space:]]*\)\(need net\)$|\1\2\n\1need logger|' /etc/init.d/s
 RUN sed -i 's|^#\(log_file: file:///dev/log\)|\1|' /etc/salt/minion
 RUN sed -i 's|^\(#log_level_logfile:.*\)$|\1\nlog_level_logfile: info|' /etc/salt/minion
 
-# Container networking happens automatically
-RUN sed -i 's/need net$/use net/' /etc/init.d/*
-
 EXPOSE 80

diff --git a/stunnel/Dockerfile.template b/stunnel/Dockerfile.template
index e0d7731649b97f3b4692280633eba28edcc17d3a..58557e44383a3075af3f27589494e959460ddd4c 100644 (file)
--- a/stunnel/Dockerfile.template
+++ b/stunnel/Dockerfile.template
@@ -36,8 +36,5 @@ RUN echo '[stunnel]' >> /etc/stunnel/stunnel.conf
 RUN echo 'accept = 9999' >> /etc/stunnel/stunnel.conf
 RUN echo 'connect = NETLOC' >> /etc/stunnel/stunnel.conf
 
-# Container networking happens automatically
-RUN sed -i 's/need net$/use net/' /etc/init.d/*
-
 CMD sed -i "s|NETLOC|${SERVER_PORT#tcp://}|" /etc/stunnel/stunnel.conf && rc default && exec tail-syslog
 EXPOSE 9999