diff --git a/fdroid/.env b/fdroid/.env index e4c4478..b5aebf9 100644 --- a/fdroid/.env +++ b/fdroid/.env @@ -1,8 +1,8 @@ BASE_URL=fdroid. EMAIL= -REPO_NAME=fdroid -CRON_APP_UPDATE='0 0 * * 1' +REPO_NAME= +CRON_APP_UPDATE='0 0 * * *' PUID=1000 PGID=1000 diff --git a/fdroid/Dockerfile b/fdroid/Dockerfile index c332ab4..b26f427 100644 --- a/fdroid/Dockerfile +++ b/fdroid/Dockerfile @@ -3,6 +3,7 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends \ cron \ fdroidserver \ + jq \ && rm -rf /var/lib/apt/lists/* COPY entrypoint.sh /docker-entrypoint.d/99-entrypoint.sh COPY scripts/ /usr/local/bin/ diff --git a/fdroid/compose.yaml b/fdroid/compose.yaml index 26dbf2b..8374c19 100644 --- a/fdroid/compose.yaml +++ b/fdroid/compose.yaml @@ -23,7 +23,7 @@ services: - PGID volumes: - ./repo/:/repo/ - - ./apks.txt:/:ro + - ./apks.txt:/apks.txt:ro networks: - nginx diff --git a/fdroid/entrypoint.sh b/fdroid/entrypoint.sh index e373122..cf7a836 100755 --- a/fdroid/entrypoint.sh +++ b/fdroid/entrypoint.sh @@ -11,6 +11,6 @@ get_apks.sh -echo "$CRON_APP_UPDATE root get_apks.sh" > /etc/cron.d/get_new_apks +echo "$CRON_APP_UPDATE /usr/local/bin/get_apks.sh >> /var/log/cron.log 2>&1" | crontab - /etc/init.d/cron start diff --git a/fdroid/init.sh b/fdroid/init.sh deleted file mode 100644 index 104f66e..0000000 --- a/fdroid/init.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -docker run --rm -v "$PWD/repo/:/repo/" \ - 'registry.gitlab.com/fdroid/docker-executable-fdroidserver:master' \ - init -v diff --git a/fdroid/scripts/get_apks.sh b/fdroid/scripts/get_apks.sh index 1a35e94..dc9e129 100755 --- a/fdroid/scripts/get_apks.sh +++ b/fdroid/scripts/get_apks.sh @@ -19,12 +19,10 @@ function get_links() { done } -LINKS="$(get_links apks.txt)" +LINKS="$(get_links /apks.txt)" -(cd /repo/ - xargs -n1 -P8 curl -LO <<< "$LINKS" - fdroid update -c -) +(cd /repo/repo/ && xargs -n1 -P8 curl -LOC- <<< "$LINKS") +(cd /repo/ && fdroid update -c) if [ -n "$PUID" ]; then chown -R "$PUID:$PGID" /repo/ diff --git a/fdroid/scripts/get_github_dl_links.sh b/fdroid/scripts/get_github_dl_links.sh index 99874e6..7b3c1b8 100755 --- a/fdroid/scripts/get_github_dl_links.sh +++ b/fdroid/scripts/get_github_dl_links.sh @@ -7,7 +7,7 @@ function get_urls() { local repo="$1" curl -sSL "$API/repos/$repo/releases/latest" | \ - jq -r ".assets.[] | select(.content_type == $CONTENT_TYPE) | .browser_download_url" + jq -r ".assets | select(.[].content_type == $CONTENT_TYPE) | .[].browser_download_url" } function get_repo_name_from_url() { diff --git a/fdroid/scripts/get_gitlab_dl_links.sh b/fdroid/scripts/get_gitlab_dl_links.sh index 62513c9..19c1f14 100755 --- a/fdroid/scripts/get_gitlab_dl_links.sh +++ b/fdroid/scripts/get_gitlab_dl_links.sh @@ -6,7 +6,7 @@ function get_urls() { local repo="$1" curl -L "$API/projects/$repo/releases" | \ - jq -r '.[0].assets.links.[] | select(.name | test(".apk$")) | .url' + jq -r '.[0].assets.links | select(.[].name | test(".apk$")) | .[].url' } function get_repo_name_from_url() {