Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move core dependencies to a function that templates can call #1319

Closed
wants to merge 4 commits into from
Closed

Move core dependencies to a function that templates can call #1319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1789b71
Make core dependencies a function, update sample installers to use it
cricalix Jan 7, 2025
67ddcd6
Update to title case to match other info/ok strings
cricalix Jan 7, 2025
d242578
Fix duplication in comment, rename to install_core_packages
cricalix Jan 7, 2025
85eb661
Remove $STD, add quiet/yes, add squelch via dev/null
cricalix Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions install/alpine-docker-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,10 @@ catch_errors
setting_up_container
network_check
update_os
install_core_packages

msg_info "Installing Dependencies"
$STD apk add newt
$STD apk add curl
$STD apk add openssh
$STD apk add tzdata
$STD apk add nano
$STD apk add mc
msg_ok "Installed Dependencies"

msg_info "Installing Docker"
Expand Down
9 changes: 1 addition & 8 deletions install/alpine-grafana-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,7 @@ catch_errors
setting_up_container
network_check
update_os

msg_info "Installing Dependencies"
$STD apk add newt
$STD apk add curl
$STD apk add openssh
$STD apk add nano
$STD apk add mc
msg_ok "Installed Dependencies"
install_core_packages

msg_info "Installing Grafana"
$STD apk add grafana
Expand Down
9 changes: 1 addition & 8 deletions install/alpine-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,7 @@ catch_errors
setting_up_container
network_check
update_os

msg_info "Installing Dependencies"
$STD apk add newt
$STD apk add curl
$STD apk add openssh
$STD apk add nano
$STD apk add mc
msg_ok "Installed Dependencies"
install_core_packages

motd_ssh
customize
6 changes: 1 addition & 5 deletions install/alpine-nextcloud-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,10 @@ catch_errors
setting_up_container
network_check
update_os
install_core_packages

msg_info "Installing Dependencies"
$STD apk add newt
$STD apk add curl
$STD apk add openssl
$STD apk add openssh
$STD apk add nano
$STD apk add mc
$STD apk add nginx
msg_ok "Installed Dependencies"

Expand Down
6 changes: 1 addition & 5 deletions install/alpine-vaultwarden-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,10 @@ catch_errors
setting_up_container
network_check
update_os
install_core_packages

msg_info "Installing Dependencies"
$STD apk add newt
$STD apk add curl
$STD apk add openssl
$STD apk add openssh
$STD apk add nano
$STD apk add mc
$STD apk add argon2
msg_ok "Installed Dependencies"

Expand Down
9 changes: 1 addition & 8 deletions install/alpine-zigbee2mqtt-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,7 @@ catch_errors
setting_up_container
network_check
update_os

msg_info "Installing Dependencies"
$STD apk add newt
$STD apk add curl
$STD apk add openssh
$STD apk add nano
$STD apk add mc
msg_ok "Installed Dependencies"
install_core_packages

msg_info "Installing Alpine-Zigbee2MQTT"
$STD apk add zigbee2mqtt
Expand Down
7 changes: 1 addition & 6 deletions install/debian-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@ catch_errors
setting_up_container
network_check
update_os

msg_info "Installing Dependencies"
$STD apt-get install -y curl
$STD apt-get install -y sudo
$STD apt-get install -y mc
msg_ok "Installed Dependencies"
install_core_packages

motd_ssh
customize
Expand Down
7 changes: 1 addition & 6 deletions install/ubuntu-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@ catch_errors
setting_up_container
network_check
update_os

msg_info "Installing Dependencies"
$STD apt-get install -y curl
$STD apt-get install -y sudo
$STD apt-get install -y mc
msg_ok "Installed Dependencies"
install_core_packages

motd_ssh
customize
Expand Down
8 changes: 8 additions & 0 deletions misc/alpine-install.func
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,14 @@ update_os() {
msg_ok "Updated Container OS"
}

# Install core packages that (almost) every container will depend upon.
# Be sure to update install.func for apt-based systems as appropriate.
install_core_packages() {
msg_info "Installing Core Packages"
apk add -q curl mc nano newt openssh sudo &>/dev/null
msg_ok "Installed Core Packages"
}

# This function modifies the message of the day (motd) and SSH settings
motd_ssh() {
# Set terminal to 256-color mode
Expand Down
9 changes: 9 additions & 0 deletions misc/install.func
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,15 @@ EOF
msg_ok "Updated Container OS"
}

# Install core packages that (almost) every container will depend upon.
# Be sure to update alpine-install.func to match for apk-based systems when
# adding a new package.
install_core_packages() {
msg_info "Installing Core Packages"
apt-get install -y curl mc sudo &> /dev/null
msg_ok "Installed Core Packages"
}

# This function modifies the message of the day (motd) and SSH settings
motd_ssh() {
# Set terminal to 256-color mode
Expand Down
Loading