diff options
author | Pavlos Ratis <dastergon@dastergon.gr> | 2016-09-19 11:17:29 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-19 11:17:29 +0100 |
commit | 7494a9e9d0e8c14e66b477de29b8d5fc39f01d8e (patch) | |
tree | 097c026e53563e8cdb8f3474abbe1b6920f90e8e | |
parent | Merge pull request #33 from Soullivaneuh/patch-1 (diff) | |
parent | Update rc_sys setting to detect docker env (diff) | |
download | docker-images-7494a9e9d0e8c14e66b477de29b8d5fc39f01d8e.tar.gz docker-images-7494a9e9d0e8c14e66b477de29b8d5fc39f01d8e.tar.bz2 docker-images-7494a9e9d0e8c14e66b477de29b8d5fc39f01d8e.zip |
Merge pull request #36 from mrueg/rc_sys
Update rc_sys setting to detect docker env
-rw-r--r-- | amd64-hardened-nomultilib/Dockerfile | 2 | ||||
-rw-r--r-- | amd64-hardened/Dockerfile | 2 | ||||
-rw-r--r-- | amd64-nomultilib/Dockerfile | 2 | ||||
-rw-r--r-- | amd64/Dockerfile | 2 | ||||
-rw-r--r-- | x86/Dockerfile | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/amd64-hardened-nomultilib/Dockerfile b/amd64-hardened-nomultilib/Dockerfile index f4f1154..c5c5687 100644 --- a/amd64-hardened-nomultilib/Dockerfile +++ b/amd64-hardened-nomultilib/Dockerfile @@ -8,7 +8,7 @@ ADD build.sh / RUN /build.sh amd64 x86_64 -hardened+nomultilib # Setup the rc_sys -RUN sed -e 's/#rc_sys=""/rc_sys="lxc"/g' -i /etc/rc.conf +RUN sed -e 's/#rc_sys=""/rc_sys="docker"/g' -i /etc/rc.conf # By default, UTC system RUN echo 'UTC' > /etc/timezone diff --git a/amd64-hardened/Dockerfile b/amd64-hardened/Dockerfile index 994b7f4..bfde2bf 100644 --- a/amd64-hardened/Dockerfile +++ b/amd64-hardened/Dockerfile @@ -8,7 +8,7 @@ ADD build.sh / RUN /build.sh amd64 x86_64 -hardened # Setup the rc_sys -RUN sed -e 's/#rc_sys=""/rc_sys="lxc"/g' -i /etc/rc.conf +RUN sed -e 's/#rc_sys=""/rc_sys="docker"/g' -i /etc/rc.conf # By default, UTC system RUN echo 'UTC' > /etc/timezone diff --git a/amd64-nomultilib/Dockerfile b/amd64-nomultilib/Dockerfile index eafb747..11b811e 100644 --- a/amd64-nomultilib/Dockerfile +++ b/amd64-nomultilib/Dockerfile @@ -8,7 +8,7 @@ ADD build.sh / RUN /build.sh amd64 x86_64 -nomultilib # Setup the rc_sys -RUN sed -e 's/#rc_sys=""/rc_sys="lxc"/g' -i /etc/rc.conf +RUN sed -e 's/#rc_sys=""/rc_sys="docker"/g' -i /etc/rc.conf # By default, UTC system RUN echo 'UTC' > /etc/timezone diff --git a/amd64/Dockerfile b/amd64/Dockerfile index 2599070..374947c 100644 --- a/amd64/Dockerfile +++ b/amd64/Dockerfile @@ -8,7 +8,7 @@ ADD build.sh / RUN /build.sh amd64 x86_64 # Setup the rc_sys -RUN sed -e 's/#rc_sys=""/rc_sys="lxc"/g' -i /etc/rc.conf +RUN sed -e 's/#rc_sys=""/rc_sys="docker"/g' -i /etc/rc.conf # By default, UTC system RUN echo 'UTC' > /etc/timezone diff --git a/x86/Dockerfile b/x86/Dockerfile index ac49203..835c5b8 100644 --- a/x86/Dockerfile +++ b/x86/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \ RUN /build.sh x86 i686 # Setup the rc_sys -RUN sed -e 's/#rc_sys=""/rc_sys="lxc"/g' -i /etc/rc.conf +RUN sed -e 's/#rc_sys=""/rc_sys="docker"/g' -i /etc/rc.conf # By default, UTC system RUN echo 'UTC' > /etc/timezone |