Only clone depth 1, even when checking out tags #1869
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: yubiuser <github@yubiuser.dev>
1 task
rdwebdesign
previously requested changes
Jul 20, 2025
PromoFaux
requested changes
Jul 20, 2025
There was a problem hiding this comment.
Lets use the API to get the latest tag, but also I'm not a fan of the effective duplication of the git clone command - so maybe something more like:
RUN CLONE_BRANCH="${WEB_BRANCH}" && \
if [ "${WEB_BRANCH}" = "master" ]; then \
CLONE_BRANCH=$(curl -s https://api.github.com/repos/${WEB_FORK}/web/releases/latest | jq -r .tag_name); \
fi && \
git clone --branch "${CLONE_BRANCH}" --single-branch --depth 1 https://github.com/${WEB_FORK}/web.git /var/www/html/admin && \
if [ "${WEB_BRANCH}" = "master" ]; then cd /var/www/html/admin && git checkout -b master; fi
RUN CLONE_BRANCH="${CORE_BRANCH}" && \
if [ "${CORE_BRANCH}" = "master" ]; then \
CLONE_BRANCH=$(curl -s https://api.github.com/repos/${CORE_FORK}/pi-hole/releases/latest | jq -r .tag_name); \
fi && \
git clone --branch "${CLONE_BRANCH}" --single-branch --depth 1 https://github.com/${CORE_FORK}/pi-hole.git /etc/.pihole && \
if [ "${CORE_BRANCH}" = "master" ]; then cd /etc/.pihole && git checkout -b master; fi|
Actually... or to further reduce duplication: RUN clone_repo() { \
REPO_FORK="$1"; \
REPO_NAME="$2"; \
BRANCH="$3"; \
DEST="$4"; \
CLONE_BRANCH="$BRANCH"; \
if [ "$BRANCH" = "master" ]; then \
CLONE_BRANCH=$(curl -s https://api.github.com/repos/${REPO_FORK}/${REPO_NAME}/releases/latest | jq -r .tag_name); \
fi; \
git clone --branch "$CLONE_BRANCH" --single-branch --depth 1 "https://github.com/${REPO_FORK}/${REPO_NAME}.git" "$DEST"; \
cd "$DEST"; \
if [ "$BRANCH" = "master" ]; then git checkout -b master; fi; \
}; \
clone_repo "${WEB_FORK}" "web" "${WEB_BRANCH}" "/var/www/html/admin"; \
clone_repo "${CORE_FORK}" "pi-hole" "${CORE_BRANCH}" "/etc/.pihole" |
|
I like the last suggestion using a function. |
Signed-off-by: yubiuser <github@yubiuser.dev>
Signed-off-by: yubiuser <github@yubiuser.dev>
PromoFaux
approved these changes
Jul 21, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Builds upon #1866.
Instead of cloning master with depth of 5 and checking out the lastest tag 'backwards' we now checkout the tag directly. To fool the version script we need to fake checkout 'master' branch.
Saves 1 MB.