bash aliases : local apt-cacher-ng :) + changes for docker and rsync

Author: frolland04

.bash_aliases

@@ -1,23 +1,26 @@
-HISTSIZE=10000
-HISTFILESIZE=20000
+HISTSIZE=30000
+HISTFILESIZE=90000
 
 alias ls='ls --color=never'
 alias ll='ls -alF --color=never'
 alias h='history | fzf'
 
-alias dc='sudo docker container ls --all'
-alias di='sudo docker image ls'
-alias dn='sudo docker network ls'
-alias dv='sudo docker volume ls'
+alias dc='docker container ls --all'
+alias di='docker image ls'
+alias dn='docker network ls'
+alias dv='docker volume ls'
+alias dr='docker image ls | grep "<none>" | tr -s " *" " " | cut -d " " -f 3 | xargs -n 1 docker image rm'
+alias dp='docker builder prune'
+alias dpa='docker builder prune --all'
 
 alias glo='git log -20 --oneline'
 alias gs='git status'
 alias gc='git config --list'
 alias gce='git config user.name "Frédéric ROLLAND" && git config user.email "[email protected]"'
 alias gcf='git config user.name "Frédéric ROLLAND" && git config user.email "[email protected]"'
 
-alias upd='sudo apt-get update && sudo apt-get upgrade'
-alias updd='sudo apt-get update && sudo apt-get full-upgrade'
+alias upd='sudo apt-get update && sudo apt-get upgrade && sudo apt clean'
+alias updd='sudo apt-get update && sudo apt-get upgrade && sudo apt-get dist-upgrade && sudo apt clean'
 
 export GIT_ROOT=/home/${USER}/git
 export GIT_FRD=${GIT_ROOT}/FRD
@@ -32,3 +35,6 @@ if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
     GIT_PROMPT_ONLY_IN_REPO=1
     source $HOME/.bash-git-prompt/gitprompt.sh
 fi
+
+export HTTP_PROXY="http://localhost:3142"
+

docker-install.sh

@@ -1,39 +1,52 @@
 #!/usr/bin/env bash
 
+set -aeux -o pipefail
+
 # Remove distribution-related packages (if present) that would be harmful if kept installed.
-sudo apt remove docker docker-engine docker.io containerd runc
+for pkg in docker docker-engine docker.io docker-compose docker-compose-v2 docker-doc podman-docker containerd runc
+do
+    echo ${pkg}
+    installed=$(apt list ${pkg} 2>/dev/null | grep installed | wc -l || true)
+    if [[ ${installed} -ge 1 ]] ; then
+        echo "Removing ${pkg}"
+        sudo apt remove ${pkg}
+    fi
+done
 
 # Update apt repositories
-sudo apt update
+sudo apt update || true
 
 # Add required dependencies
 sudo apt install -y \
-  lsb-release \
-  apt-transport-https \
-  ca-certificates \
-  curl \
-  gnupg-agent
+    lsb-release \
+    apt-transport-https \
+    ca-certificates \
+    curl \
+    gnupg-agent
 
-# ID of current running OS, lowercase
-OS_ID=$(lsb_release -is)
-OS_ID=${OS_ID,,}
-OS_CN=$(lsb_release -cs)
+# IDs of current running OS, lowercase
+OS_DISTRIB_ID=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
+OS_CODENAME=$(lsb_release -cs)
 
 # Add the official docker repository
 sudo mkdir -p /etc/apt/keyrings
-curl -fsSL https://download.docker.com/linux/${OS_ID}/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+curl -fsSL https://download.docker.com/linux/${OS_DISTRIB_ID}/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
 echo \
-  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/${OS_ID} \
-  ${OS_CN} stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/${OS_DISTRIB_ID} \
+  ${OS_CODENAME} stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
 
 # Refresh repositories
-sudo apt update
+sudo apt update || true
 
 # Install docker-ce from docker repository
 sudo apt install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
 
 # Create 'docker' group
-sudo groupadd docker
+sudo groupadd docker || true
 
 # Add the group 'docker' to your user
 sudo usermod -aG docker ${USER}
+
+set +x
+echo "**************************** Finished. *****************************"
+echo "Please logout, then login back, to ensure 'docker' group membership."

rsync-backup.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+set -aeux -o pipefail
+sudo rsync -av --exclude={".cache",".local",".mozilla",".vscode","Logiciels"} /home/frrol/ /media/frrol/ExterneLinux/Sauvegarde/home/frrol/