first pass at dockerfile support

plugins/00_dokku-standard/commands

@@ -3,6 +3,76 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$(dirname $0)/../common/functions"
 
 case "$1" in
+  build)
+    APP="$2"; IMAGE="dokku/$APP"; IMAGE_SOURCE_TYPE="$3"; TMP_WORK_DIR="$4"
+    CACHE_DIR="$DOKKU_ROOT/$APP/cache"
+
+    pushd "$TMP_WORK_DIR" &> /dev/null
+
+    case "$IMAGE_SOURCE_TYPE" in
+      buildstep)
+        id=$(tar -c . | docker run -i -a stdin $DOKKU_IMAGE /bin/bash -c "mkdir -p /app && tar -xC /app")
+        test "$(docker wait $id)" -eq 0
+        docker commit $id $IMAGE > /dev/null
+        [[ -d $CACHE_DIR ]] || mkdir $CACHE_DIR
+        pluginhook pre-build "$APP"
+
+        # *DEPRECATED* in v0.4.0: `pluginhook docker-args` will be removed in future releases
+        # https://github.com/progrium/dokku/issues/896 & https://github.com/progrium/dokku/issues/906
+        DOCKER_ARGS=$(: | pluginhook docker-args $APP build)
+        DOCKER_ARGS+=$(: | pluginhook docker-args-build $APP)
+        id=$(docker run -d -v $CACHE_DIR:/cache -e CACHE_PATH=/cache $DOCKER_ARGS $IMAGE /build/builder)
+        docker attach $id
+        test "$(docker wait $id)" -eq 0
+        docker commit $id $IMAGE > /dev/null
+
+        pluginhook post-build "$APP"
+        ;;
+
+      dockerfile)
+        # sticking with same pattern of building app image before pre-build for now.
+        docker build -t "$IMAGE" .
+        # buildstep pluginhooks don't necessarily make sense for dockerfiles. call the new breed!!!
+        pluginhook pre-build-dockerfile "$APP"
+        pluginhook post-build-dockerfile "$APP"
+        ;;
+
+      *)
+        dokku_log_fail "Building image source type $IMAGE_SOURCE_TYPE not supported!"
+        ;;
+    esac
+    ;;
+
+  release)
+    APP="$2"; IMAGE="dokku/$APP"; IMAGE_SOURCE_TYPE="$3"
+    case "$IMAGE_SOURCE_TYPE" in
+      buildstep)
+        pluginhook pre-release "$APP"
+        if [[ -f "$DOKKU_ROOT/ENV" ]]; then
+          id=$(docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/00-global-env.sh" < "$DOKKU_ROOT/ENV")
+          test "$(docker wait $id)" -eq 0
+          docker commit $id $IMAGE > /dev/null
+        fi
+        if [[ -f "$DOKKU_ROOT/$APP/ENV" ]]; then
+          id=$(docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/01-app-env.sh" < "$DOKKU_ROOT/$APP/ENV")
+          test "$(docker wait $id)" -eq 0
+          docker commit $id $IMAGE > /dev/null
+        fi
+        pluginhook post-release "$APP"
+        ;;
+
+      dockerfile)
+        # buildstep pluginhooks don't necessarily make sense for dockerfiles. call the new breed!!!
+        pluginhook pre-release-dockerfile "$APP"
+        pluginhook post-release-dockerfile "$APP"
+        ;;
+
+      *)
+        dokku_log_fail "Releasing image source type $IMAGE_SOURCE_TYPE not supported!"
+        ;;
+    esac
+    ;;
+
   trace)
     [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p $DOKKU_ROOT/.dokkurc
     [[ "$2" == "on" ]] || [[ "$2" == "off" ]] || {
@@ -67,8 +137,9 @@ case "$1" in
     DOCKER_ARGS+=$(: | pluginhook docker-args-run $APP)
     [[ $DOKKU_RM_CONTAINER ]] && DOKKU_RUN_OPTS="--rm"
     has_tty && DOKKU_RUN_OPTS+=" -i -t"
+    is_image_buildstep_based "$IMAGE" && EXEC_CMD="/exec"
 
-    docker run $DOKKU_RUN_OPTS $DOCKER_ARGS $IMAGE /exec "$@"
+    docker run $DOKKU_RUN_OPTS $DOCKER_ARGS $IMAGE $EXEC_CMD "$@"
     ;;
 
   url | urls)

plugins/common/functions

@@ -85,9 +85,16 @@ dokku_log_fail() {
 verify_app_name() {
   local APP="$1"
   [[ ! -d "$DOKKU_ROOT/$APP" ]] && dokku_log_fail "App $APP does not exist"
+  IMAGE="dokku/$APP"
   return 0
 }
 
+is_image_buildstep_based() {
+  # circleci can't support --rm as they run lxc in lxc
+  [[ ! -f "/home/ubuntu/.circlerc" ]] && local DOCKER_ARGS="--rm"
+  docker run --entrypoint="/bin/bash" $DOCKER_ARGS "$@" -c "[[ -f /exec ]]"
+}
+
 parse_args() {
   for arg in "$@"; do
     case "$arg" in

plugins/config/docker-args-deploy

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$(dirname $0)/../common/functions"
+
+STDIN=$(cat); APP="$1"; IMAGE="dokku/$APP"
+DOCKERFILE_ENV_FILE="$DOKKU_ROOT/$APP/DOCKERFILE_ENV_FILE"
+
+if ! is_image_buildstep_based "$IMAGE"; then
+  > "$DOCKERFILE_ENV_FILE"
+  [[ -f "$DOKKU_ROOT/ENV" ]] && sed -e "s:^export ::g" "$DOKKU_ROOT/ENV" > "$DOCKERFILE_ENV_FILE"
+  [[ -f "$DOKKU_ROOT/$APP/ENV" ]] && sed -e "s:^export ::g" "$DOKKU_ROOT/$APP/ENV" >> "$DOCKERFILE_ENV_FILE"
+
+  echo "$STDIN --env-file=$DOCKERFILE_ENV_FILE"
+else
+  echo "$STDIN"
+fi

plugins/git/commands

@@ -1,19 +1,30 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$(dirname $0)/../common/functions"
 
-git_archive_all() {
-  APP=$1; REV=$2
+git_build_app_repo() {
+  verify_app_name "$1"
+  APP="$1"; REV="$2"
+
+  # clean up after ourselves
   TMP_WORK_DIR=$(mktemp -d)
+  trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' RETURN
+
+  # git clone
   chmod 755 $TMP_WORK_DIR
   unset GIT_DIR GIT_WORK_TREE
   pushd $TMP_WORK_DIR > /dev/null
-  git clone -q $DOKKU_ROOT/$APP $TMP_WORK_DIR &> /dev/null
+  git clone -q "$DOKKU_ROOT/$APP" "$TMP_WORK_DIR" &> /dev/null
   git config advice.detachedHead false
-  git checkout $REV &> /dev/null
+  git checkout "$REV" &> /dev/null
   git submodule update --init --recursive &> /dev/null
   find -name .git -prune -exec rm -rf {} \; > /dev/null
-  tar c .
-  rm -rf $TMP_WORK_DIR > /dev/null
+
+  if [[ -f Dockerfile ]] && [[ "$([[ -f .env ]] && grep -q BUILDPACK_URL .env; echo $?)" != "0" ]] && [[ ! -f ".buildpacks" ]]; then
+    dokku receive "$APP" "dockerfile" "$TMP_WORK_DIR" | sed -u "s/^/"$'\e[1G'"/"
+  else
+    dokku receive "$APP" "buildstep" "$TMP_WORK_DIR" | sed -u "s/^/"$'\e[1G'"/"
+  fi
 }
 
 case "$1" in
@@ -25,7 +36,8 @@ case "$1" in
       # Only run this script for the master branch. You can remove this
       # if block if you wish to run it for others as well.
       if [[ $refname = "refs/heads/master" ]] ; then
-        dokku git-build $APP $newrev
+        # broken out into pluginhook so we might support other methods to receive an app
+        pluginhook receive-app $APP $newrev
       else
         echo $'\e[1G\e[K'"-----> WARNING: deploy did not complete, you must push to master."
         echo $'\e[1G\e[K'"-----> for example, try 'git push <dokku> ${refname/refs\/heads\/}:master'"
@@ -56,7 +68,7 @@ case "$1" in
     else
       REF=$(< "$DOKKU_ROOT/$APP/refs/heads/master")
     fi
-    git_archive_all $APP $REF | dokku receive $APP | sed -u "s/^/"$'\e[1G'"/"
+    git_build_app_repo $APP $REF
     ;;
 
   git-*)

plugins/git/receive-app

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$(dirname $0)/../common/functions"
+
+APP="$1"; REV="$2"
+
+dokku git-build $APP $REV

plugins/ps/commands

@@ -4,14 +4,19 @@ source "$(dirname $0)/../common/functions"
 
 release_and_deploy() {
   source "$(dirname $0)/../common/functions"
-  local APP="$1";
+  local APP="$1"; local IMAGE="dokku/$APP"
 
   if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
+    if is_image_buildstep_based "$IMAGE"; then
+      IMAGE_SOURCE_TYPE="buildstep"
+    else
+      IMAGE_SOURCE_TYPE="dockerfile"
+    fi
+
     dokku_log_info1 "Releasing $APP ..."
-    dokku release $APP
-    dokku_log_info1 "Release complete!"
+    dokku release "$APP" "$IMAGE_SOURCE_TYPE"
     dokku_log_info1 "Deploying $APP ..."
-    dokku deploy $APP
+    dokku deploy "$APP"
     dokku_log_info2 "Application deployed:"
          dokku urls $APP | sed "s/^/       /"
     echo
@@ -63,7 +68,7 @@ case "$1" in
     verify_app_name "$2"
     APP="$2"
 
-    dokku git-build $APP
+    pluginhook receive-app $APP
   ;;
 
   ps:rebuildall)