Compare commits

...

8 Commits

2 changed files with 27 additions and 17 deletions
+15 -5
View File
@@ -44,7 +44,7 @@ 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 fdroid update
#RUN fdroid update
# Advanced Variables #
@@ -113,14 +113,19 @@ 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'
RUN sync
# Move any downloaded metadata files to the correct folder.
RUN cp -v "$REPO"/*.yml "$REPO"/../metadata
RUN cp -v "$REPO"/*.yml "$REPO"/../metadata || \
echo "No YML file(s) to copy." && sleep 5
# Move any downloaded icons to the proper folder.
RUN cp -v "$REPO"/*.png "$REPO"/icons/
RUN mv -v "$REPO"/*.png "$FDROID"/ || \
echo "No PNG file(s) to copy." && sleep 5
# 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"
# If the icon variable is set, add it to the config file before updating.
RUN [ ! -z "$REPO_ICON" ] && \
sed -i "$ a repo_icon: $REPO_ICON" "$FDROID/config.yml"
RUN fdroid update -c
@@ -132,3 +137,8 @@ RUN cp -rv "$FDROID" "$WEBROOT/"
# 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 -rv "$REPO"/* "$WEBROOT/"
CMD service nginx start && \
echo "\n*** F-Droid Repository has been started successfully! ***\n" && \
tail -F /var/log/nginx/access.log & \
tail -F /var/log/nginx/error.log
+12 -12
View File
@@ -24,22 +24,22 @@ REPO_ICON="peace.png"
# - 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/android-carb-up/raw/branch/main/TBD.yml"
FILE02="https://hyperling.com/files/media/icons/ctfu.png"
#FILE01="https://git.hyperling.com/me/android-carb-up/raw/branch/main/TBD.yml"
FILE02=""
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"
#FILE04="https://git.hyperling.com/me/android-carb-up/raw/branch/main/TBD.yml"
FILE05=""
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"
#FILE07="https://git.hyperling.com/me/android-carb-up/raw/branch/main/TBD.yml"
FILE08=""
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"
#FILE10="https://git.hyperling.com/me/android-carb-up/raw/branch/main/TBD.yml"
FILE11=""
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"
#FILE13="https://git.hyperling.com/me/android-carb-up/raw/branch/main/TBD.yml"
FILE14=""
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"
#FILE16="https://git.hyperling.com/me/android-carb-up/raw/branch/main/TBD.yml"
FILE17=""
FILE18=""
FILE19="https://hyperling.com/files/media/icons/peace.png"