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

Jump to bottom

Add PADD to the image #1410

Merged
merged 4 commits into from
Aug 2, 2023
Merged

Add PADD to the image #1410

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76b6d5b
Add PADD to the image
yubiuser Jul 31, 2023
d89d826
Add padd alias
yubiuser Aug 1, 2023
81e7671
Revert alias and make branch configurable
yubiuser Aug 2, 2023
f24dd34
Update src/start.sh
PromoFaux Aug 2, 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
4 changes: 4 additions & 0 deletions src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ARG WEB_BRANCH="development-v6"
ARG CORE_BRANCH="development-v6"
ARG FTL_BRANCH="development-v6"
ARG PIHOLE_DOCKER_TAG="unknown"
ARG PADD_BRANCH="PADD_FTLv6"

ENV DNSMASQ_USER=pihole
ENV FTL_CMD=no-daemon
Expand Down Expand Up @@ -34,6 +35,9 @@ RUN apk add --no-cache \
ADD https://ftl.pi-hole.net/macvendor.db /macvendor.db
COPY crontab.txt /crontab.txt

# Add PADD to the container, too.
ADD --chmod=0755 https://raw.githubusercontent.com/pi-hole/PADD/${PADD_BRANCH}/padd.sh /usr/local/bin/padd

# download a the main repos from github
RUN git clone --depth 1 --single-branch --branch ${WEB_BRANCH} https://github.com/pi-hole/AdminLTE.git /var/www/html/admin && \
git clone --depth 1 --single-branch --branch ${CORE_BRANCH} https://github.com/pi-hole/pi-hole.git /etc/.pihole ;\
Expand Down