diff options
| author |   Alex Brandt <alunduil@alunduil.com> | 2016-02-28 19:08:09 -0600 |
|---|---|---|
| committer | Alex Brandt <alunduil@alunduil.com> | 2016-02-28 19:08:09 -0600 |
| commit | 424604824e007a36363fc84b66a86c9ae803754e (patch) | |
| tree | 9d3f96cae9f8894dcf58c6b662d9446952aa3e84 | |
| parent | ensure openrc directory exists (diff) | |
| download | docker-images-424604824e007a36363fc84b66a86c9ae803754e.tar.gz docker-images-424604824e007a36363fc84b66a86c9ae803754e.tar.bz2 docker-images-424604824e007a36363fc84b66a86c9ae803754e.zip | |
ensure all openrc directories exist
It seems the simple solution previously applied didn't take into
consideration particular RC scripts being fake started as well. This
should allow the build to continue with openrc as it previously has.
I'd like to note that removing openrc levels from the container image is
probably the better solution but without any discussion towards that end
I don't want to strand anyone using this feature (regardless of my
personal take on it).
| -rw-r--r-- | amd64-hardened-nomultilib/Dockerfile | 3 | ||||
| -rw-r--r-- | amd64-hardened/Dockerfile | 3 | ||||
| -rw-r--r-- | amd64-nomultilib/Dockerfile | 3 | ||||
| -rw-r--r-- | amd64/Dockerfile | 3 | ||||
| -rw-r--r-- | x86/Dockerfile | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/amd64-hardened-nomultilib/Dockerfile b/amd64-hardened-nomultilib/Dockerfile index 43751a5..60c6e19 100644 --- a/amd64-hardened-nomultilib/Dockerfile +++ b/amd64-hardened-nomultilib/Dockerfile @@ -8,7 +8,8 @@ ADD build.sh / RUN /build.sh amd64 x86_64 -hardened+nomultilib # Setup the (virtually) current runlevel -RUN mkdir -p /run/openrc && echo "default" > /run/openrc/softlevel +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 diff --git a/amd64-hardened/Dockerfile b/amd64-hardened/Dockerfile index 4ac3a4b..a71c124 100644 --- a/amd64-hardened/Dockerfile +++ b/amd64-hardened/Dockerfile @@ -8,7 +8,8 @@ ADD build.sh / RUN /build.sh amd64 x86_64 -hardened # Setup the (virtually) current runlevel -RUN mkdir -p /run/openrc && echo "default" > /run/openrc/softlevel +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 diff --git a/amd64-nomultilib/Dockerfile b/amd64-nomultilib/Dockerfile index d8999da..0ca479c 100644 --- a/amd64-nomultilib/Dockerfile +++ b/amd64-nomultilib/Dockerfile @@ -8,7 +8,8 @@ ADD build.sh / RUN /build.sh amd64 x86_64 -nomultilib # Setup the (virtually) current runlevel -RUN mkdir -p /run/openrc && echo "default" > /run/openrc/softlevel +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 diff --git a/amd64/Dockerfile b/amd64/Dockerfile index b984b29..0caa70f 100644 --- a/amd64/Dockerfile +++ b/amd64/Dockerfile @@ -8,7 +8,8 @@ ADD build.sh / RUN /build.sh amd64 x86_64 # Setup the (virtually) current runlevel -RUN mkdir -p /run/openrc && echo "default" > /run/openrc/softlevel +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 diff --git a/x86/Dockerfile b/x86/Dockerfile index 2a3a074..9618f6e 100644 --- a/x86/Dockerfile +++ b/x86/Dockerfile @@ -13,7 +13,8 @@ RUN apt-get update && apt-get install -y \ RUN /build.sh x86 i686 # Setup the (virtually) current runlevel -RUN mkdir -p /run/openrc && echo "default" > /run/openrc/softlevel +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 |