Merge branch 'master' of https://github.com/just-containers/s6-overlay …

…into upstream * 'master' of https://github.com/just-containers/s6-overlay: update to latest skaware: v1.15.0 should fix just-containers#83 (untested)
HowardMei · Oct 13, 2015 · 67c18eb · 67c18eb
2 parents bc4835a + 4c50869
commit 67c18eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/builder/build-latest b/builder/build-latest
@@ -6,7 +6,7 @@ set -x
 ## PARAMS
 ##
 
-RELEASE_VERSION=${RELEASE_VERSION:-1.14.0.0}
+RELEASE_VERSION=${RELEASE_VERSION:-1.15.0.0}
 SKAWARE_VERSION=${RELEASE_VERSION%.*}
 
 PWD=$(pwd)

diff --git a/builder/overlay-rootfs/etc/s6/init/init-stage2 b/builder/overlay-rootfs/etc/s6/init/init-stage2
@@ -37,6 +37,7 @@ foreground
             s6-test -n ${S6_RUNTIME_PROFILE}
           }
           import -u S6_RUNTIME_PROFILE_SRC
+          if { s6-rmrf /var/run/s6/etc }
           if { s6-mkdir -pm 0755 /var/run/s6/etc }
           forx i { "fix-attrs.d" "cont-init.d" "cont-finish.d" "services.d" }
           import -u i