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

Allow end user to add additional packages to the image #1423

Merged
merged 4 commits into from
Sep 25, 2023
Merged

Allow end user to add additional packages to the image #1423

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
672797b
Remove the "INSTALL_DEV_TOOLS" environment variable in favour of "ADD…
PromoFaux Sep 3, 2023
3ca2aea
Add documentation
PromoFaux Sep 20, 2023
b893784
Update README.md
PromoFaux Sep 25, 2023
bf12b02
Update src/start.sh
PromoFaux Sep 25, 2023
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ There are other environment variables if you want to customize various things in
### Experimental Variables
| Variable | Default | Value | Description |
| -------- | ------- | ----- | ---------- |
|Left Blank for future expansion| | | |
| `ADDITIONAL_PACKAGES`| unset | Space separated list of APKs | HERE BE DRAGONS. Mostly for development purposes, this just makes it easier for those of us that always like to have whatever additional tools we need inside the container for debugging |


To use these env vars in docker run format style them like: `-e DNS1=1.1.1.1`
Expand Down
16 changes: 13 additions & 3 deletions src/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,19 @@ start() {
echo " [i] pihole-FTL ($FTL_CMD) will be started as ${DNSMASQ_USER}"
echo ""

# Install editors inside container if requested
if [ "${INSTALL_DEV_TOOLS:-0}" -gt 0 ]; then
apk add --no-cache nano less
# Install additional packages inside the container if requested
if [ -n "${ADDITIONAL_PACKAGES}" ]; then
echo " [i] Fetching APK repository metadata."
if ! apk update; then
echo " [i] Failed to fetch APK repository metadata."
else
echo " [i] Installing additional packages: ${ADDITIONAL_PACKAGES}."
# shellcheck disable=SC2086
if ! apk add --no-cache ${ADDITIONAL_PACKAGES}; then
echo " [i] Failed to install additional packages."
fi
fi
echo ""
fi

# Remove possible leftovers from previous pihole-FTL processes
Expand Down