EvergreenCrypto/docker-finance
1
1
Fork 1
Code Issues 31 Pull Requests Actions Releases 10 Activity

client: lib_docker: version: refactor, print image name

Browse Source
This commit is contained in:
Aaron Fiore
2024-07-12 22:05:08 -07:00
parent bc7ebff2a1
commit e11a142a86
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
client/src/docker/lib/internal/lib_docker.bash
View File

@@ -635,10 +635,9 @@ function lib_docker::__version()
{ {
lib_docker::__parse_args_version "$@" lib_docker::__parse_args_version "$@"
[ -z "${DOCKER_FINANCE_VERSION}" ] && lib_utils::die_fatal
[ -z "${DOCKER_FINANCE_CLIENT_REPO}" ] && lib_utils::die_fatal
[ -z "$global_platform" ] && lib_utils::die_fatal [ -z "$global_platform" ] && lib_utils::die_fatal
[ -z "$global_platform_image" ] && lib_utils::die_fatal
[ -z "${global_arg_type[*]}" ] && lib_utils::die_fatal [ -z "${global_arg_type[*]}" ] && lib_utils::die_fatal
for _type in "${global_arg_type[@]}"; do for _type in "${global_arg_type[@]}"; do
@@ -665,23 +664,20 @@ function lib_docker::__version()
container) container)
# Feed dependency manifest (client is not bind-mounted for security reasons) # Feed dependency manifest (client is not bind-mounted for security reasons)
[ -z "$global_repo_manifest" ] && lib_utils::die_fatal
local _manifest local _manifest
# TODO: use global_repo_manifest _manifest="$(<$global_repo_manifest)"
_manifest="$(<${DOCKER_FINANCE_CLIENT_REPO}/client/docker-finance.yaml)"
# NOTE: uses variable "callback" # NOTE: uses variable "callback"
case "$global_platform" in case "$global_platform" in
archlinux) archlinux)
_platform="$global_platform" _platform="$global_platform"
_image="finance" _image="$global_platform_image"
_pkg="pacman -Q \$_package" _pkg="pacman -Q \$_package"
;; ;;
ubuntu | dev-tools) ubuntu | dev-tools)
if [[ "$global_platform" =~ ^ubuntu$|^dev-tools$ ]]; then _platform="ubuntu" # NOTE: current dev-tools is treated as an ubuntu-based image
_platform="ubuntu" _image="$global_platform_image"
_image="finance"
[[ "$global_platform" == "dev-tools" ]] && _image="dev-tools"
fi
_pkg="dpkg -s \$_package | grep -E \"(^Package:|^Version:)\" | cut -d' ' -f2 | paste -s | awk '{print \$1 \" \" \$2}'" _pkg="dpkg -s \$_package | grep -E \"(^Package:|^Version:)\" | cut -d' ' -f2 | paste -s | awk '{print \$1 \" \" \$2}'"
;; ;;
*) *)
@@ -707,6 +703,9 @@ function lib_docker::__version()
;; ;;
short) short)
[ -z "$DOCKER_FINANCE_CLIENT_REPO" ] && lib_utils::die_fatal
[ -z "$DOCKER_FINANCE_VERSION" ] && lib_utils::die_fatal
local _hash local _hash
if pushd "$DOCKER_FINANCE_CLIENT_REPO" 1>/dev/null; then if pushd "$DOCKER_FINANCE_CLIENT_REPO" 1>/dev/null; then
_hash="$(git log --pretty='format:%h' -n 1)" _hash="$(git log --pretty='format:%h' -n 1)"
@@ -717,7 +716,7 @@ function lib_docker::__version()
# TODO: add build type # TODO: add build type
echo echo
echo -e "docker-finance ${DOCKER_FINANCE_VERSION} | commit: $_hash | build: $global_platform" echo -e "docker-finance $DOCKER_FINANCE_VERSION | commit: $_hash | platform: $global_platform | image: $global_platform_image"
;; ;;
*) *)