feat: add ability to specify a custom Dockerfile for an app

plugins/builder-dockerfile/builder-build

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_AVAILABLE_PATH/config/functions"
+source "$PLUGIN_AVAILABLE_PATH/builder-dockerfile/internal-functions"
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
 trigger-builder-dockerfile-builder-build() {
   declare desc="builder-dockerfile builder-build plugin trigger"
@@ -19,6 +21,19 @@ trigger-builder-dockerfile-builder-build() {
 
   pushd "$SOURCECODE_WORK_DIR" &>/dev/null
 
+  local NEW_DOCKERFILE="$(fn-builder-dockerfile-computed-dockerfile-path "$APP")"
+  if [[ -f "$NEW_DOCKERFILE" ]]; then
+    if [[ "$NEW_DOCKERFILE" != "Dockerfile" ]]; then
+      mv "$NEW_DOCKERFILE" Dockerfile
+    fi
+  else
+    rm Dockerfile
+  fi
+
+  if [[ ! -f Dockerfile ]]; then
+    dokku_log_fail "Invalid dockerfile-path specified: $dockerfile_path"
+  fi
+
   # extract first port from Dockerfile
   dos2unix Dockerfile
   local DOCKERFILE_PORTS=$(get_dockerfile_exposed_ports Dockerfile)
@@ -34,7 +49,7 @@ trigger-builder-dockerfile-builder-build() {
   declare -a ARG_ARRAY
   eval "ARG_ARRAY=($DOCKER_ARGS)"
 
-  "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS "${ARG_ARRAY[@]}" "${DOKKU_DOCKER_BUILD_OPTS[@]}" -t $IMAGE .
+  "$DOCKER_BIN" image build --file "$dockerfile_path" "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS "${ARG_ARRAY[@]}" "${DOKKU_DOCKER_BUILD_OPTS[@]}" -t $IMAGE .
 
   plugn trigger post-build-dockerfile "$APP"
 }

plugins/builder-dockerfile/commands

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_AVAILABLE_PATH/builder-dockerfile/help-functions"
+
+case "$1" in
+  help | builder-dockerfile:help)
+    cmd-builder-dockerfile-help "$@"
+    ;;
+
+  *)
+    exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
+    ;;
+
+esac

plugins/builder-dockerfile/help-functions

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+cmd-builder-dockerfile-help() {
+  declare desc="help command"
+  declare CMD="$1"
+  local plugin_name="builder-dockerfile"
+  local plugin_description="Manage the dockerfile builder integration for an app"
+
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
+    echo ''
+    echo "$plugin_description"
+    echo ''
+    echo 'Additional commands:'
+    fn-help-content | sort | column -c2 -t -s,
+  elif [[ $(ps -o command= $PPID) == *"--all"* ]]; then
+    fn-help-content
+  else
+    cat <<help_desc
+    $plugin_name, $plugin_description
+help_desc
+  fi
+}
+
+fn-help-content() {
+  declare desc="return help content"
+  cat <<help_content
+    builder-dockerfile:report [<app>] [<flag>], Displays a builder-dockerfile report for one or more apps
+    builder-dockerfile:set <app> <property> (<value>), Set or clear a builder-dockerfile property for an app
+help_content
+}

plugins/builder-dockerfile/internal-commands

@@ -0,0 +1,91 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+cmd-builder-dockerfile-report() {
+  declare desc="displays a builder-dockerfile report for one or more apps"
+  declare cmd="builder-dockerfile:report"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" INFO_FLAG="$2"
+  local INSTALLED_APPS=$(dokku_apps)
+
+  if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
+    INFO_FLAG="$APP"
+    APP=""
+  fi
+
+  if [[ -z "$APP" ]] && [[ -z "$INFO_FLAG" ]]; then
+    INFO_FLAG="true"
+  fi
+
+  if [[ -z "$APP" ]]; then
+    for app in $INSTALLED_APPS; do
+      cmd-builder-dockerfile-report-single "$app" "$INFO_FLAG" | tee || true
+    done
+  else
+    cmd-builder-dockerfile-report-single "$APP" "$INFO_FLAG"
+  fi
+}
+
+cmd-builder-dockerfile-report-single() {
+  declare APP="$1" INFO_FLAG="$2"
+  if [[ "$INFO_FLAG" == "true" ]]; then
+    INFO_FLAG=""
+  fi
+  verify_app_name "$APP"
+  local flag_map=(
+    "--builder-dockerfile-computed-dockerfile-path: $(fn-builder-dockerfile-computed-dockerfile-path "$APP")"
+    "--builder-dockerfile-global-dockerfile-path: $(fn-builder-dockerfile-global-dockerfile-path "$APP")"
+    "--builder-dockerfile-dockerfile-path: $(fn-builder-dockerfile-dockerfile-path "$APP")"
+  )
+
+  if [[ -z "$INFO_FLAG" ]]; then
+    dokku_log_info2_quiet "${APP} builder-dockerfile information"
+    for flag in "${flag_map[@]}"; do
+      key="$(echo "${flag#--}" | cut -f1 -d' ' | tr - ' ')"
+      dokku_log_verbose "$(printf "%-30s %-25s" "${key^}" "${flag#*: }")"
+    done
+  else
+    local match=false
+    local value_exists=false
+    for flag in "${flag_map[@]}"; do
+      valid_flags="${valid_flags} $(echo "$flag" | cut -d':' -f1)"
+      if [[ "$flag" == "${INFO_FLAG}:"* ]]; then
+        value=${flag#*: }
+        size="${#value}"
+        if [[ "$size" -ne 0 ]]; then
+          echo "$value" && match=true && value_exists=true
+        else
+          match=true
+        fi
+      fi
+    done
+    [[ "$match" == "true" ]] || dokku_log_fail "Invalid flag passed, valid flags:${valid_flags}"
+    [[ "$value_exists" == "true" ]] || dokku_log_fail "not deployed"
+  fi
+}
+
+fn-builder-dockerfile-computed-dockerfile-path() {
+  declare APP="$1"
+
+  file="$(fn-builder-dockerfile-dockerfile-path "$APP")"
+  if [[ "$file" == "" ]]; then
+    file="$(fn-builder-dockerfile-global-dockerfile-path "$APP")"
+  fi
+
+  echo "$file"
+}
+
+fn-builder-dockerfile-global-dockerfile-path() {
+  declare APP="$1"
+
+  fn-plugin-property-get "builder-dockerfile" "--global" "dockerfile-path" "Dockerfile"
+}
+
+fn-builder-dockerfile-dockerfile-path() {
+  declare APP="$1"
+
+  fn-plugin-property-get "builder-dockerfile" "$APP" "dockerfile-path" ""
+}

plugins/builder-dockerfile/report

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+source "$PLUGIN_AVAILABLE_PATH/builder-dockerfile/internal-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+cmd-builder-dockerfile-report-single "$@"

plugins/builder-dockerfile/subcommands/default

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+source "$PLUGIN_AVAILABLE_PATH/builder-dockerfile/help-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+cmd-builder-dockerfile-help "builder-dockerfile:help"

plugins/builder-dockerfile/subcommands/report

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+source "$PLUGIN_AVAILABLE_PATH/builder-dockerfile/internal-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+cmd-builder-dockerfile-report "$@"

plugins/builder-dockerfile/subcommands/set

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+cmd-builder-dockerfile-set() {
+  declare desc="set or clear a builder-dockerfile property for an app"
+  declare cmd="builder-dockerfile:set"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" KEY="$2" VALUE="$3"
+  local VALID_KEYS=("dockerfile-path")
+  [[ "$APP" == "--global" ]] || verify_app_name "$APP"
+
+  [[ -z "$KEY" ]] && dokku_log_fail "No key specified"
+
+  if ! fn-in-array "$KEY" "${VALID_KEYS[@]}"; then
+    dokku_log_fail "Invalid key specified, valid keys include: dockerfile-path"
+  fi
+
+  if [[ -n "$VALUE" ]]; then
+    dokku_log_info2_quiet "Setting ${KEY} to ${VALUE}"
+    fn-plugin-property-write "builder-dockerfile" "$APP" "$KEY" "$VALUE"
+  else
+    dokku_log_info2_quiet "Unsetting ${KEY}"
+    fn-plugin-property-delete "builder-dockerfile" "$APP" "$KEY"
+  fi
+}
+
+cmd-builder-dockerfile-set "$@"