Get rid of wget on Alpine Linux

Now we can curl everything, one package less on installation :)

Get rid of Midnight Commander package, I never used it in any LXC, I guess that is from debugging there right?
pull/1181/head
nicedevil007 2 years ago
parent a5cb7a51dd
commit 76d3a0e4e2
  1. 14
      ct/alpine-adguard-v5.sh
  2. 16
      install/alpine-adguard-v5-install.sh

@ -20,12 +20,12 @@ EOF
header_info header_info
echo -e "Loading..." echo -e "Loading..."
APP="Alpine-AdGuard" APP="Alpine-AdGuard"
var_disk="0.5" var_disk="0.3"
var_cpu="1" var_cpu="1"
var_ram="256" var_ram="256"
var_os="alpine" var_os="alpine"
var_version="3.17" var_version="3.17"
NSAPP=$(echo ${APP,,} | tr -d ' ') NSAPP=`echo "${APP}" | tr '[A-Z]' '[a-z]'`
var_install="${NSAPP}-v5-install" var_install="${NSAPP}-v5-install"
timezone=$(cat /etc/timezone) timezone=$(cat /etc/timezone)
INTEGER='^[0-9]+([.][0-9]+)?$' INTEGER='^[0-9]+([.][0-9]+)?$'
@ -357,10 +357,10 @@ msg_info "Stopping AdguardHome"
/opt/AdGuardHome/AdGuardHome -s stop &>/dev/null /opt/AdGuardHome/AdGuardHome -s stop &>/dev/null
msg_ok "Stopped AdguardHome" msg_ok "Stopped AdguardHome"
VER=$(curl --silent -qI https://github.com/AdguardTeam/AdGuardHome/releases/latest | awk -F '/' '/^location/ {print substr($NF, 1, length($NF)-1)}'); VER=$(curl -sqI https://github.com/AdguardTeam/AdGuardHome/releases/latest | awk -F '/' '/^location/ {print substr($NF, 1, length($NF)-1)}');
msg_info "Updating AdguardHome to $VER" msg_info "Updating AdguardHome to $VER"
wget -qL "https://github.com/AdguardTeam/AdGuardHome/releases/download/$VER/AdGuardHome_linux_amd64.tar.gz" curl -sL "https://github.com/AdguardTeam/AdGuardHome/releases/download/$VER/AdGuardHome_linux_amd64.tar.gz" > AdGuardHome.tar.gz
tar -xvf AdGuardHome_linux_amd64.tar.gz &>/dev/null tar -xvf AdGuardHome.tar.gz &>/dev/null
mkdir -p adguard-backup mkdir -p adguard-backup
cp -r /opt/AdGuardHome/AdGuardHome.yaml /opt/AdGuardHome/data adguard-backup/ cp -r /opt/AdGuardHome/AdGuardHome.yaml /opt/AdGuardHome/data adguard-backup/
cp AdGuardHome/AdGuardHome /opt/AdGuardHome/AdGuardHome cp AdGuardHome/AdGuardHome /opt/AdGuardHome/AdGuardHome
@ -372,7 +372,7 @@ msg_info "Starting AdguardHome"
msg_ok "Started AdguardHome" msg_ok "Started AdguardHome"
msg_info "Cleaning Up" msg_info "Cleaning Up"
rm -rf AdGuardHome_linux_amd64.tar.gz AdGuardHome adguard-backup rm -rf AdGuardHome.tar.gz AdGuardHome adguard-backup
msg_ok "Cleaned" msg_ok "Cleaned"
msg_ok "Update Successfull" msg_ok "Update Successfull"
exit exit
@ -429,7 +429,7 @@ bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/c
msg_info "Starting LXC Container" msg_info "Starting LXC Container"
pct start $CTID pct start $CTID
msg_ok "Started LXC Container" msg_ok "Started LXC Container"
lxc-attach -n $CTID -- ash -c "$(wget -qO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit lxc-attach -n $CTID -- ash -c "$(wget -qO - https://raw.githubusercontent.com/nicedevil007/Proxmox/alpine-adguard-LXC/install/$var_install.sh)" || exit
IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1) IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
pct set $CTID -description "# ${APP} LXC pct set $CTID -description "# ${APP} LXC
### https://tteck.github.io/Proxmox/ ### https://tteck.github.io/Proxmox/

@ -97,20 +97,18 @@ $STD apk upgrade
msg_ok "Updated Container OS" msg_ok "Updated Container OS"
msg_info "Installing Dependencies" msg_info "Installing Dependencies"
$STD apk add wget $STD apk add --no-cache bash
$STD apk add bash $STD apk add --no-cache curl
$STD apk add curl $STD apk add --no-cache openssh
$STD apk add nano $STD apk add --no-cache nano
$STD apk add mc
$STD apk add openssh
msg_ok "Installed Dependencies" msg_ok "Installed Dependencies"
msg_info "Installing AdguardHome" msg_info "Installing AdguardHome"
VER=$(curl --silent -qI https://github.com/AdguardTeam/AdGuardHome/releases/latest | awk -F '/' '/^location/ {print substr($NF, 1, length($NF)-1)}'); VER=$(curl --silent -qI https://github.com/AdguardTeam/AdGuardHome/releases/latest | awk -F '/' '/^location/ {print substr($NF, 1, length($NF)-1)}');
$STD wget -qL "https://github.com/AdguardTeam/AdGuardHome/releases/download/$VER/AdGuardHome_linux_amd64.tar.gz" $STD curl -sL "https://github.com/AdguardTeam/AdGuardHome/releases/download/$VER/AdGuardHome_linux_amd64.tar.gz" > AdGuardHome.tar.gz
$STD tar -xvf AdGuardHome_linux_amd64.tar.gz >/dev/null 2>&1 $STD tar -xvf AdGuardHome.tar.gz >/dev/null 2>&1
$STD mv AdGuardHome /opt $STD mv AdGuardHome /opt
$STD rm AdGuardHome_linux_amd64.tar.gz $STD rm AdGuardHome.tar.gz
$STD chmod +x /opt/AdGuardHome/AdGuardHome $STD chmod +x /opt/AdGuardHome/AdGuardHome
$STD /opt/AdGuardHome/AdGuardHome -s install $STD /opt/AdGuardHome/AdGuardHome -s install
$STD /opt/AdGuardHome/AdGuardHome -s start $STD /opt/AdGuardHome/AdGuardHome -s start

Loading…
Cancel
Save