Pull YML and PNG files for apps.

Config/F-DroidRepo/Dockerfile

@@ -36,11 +36,14 @@ ARG REPO_DOMAIN
 ENV REPO_DOMAIN="$REPO_DOMAIN"
 ARG REPO_NAME
 ENV REPO_NAME="$REPO_NAME"
+ARG REPO_ICON
+ENV REPO_ICON="$REPO_ICON"
 
 # TBD/TODO: Add commands to remove repo_url and repo_name if they already exist.
 
 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
 
@@ -111,8 +114,16 @@ RUN bash -c 'if [[ -n "$FILE17" ]]; then wget -P "$REPO" "$FILE17"; fi'
 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 fdroid update -c
 
 # Publish Repo Contents to Web Root #
 
 RUN cp -r "$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/"

Config/F-DroidRepo/docker-compose.example.yml

@@ -12,6 +12,7 @@ services:
         #REPO: ${REPO}
         REPO_DOMAIN: ${REPO_DOMAIN}
         REPO_NAME: ${REPO_NAME}
+        REPO_ICON: ${REPO_ICON}
         FILE00: ${FILE00}
         FILE01: ${FILE01}
         FILE02: ${FILE02}
@@ -40,6 +41,7 @@ services:
       #- REPO=$REPO
       - REPO_DOMAIN=$REPO_DOMAIN
       - REPO_NAME=$REPO_NAME
+      - REPO_ICON=$REPO_ICON
       - FILE00=$FILE00
       - FILE01=$FILE01
       - FILE02=$FILE02

Config/F-DroidRepo/example.env

@@ -16,6 +16,7 @@ MEM=0.25G
 
 REPO_DOMAIN="https://fdroid.hyperling.com"
 REPO_NAME="Hyperling's Apps"
+REPO_ICON="peace.png"
 
 ## Files ##
 # Should be provided as URLs directly to the APK files.
@@ -23,22 +24,22 @@ REPO_NAME="Hyperling's Apps"
 # - Currently being done because Obtainium does not read the Gitea release/tag.
 
 FILE00="https://git.hyperling.com/me/android-carb-up/releases/download/latest/CarbUp_v1.0.1.apk"
-FILE01="https://git.hyperling.com/me/flutter-expense-tracker/releases/download/latest/ExpenseTracker_v0.1.3.apk"
-FILE02="https://git.hyperling.com/me/android-infinite-timer/releases/download/latest/InfiniteTimer_v1.1.1.apk"
-FILE03="https://git.hyperling.com/me/android-45-minute-rule/releases/download/latest/The45MinuteRule_v1.0.7.apk"
-FILE04="https://git.hyperling.com/me/android-tictactoe/releases/download/latest/TicTacToe_v1.1.0.apk"
-FILE05="https://git.hyperling.com/me/android-hypergames/releases/download/latest/HyperGames_v0.0.11.apk"
-FILE06=""
-FILE07=""
-FILE08=""
-FILE09=""
-FILE10="https://git.hyperling.com/me/ebook-freedom-flyer/releases/download/latest/VoluntarySovereignty.pdf"
-FILE11="https://git.hyperling.com/me/ebook-health-protocol/releases/download/latest/HyperlingsHealthProtocol.pdf"
-FILE12=""
-FILE13=""
-FILE14=""
-FILE15=""
-FILE16=""
-FILE17=""
+FILE01="https://git.hyperling.com/me/android-carb-up/raw/branch/main/TBD.yml"
+FILE02="https://hyperling.com/files/media/icons/ctfu.png"
+FILE03="https://git.hyperling.com/me/flutter-expense-tracker/releases/download/latest/ExpenseTracker_v0.1.3.apk"
+FILE04="https://git.hyperling.com/me/android-carb-up/raw/branch/main/TBD.yml"
+FILE05="https://hyperling.com/files/media/icons/expense.png"
+FILE06="https://git.hyperling.com/me/android-infinite-timer/releases/download/latest/InfiniteTimer_v1.1.1.apk"
+FILE07="https://git.hyperling.com/me/android-carb-up/raw/branch/main/TBD.yml"
+FILE08="https://hyperling.com/files/media/icons/infinitetimer.png"
+FILE09="https://git.hyperling.com/me/android-45-minute-rule/releases/download/latest/The45MinuteRule_v1.0.7.apk"
+FILE10="https://git.hyperling.com/me/android-carb-up/raw/branch/main/TBD.yml"
+FILE11="https://hyperling.com/files/media/icons/t45mr.png"
+FILE12="https://git.hyperling.com/me/android-tictactoe/releases/download/latest/TicTacToe_v1.1.0.apk"
+FILE13="https://git.hyperling.com/me/android-carb-up/raw/branch/main/TBD.yml"
+FILE14="https://hyperling.com/files/media/icons/tictactoe.png"
+FILE15="https://git.hyperling.com/me/android-hypergames/releases/download/latest/HyperGames_v0.0.11.apk"
+FILE16="https://git.hyperling.com/me/android-carb-up/raw/branch/main/TBD.yml"
+FILE17="https://hyperling.com/files/media/icons/hypergames.png"
 FILE18=""
-FILE19=""
+FILE19="https://hyperling.com/files/media/icons/peace.png"