Skip to content

Commit

Permalink
Merge pull request #118 from glerchundi/master
Browse files Browse the repository at this point in the history
load a predefined PATH if it wasn't provided in runtime
  • Loading branch information
glerchundi committed Dec 15, 2015
2 parents 66ded30 + 88b1330 commit 115f89e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
11 changes: 0 additions & 11 deletions builder/overlay-rootfs/etc/s6/init/init-stage1
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
#!/bin/execlineb -S0

##
## we add /usr/bin:/bin to PATH at least for the very first init-stage1 steps,
## this was motivated due to this issue:
## - https://github.com/just-containers/s6-overlay/issues/108
## although this change we'll keep how stages envs are handled, see below.
##

/bin/export PATH /usr/bin:/bin
/bin/import PATH


##
## dump environment into an envdir
##
Expand Down
10 changes: 10 additions & 0 deletions builder/overlay-rootfs/init
Original file line number Diff line number Diff line change
@@ -1,2 +1,12 @@
#!/bin/execlineb -S0

##
## load default PATH (the same that Docker includes if not provided) if it doesn't exist,
## then go ahead with stage1.
## this was motivated due to this issue:
## - https://github.com/just-containers/s6-overlay/issues/108
##


/bin/importas -D /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PATH PATH
/etc/s6/init/init-stage1 $@

0 comments on commit 115f89e

Please sign in to comment.