merging workstation diffs
This commit is contained in:
@@ -45,7 +45,7 @@ if [[ "$(uname -s)" == Linux* ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
case "$(uname -s)" in
|
case "$(uname -s)" in
|
||||||
Darwin*) memory=12288 ;;
|
Darwin*) memory=16384 ;;
|
||||||
Linux*) memory=8192 ;;
|
Linux*) memory=8192 ;;
|
||||||
*)
|
*)
|
||||||
echo "Unsupported platform"
|
echo "Unsupported platform"
|
||||||
@@ -62,8 +62,8 @@ if [[ "$(uname -s)" == Darwin* ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if ! podman machine inspect &>/dev/null; then
|
if ! podman machine inspect &>/dev/null; then
|
||||||
echo "Initializing podman machine with 4 CPUs and $((memory / 1024))GB RAM..."
|
echo "Initializing podman machine with 6 CPUs and $((memory / 1024))GB RAM..."
|
||||||
podman machine init --rootful --cpus 4 --memory "$memory"
|
podman machine init --rootful --cpus 6 --memory "$memory"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$(uname -s)" == Darwin* ]]; then
|
if [[ "$(uname -s)" == Darwin* ]]; then
|
||||||
|
|||||||
+1
-1
@@ -10,7 +10,7 @@ alias grep='grep --color=auto'
|
|||||||
alias fgrep='grep -F --color=auto'
|
alias fgrep='grep -F --color=auto'
|
||||||
alias egrep='grep -E --color=auto'
|
alias egrep='grep -E --color=auto'
|
||||||
|
|
||||||
alias docker=podman
|
# alias docker=podman
|
||||||
|
|
||||||
alias d='dirs -v'
|
alias d='dirs -v'
|
||||||
for index in 1 2 3 4 5 6 7 8 9; do alias "c$index"="cd +${index}"; done; unset index
|
for index in 1 2 3 4 5 6 7 8 9; do alias "c$index"="cd +${index}"; done; unset index
|
||||||
|
|||||||
Reference in New Issue
Block a user