CHANGED use namespace dokku for docker 0.10 compatibility
This commit is contained in:
1 parent
6d82792508
commit
2474844856
3 files changed
+7
-7
No files matched your search
@@ -14,7 +14,7 @@ fi
|
|||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
receive)
|
receive)
|
||||||
APP="$2"; IMAGE="app/$APP"
|
APP="$2"; IMAGE="dokku/$APP"
|
||||||
echo "-----> Cleaning up ..."
|
echo "-----> Cleaning up ..."
|
||||||
dokku cleanup
|
dokku cleanup
|
||||||
echo "-----> Building $APP ..."
|
echo "-----> Building $APP ..."
|
||||||
@@ -29,7 +29,7 @@ case "$1" in
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
build)
|
build)
|
||||||
APP="$2"; IMAGE="app/$APP"; CACHE_DIR="$DOKKU_ROOT/$APP/cache"
|
APP="$2"; IMAGE="dokku/$APP"; CACHE_DIR="$DOKKU_ROOT/$APP/cache"
|
||||||
id=$(cat | docker run -i -a stdin progrium/buildstep /bin/bash -c "mkdir -p /app && tar -xC /app")
|
id=$(cat | docker run -i -a stdin progrium/buildstep /bin/bash -c "mkdir -p /app && tar -xC /app")
|
||||||
test $(docker wait $id) -eq 0
|
test $(docker wait $id) -eq 0
|
||||||
docker commit $id $IMAGE > /dev/null
|
docker commit $id $IMAGE > /dev/null
|
||||||
@@ -43,7 +43,7 @@ case "$1" in
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
release)
|
release)
|
||||||
APP="$2"; IMAGE="app/$APP"
|
APP="$2"; IMAGE="dokku/$APP"
|
||||||
pluginhook pre-release $APP
|
pluginhook pre-release $APP
|
||||||
if [[ -f "$DOKKU_ROOT/$APP/ENV" ]]; then
|
if [[ -f "$DOKKU_ROOT/$APP/ENV" ]]; then
|
||||||
id=$(cat "$DOKKU_ROOT/$APP/ENV" | docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/app-env.sh")
|
id=$(cat "$DOKKU_ROOT/$APP/ENV" | docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/app-env.sh")
|
||||||
@@ -54,7 +54,7 @@ case "$1" in
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
deploy)
|
deploy)
|
||||||
APP="$2"; IMAGE="app/$APP"
|
APP="$2"; IMAGE="dokku/$APP"
|
||||||
pluginhook pre-deploy $APP
|
pluginhook pre-deploy $APP
|
||||||
|
|
||||||
# kill the app when running
|
# kill the app when running
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ case "$1" in
|
|||||||
echo "Please specify an app to delete"
|
echo "Please specify an app to delete"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
APP="$2"; IMAGE="app/$APP";
|
APP="$2"; IMAGE="dokku/$APP";
|
||||||
if [[ ! -d "$DOKKU_ROOT/$APP" ]]; then
|
if [[ ! -d "$DOKKU_ROOT/$APP" ]]; then
|
||||||
echo "App does not exist"
|
echo "App does not exist"
|
||||||
exit 1
|
exit 1
|
||||||
@@ -53,7 +53,7 @@ case "$1" in
|
|||||||
echo "Please specify an app to run the command on"
|
echo "Please specify an app to run the command on"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
APP="$2"; IMAGE="app/$APP"
|
APP="$2"; IMAGE="dokku/$APP"
|
||||||
if [[ ! -d "$DOKKU_ROOT/$APP" ]]; then
|
if [[ ! -d "$DOKKU_ROOT/$APP" ]]; then
|
||||||
echo "App $APP does not exist"
|
echo "App $APP does not exist"
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
APP="$1"
|
APP="$1"
|
||||||
IMAGE=app/"$1"
|
IMAGE=dokku/"$1"
|
||||||
CACHE_DIR="$DOKKU_ROOT/$APP/cache"
|
CACHE_DIR="$DOKKU_ROOT/$APP/cache"
|
||||||
|
|
||||||
docker run -v $CACHE_DIR:/cache $IMAGE find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \;
|
docker run -v $CACHE_DIR:/cache $IMAGE find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \;
|
||||||
|
|||||||
Reference in new issue
Block a user