client: lib_docker: build: use 'experimental' path

client/src/docker/lib/internal/lib_docker.bash

@@ -235,29 +235,40 @@ function lib_docker::__build()
 
   if [[ "$global_platform" != "dev-tools" ]]; then
 
-    local _in_files=()
+    local _files=()
+    local _path="${global_repo_dockerfiles}/${global_platform}"
 
     case "$global_arg_type" in
-      default | slim | experimental)
+      default)
-        _in_files+=("hledger-flow.src")
+        _files+=("${_path}/Dockerfile.hledger-flow.src.in")
-        [[ "$global_arg_type" =~ ^default$|^experimental$ ]] && _in_files+=("root")
+        _files+=("${_path}/Dockerfile.root.in")
-        [[ "$global_arg_type" =~ ^experimental$ ]] && _in_files+=("hledger.src")
         ;;
-      tiny | micro)
+      slim)
-        _in_files+=("hledger-flow.bin")
+        _files+=("${_path}/Dockerfile.hledger-flow.src.in")
-        [[ "$global_arg_type" == "tiny" ]] && _in_files+=("root")
+        ;;
+      tiny)
+        _files+=("${_path}/Dockerfile.hledger-flow.bin.in")
+        _files+=("${_path}/Dockerfile.root.in")
+        ;;
+      micro)
+        _files+=("${_path}/Dockerfile.hledger-flow.bin.in")
+        ;;
+      experimental)
+        _path+="/experimental"
+        _files+=("${_path}/Dockerfile.hledger-flow.src.in")
+        _files+=("${_path}/Dockerfile.hledger.src.in")
+        _files+=("${_path}/Dockerfile.root.in")
         ;;
       *)
         lib_utils::die_fatal "unsupported build"
         ;;
     esac
 
-    for _file in "${_in_files[@]}"; do
+    for _file in "${_files[@]}"; do
-      local _path="${global_repo_dockerfiles}/${global_platform}/Dockerfile.${_file}.in"
+      lib_utils::print_debug "Appending '${_file}' to '${_final}'"
-      lib_utils::print_debug "Appending '${_path}' to '${_final}'"
       sed \
         -e "s:@DOCKER_FINANCE_USER@:${DOCKER_FINANCE_USER}:g" \
-        "$_path" >>"$_final" || return $?
+        "$_file" >>"$_final" || return $?
     done
 
   fi