lintball in build-env
This commit is contained in:
1 parent
58d0bc983a
commit
f9b7d5378d
3 files changed
+10
-9
No files matched your search
@@ -176,7 +176,7 @@ EOF
|
|||||||
done
|
done
|
||||||
|
|
||||||
if [ "$implemented" -eq 0 ]; then
|
if [ "$implemented" -eq 0 ]; then
|
||||||
echo " ! \`$@\` is not a dokku command."
|
echo " ! \`$*\` is not a dokku command."
|
||||||
echo " ! See \`dokku help\` for a list of available commands."
|
echo " ! See \`dokku help\` for a list of available commands."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ APP="$1"; IMAGE="dokku/$APP"; BUILD_ENV=""
|
|||||||
|
|
||||||
[[ -f "$DOKKU_ROOT/BUILD_ENV" ]] && cat "$DOKKU_ROOT/BUILD_ENV" >> "$DOKKU_ROOT/ENV" && rm "$DOKKU_ROOT/BUILD_ENV"
|
[[ -f "$DOKKU_ROOT/BUILD_ENV" ]] && cat "$DOKKU_ROOT/BUILD_ENV" >> "$DOKKU_ROOT/ENV" && rm "$DOKKU_ROOT/BUILD_ENV"
|
||||||
|
|
||||||
[[ ! $(grep CURL_CONNECT_TIMEOUT "$DOKKU_ROOT/ENV") ]] && echo "export CURL_CONNECT_TIMEOUT=5" >> "$DOKKU_ROOT/ENV"
|
! (grep -q CURL_CONNECT_TIMEOUT "$DOKKU_ROOT/ENV") && echo "export CURL_CONNECT_TIMEOUT=5" >> "$DOKKU_ROOT/ENV"
|
||||||
[[ ! $(grep CURL_TIMEOUT "$DOKKU_ROOT/ENV") ]] && echo "export CURL_TIMEOUT=30" >> "$DOKKU_ROOT/ENV"
|
! (grep -q CURL_TIMEOUT "$DOKKU_ROOT/ENV") && echo "export CURL_TIMEOUT=30" >> "$DOKKU_ROOT/ENV"
|
||||||
|
|
||||||
if [[ -f "$DOKKU_ROOT/ENV" ]]; then
|
if [[ -f "$DOKKU_ROOT/ENV" ]]; then
|
||||||
BUILD_ENV+=$(< "$DOKKU_ROOT/ENV")
|
BUILD_ENV+=$(< "$DOKKU_ROOT/ENV")
|
||||||
@@ -20,12 +20,12 @@ if [[ ! -z "$BUILD_ENV" ]]; then
|
|||||||
echo "-----> Adding BUILD_ENV to build environment..."
|
echo "-----> Adding BUILD_ENV to build environment..."
|
||||||
# create build env files for use in buildpacks like this:
|
# create build env files for use in buildpacks like this:
|
||||||
# https://github.com/niteoweb/heroku-buildpack-buildout/blob/5879fa3418f7d8e079f1aa5816ba1adde73f4948/bin/compile#L34
|
# https://github.com/niteoweb/heroku-buildpack-buildout/blob/5879fa3418f7d8e079f1aa5816ba1adde73f4948/bin/compile#L34
|
||||||
id=$(echo $BUILD_ENV |sed 's@export @@g'| docker run -i -a stdin $IMAGE /bin/bash -c "for ENV_VAR in `cat`; do echo \$ENV_VAR |sed 's@^\([^=]*\)=\(.*\)\$@echo \2 >/tmp/env/\1@g' >>/tmp/set_env.sh; done && mkdir -p /tmp/env && /bin/bash /tmp/set_env.sh")
|
id=$(echo $BUILD_ENV |sed 's@export @@g'| docker run -i -a stdin $IMAGE /bin/bash -c "for ENV_VAR in $(cat); do echo \$ENV_VAR |sed 's@^\([^=]*\)=\(.*\)\$@echo \2 >/tmp/env/\1@g' >>/tmp/set_env.sh; done && mkdir -p /tmp/env && /bin/bash /tmp/set_env.sh")
|
||||||
test $(docker wait $id) -eq 0
|
test "$(docker wait $id)" -eq 0
|
||||||
docker commit $id $IMAGE > /dev/null
|
docker commit $id $IMAGE > /dev/null
|
||||||
|
|
||||||
# create build env for 'old style' buildpacks and dokku plugins
|
# create build env for 'old style' buildpacks and dokku plugins
|
||||||
id=$(echo "$BUILD_ENV" | docker run -i -a stdin $IMAGE /bin/bash -c "cat >> /app/.env")
|
id=$(echo "$BUILD_ENV" | docker run -i -a stdin $IMAGE /bin/bash -c "cat >> /app/.env")
|
||||||
test $(docker wait $id) -eq 0
|
test "$(docker wait $id)" -eq 0
|
||||||
docker commit $id $IMAGE > /dev/null
|
docker commit $id $IMAGE > /dev/null
|
||||||
fi
|
fi
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
# constants
|
# constants
|
||||||
TEST_APP=my-cool-guy-test-app
|
TEST_APP=my-cool-guy-test-app
|
||||||
|
|
||||||
# test functions
|
# test functions
|
||||||
flunk() {
|
flunk() {
|
||||||
{ if [ "$#" -eq 0 ]; then cat -
|
{ if [ "$#" -eq 0 ]; then cat -
|
||||||
else echo "$@"
|
else echo "$*"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
return 1
|
return 1
|
||||||
@@ -71,8 +72,8 @@ refute_line() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
assert() {
|
assert() {
|
||||||
if ! "$@"; then
|
if ! "$*"; then
|
||||||
flunk "failed: $@"
|
flunk "failed: $*"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user