diff options
| author |   Alex Brandt <alunduil@alunduil.com> | 2016-02-28 19:31:42 -0600 |
|---|---|---|
| committer | Alex Brandt <alunduil@alunduil.com> | 2016-02-28 19:31:42 -0600 |
| commit | 93a7bad33a2f4e2e9728113476d4869b1d253909 (patch) | |
| tree | 19aa85953af1d6156343fc7f8149a902f6073d1d | |
| parent | ensure all openrc directories exist (diff) | |
| download | docker-images-93a7bad33a2f4e2e9728113476d4869b1d253909.tar.gz docker-images-93a7bad33a2f4e2e9728113476d4869b1d253909.tar.bz2 docker-images-93a7bad33a2f4e2e9728113476d4869b1d253909.zip | |
drop openrc stubs in Dockerfiles
The openrc stubs didn't add any value to the container images and kept
causing build failurse. If you must have openrc "running" in the
container for whatever reason, make openrc the command started with the
container via an entrypoint or cmd.
| -rw-r--r-- | amd64-hardened-nomultilib/Dockerfile | 11 | ||||
| -rw-r--r-- | amd64-hardened/Dockerfile | 11 | ||||
| -rw-r--r-- | amd64-nomultilib/Dockerfile | 11 | ||||
| -rw-r--r-- | amd64/Dockerfile | 11 | ||||
| -rw-r--r-- | x86/Dockerfile | 11 |
5 files changed, 0 insertions, 55 deletions
diff --git a/amd64-hardened-nomultilib/Dockerfile b/amd64-hardened-nomultilib/Dockerfile index 60c6e19..f4f1154 100644 --- a/amd64-hardened-nomultilib/Dockerfile +++ b/amd64-hardened-nomultilib/Dockerfile @@ -7,19 +7,8 @@ ADD build.sh / RUN /build.sh amd64 x86_64 -hardened+nomultilib -# Setup the (virtually) current runlevel -RUN mkdir -p /run/openrc/started -RUN echo "default" > /run/openrc/softlevel - # Setup the rc_sys RUN sed -e 's/#rc_sys=""/rc_sys="lxc"/g' -i /etc/rc.conf -# Setup the net.lo runlevel -RUN ln -s /etc/init.d/net.lo /run/openrc/started/net.lo - -# Setup the net.eth0 runlevel -RUN ln -s /etc/init.d/net.lo /etc/init.d/net.eth0 -RUN ln -s /etc/init.d/net.eth0 /run/openrc/started/net.eth0 - # By default, UTC system RUN echo 'UTC' > /etc/timezone diff --git a/amd64-hardened/Dockerfile b/amd64-hardened/Dockerfile index a71c124..994b7f4 100644 --- a/amd64-hardened/Dockerfile +++ b/amd64-hardened/Dockerfile @@ -7,19 +7,8 @@ ADD build.sh / RUN /build.sh amd64 x86_64 -hardened -# Setup the (virtually) current runlevel -RUN mkdir -p /run/openrc/started -RUN echo "default" > /run/openrc/softlevel - # Setup the rc_sys RUN sed -e 's/#rc_sys=""/rc_sys="lxc"/g' -i /etc/rc.conf -# Setup the net.lo runlevel -RUN ln -s /etc/init.d/net.lo /run/openrc/started/net.lo - -# Setup the net.eth0 runlevel -RUN ln -s /etc/init.d/net.lo /etc/init.d/net.eth0 -RUN ln -s /etc/init.d/net.eth0 /run/openrc/started/net.eth0 - # By default, UTC system RUN echo 'UTC' > /etc/timezone diff --git a/amd64-nomultilib/Dockerfile b/amd64-nomultilib/Dockerfile index 0ca479c..eafb747 100644 --- a/amd64-nomultilib/Dockerfile +++ b/amd64-nomultilib/Dockerfile @@ -7,19 +7,8 @@ ADD build.sh / RUN /build.sh amd64 x86_64 -nomultilib -# Setup the (virtually) current runlevel -RUN mkdir -p /run/openrc/started -RUN echo "default" > /run/openrc/softlevel - # Setup the rc_sys RUN sed -e 's/#rc_sys=""/rc_sys="lxc"/g' -i /etc/rc.conf -# Setup the net.lo runlevel -RUN ln -s /etc/init.d/net.lo /run/openrc/started/net.lo - -# Setup the net.eth0 runlevel -RUN ln -s /etc/init.d/net.lo /etc/init.d/net.eth0 -RUN ln -s /etc/init.d/net.eth0 /run/openrc/started/net.eth0 - # By default, UTC system RUN echo 'UTC' > /etc/timezone diff --git a/amd64/Dockerfile b/amd64/Dockerfile index 0caa70f..2599070 100644 --- a/amd64/Dockerfile +++ b/amd64/Dockerfile @@ -7,19 +7,8 @@ ADD build.sh / RUN /build.sh amd64 x86_64 -# Setup the (virtually) current runlevel -RUN mkdir -p /run/openrc/started -RUN echo "default" > /run/openrc/softlevel - # Setup the rc_sys RUN sed -e 's/#rc_sys=""/rc_sys="lxc"/g' -i /etc/rc.conf -# Setup the net.lo runlevel -RUN ln -s /etc/init.d/net.lo /run/openrc/started/net.lo - -# Setup the net.eth0 runlevel -RUN ln -s /etc/init.d/net.lo /etc/init.d/net.eth0 -RUN ln -s /etc/init.d/net.eth0 /run/openrc/started/net.eth0 - # By default, UTC system RUN echo 'UTC' > /etc/timezone diff --git a/x86/Dockerfile b/x86/Dockerfile index 9618f6e..ac49203 100644 --- a/x86/Dockerfile +++ b/x86/Dockerfile @@ -12,19 +12,8 @@ RUN apt-get update && apt-get install -y \ RUN /build.sh x86 i686 -# Setup the (virtually) current runlevel -RUN mkdir -p /run/openrc/started -RUN echo "default" > /run/openrc/softlevel - # Setup the rc_sys RUN sed -e 's/#rc_sys=""/rc_sys="lxc"/g' -i /etc/rc.conf -# Setup the net.lo runlevel -RUN ln -s /etc/init.d/net.lo /run/openrc/started/net.lo - -# Setup the net.eth0 runlevel -RUN ln -s /etc/init.d/net.lo /etc/init.d/net.eth0 -RUN ln -s /etc/init.d/net.eth0 /run/openrc/started/net.eth0 - # By default, UTC system RUN echo 'UTC' > /etc/timezone |