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

client: lib_docker: append custom Dockerfile to final Dockerfile

Browse Source
This commit is contained in:
Aaron Fiore
2024-06-26 00:52:02 -07:00
parent aafe16c0c0
commit 494e0c5402
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,12 +53,12 @@ fi
function lib_docker::__docker_compose() function lib_docker::__docker_compose()
{ {
[ -z "$global_env_file" ] && lib_utils::die_fatal [ -z "$global_env_file" ] && lib_utils::die_fatal
[ -z "$global_dockerfile_path" ] && lib_utils::die_fatal [ -z "$global_repo_dockerfiles" ] && lib_utils::die_fatal
[ ! -f "$global_env_file" ] \ [ ! -f "$global_env_file" ] \
&& lib_utils::die_fatal "$global_env_file not found! Run the gen command!" && lib_utils::die_fatal "$global_env_file not found! Run the gen command!"
pushd "$global_dockerfile_path" 1>/dev/null \ pushd "$global_repo_dockerfiles" 1>/dev/null \
|| return $? \ || return $? \
&& docker compose -f docker-compose.yml --env-file "$global_env_file" "$@" && docker compose -f docker-compose.yml --env-file "$global_env_file" "$@"
popd 1>/dev/null || return $? popd 1>/dev/null || return $?

26
client/src/docker/lib/lib_docker.bash
View File

@@ -109,15 +109,18 @@ function lib_docker::docker()
# Setup remaining client/container globals # Setup remaining client/container globals
lib_gen::gen || return $? lib_gen::gen || return $?
# TODO: all following docker related should be internal
# Docker-related files
[ -z "$global_repo_client" ] && lib_utils::die_fatal [ -z "$global_repo_client" ] && lib_utils::die_fatal
declare -g global_dockerfile_path="${global_repo_client}/Dockerfiles/" declare -g global_repo_dockerfiles="${global_repo_client}/Dockerfiles/"
case "$global_platform" in case "$global_platform" in
archlinux | ubuntu) archlinux | ubuntu)
global_dockerfile_path+="finance" global_repo_dockerfiles+="finance"
;; ;;
dev-tools) dev-tools)
global_dockerfile_path+="dev-tools" global_repo_dockerfiles+="dev-tools"
;; ;;
*) *)
lib_utils::die_fatal "platform was not previously checked" lib_utils::die_fatal "platform was not previously checked"
@@ -131,7 +134,7 @@ function lib_docker::docker()
[ -z "$global_env_file" ] && lib_utils::die_fatal [ -z "$global_env_file" ] && lib_utils::die_fatal
[ -z "$global_shell_file" ] && lib_utils::die_fatal [ -z "$global_shell_file" ] && lib_utils::die_fatal
local _path="${global_dockerfile_path}/docker-compose.yml" local _path="${global_repo_dockerfiles}/docker-compose.yml"
lib_utils::print_debug "Generating '${_path}'" lib_utils::print_debug "Generating '${_path}'"
sed \ sed \
@@ -148,7 +151,7 @@ function lib_docker::docker()
[ -z "$DOCKER_FINANCE_GID" ] && lib_utils::die_fatal [ -z "$DOCKER_FINANCE_GID" ] && lib_utils::die_fatal
[ -z "$DOCKER_FINANCE_USER" ] && lib_utils::die_fatal [ -z "$DOCKER_FINANCE_USER" ] && lib_utils::die_fatal
local _path="${global_dockerfile_path}/Dockerfile" local _path="${global_repo_dockerfiles}/Dockerfile"
lib_utils::print_debug "Generating '${_path}'" lib_utils::print_debug "Generating '${_path}'"
sed \ sed \
@@ -157,6 +160,19 @@ function lib_docker::docker()
-e "s:@DOCKER_FINANCE_USER@:${DOCKER_FINANCE_USER}:g" \ -e "s:@DOCKER_FINANCE_USER@:${DOCKER_FINANCE_USER}:g" \
"${_path}.${global_platform}.in" >"$_path" || return $? "${_path}.${global_platform}.in" >"$_path" || return $?
# Append end-user's custom Dockerfile to final Dockerfile
[ -z "$global_custom_dockerfile" ] && lib_utils::die_fatal
if [[ ! -f "$global_custom_dockerfile" ]]; then
lib_utils::print_debug "'${global_custom_dockerfile}' not found, skipping"
return 0
fi
lib_utils::print_debug "Appending '${global_custom_dockerfile}' to '${_path}'"
sed \
-e "s:@DOCKER_FINANCE_USER@:${DOCKER_FINANCE_USER}:g" \
"$global_custom_dockerfile" >>"$_path" || return $?
return 0 return 0
} }