Compare commits
No commits in common. "ca77a52c01fed06979b2fc46217c92feaa8f26a4" and "6b23dd47e290a654f6a1cfb8467224a58a1d6c8c" have entirely different histories.
ca77a52c01
...
6b23dd47e2
2 changed files with 2 additions and 12 deletions
|
@ -1,13 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
test -n "${EXTRA_PKGS}" && apk add --no-cache ${EXTRA_PKGS}
|
test -n "${EXTRA_PKGS}" && apk add --no-cache ${EXTRA_PKGS}
|
||||||
test -n "${EXTRA_GEMS}" && gem install --no-user-install --no-document ${EXTRA_GEMS}
|
test -n "${EXTRA_GEMS}" && gem install --no-user-install --no-document ${EXTRA_GEMS}
|
||||||
|
|
||||||
su-exec builder /usr/local/bin/gem-compiler
|
su-exec builder /usr/local/bin/gem-compiler
|
||||||
|
|
||||||
exit_status=$?
|
|
||||||
|
|
||||||
test -n "${EXTRA_PKGS}" && apk del ${EXTRA_PKGS}
|
|
||||||
test -n "${EXTRA_GEMS}" && gem uninstall ${EXTRA_GEMS}
|
|
||||||
|
|
||||||
exit ${exit_status}
|
|
||||||
|
|
|
@ -21,8 +21,6 @@ find build/ -type f |
|
||||||
|
|
||||||
source "${BUILD}"
|
source "${BUILD}"
|
||||||
|
|
||||||
set +e
|
|
||||||
|
|
||||||
HTTP_BASIC_USER="${HTTP_BASIC_USER}" \
|
HTTP_BASIC_USER="${HTTP_BASIC_USER}" \
|
||||||
HTTP_BASIC_PASSWORD="${HTTP_BASIC_PASSWORD}" \
|
HTTP_BASIC_PASSWORD="${HTTP_BASIC_PASSWORD}" \
|
||||||
SUTTY="${SUTTY}" \
|
SUTTY="${SUTTY}" \
|
||||||
|
@ -32,14 +30,12 @@ find build/ -type f |
|
||||||
EXTRA_PKGS="${EXTRA_PKGS}" \
|
EXTRA_PKGS="${EXTRA_PKGS}" \
|
||||||
EXTRA_GEMS="${EXTRA_GEMS}" \
|
EXTRA_GEMS="${EXTRA_GEMS}" \
|
||||||
GEM_COMPILER_FLAGS="${GEM_COMPILER_FLAGS}" \
|
GEM_COMPILER_FLAGS="${GEM_COMPILER_FLAGS}" \
|
||||||
/usr/local/bin/bootstrap
|
/usr/local/bin/bootstrap || true
|
||||||
|
|
||||||
if test $? -ne 0 ; then
|
if test $? -ne 0 ; then
|
||||||
BUILT="${FAILED}"
|
BUILT="${FAILED}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
dirname "${BUILT}" | xargs mkdir -p
|
dirname "${BUILT}" | xargs mkdir -p
|
||||||
touch "${BUILT}"
|
touch "${BUILT}"
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in a new issue