Attempt to handle the icon file more gracefully.

This commit is contained in:
2026-07-04 07:53:22 -07:00
parent 7de61064ed
commit 8fcf47255b
+9 -4
View File
@@ -43,7 +43,6 @@ ENV REPO_ICON="$REPO_ICON"
RUN sed -i "$ a repo_url: $REPO_DOMAIN/fdroid/repo" "$FDROID/config.yml"
RUN sed -i "$ a repo_name: $REPO_NAME" "$FDROID/config.yml"
RUN sed -i "$ a repo_icon: $REPO_ICON" "$FDROID/config.yml"
RUN fdroid update
@@ -115,15 +114,21 @@ RUN bash -c 'if [[ -n "$FILE18" ]]; then wget -P "$REPO" "$FILE18"; fi'
RUN bash -c 'if [[ -n "$FILE19" ]]; then wget -P "$REPO" "$FILE19"; fi'
# Move any downloaded metadata files to the correct folder.
RUN mv "$REPO"/*.yml "$REPO"/../metadata
RUN cp -v "$REPO"/*.yml "$REPO"/../metadata
# Move any downloaded icons to the proper folder.
RUN cp -v "$REPO"/*.png "$REPO"/icons/
# If the icon variable is set, add it to the config file before updating again.
RUN [[ ! -z "$REPO_ICON" ]] && sed -i "$ a repo_icon: $REPO_ICON" "$FDROID/config.yml"
RUN fdroid update -c
# Publish Repo Contents to Web Root #
RUN cp -r "$FDROID" "$WEBROOT/"
RUN cp -rv "$FDROID" "$WEBROOT/"
# The index files are in repo.
# TODO: Can NGINX be configured to serve this as root while still
# having the URL be fdroid/repo/? How do others handle this?
RUN cp -r "$REPO"/* "$WEBROOT/"
RUN cp -rv "$REPO"/* "$WEBROOT/"