feat: restructure tooling

Dockerfile

-ARG PLATFORM=32
-ARG BUILD_TOOLS=32.0.0
+ARG BUILD_TOOLS=34.0.0
 
 FROM openjdk:8-jdk as builder
-ARG PLATFORM
 ARG BUILD_TOOLS
 
 RUN apt-get --quiet update --yes && \
@@ -18,29 +16,27 @@ RUN android-sdk-linux/tools/bin/sdkmanager \
       "build-tools;${BUILD_TOOLS}" \
       > /dev/null
 
-FROM ubuntu:focal
-ARG PLATFORM
+RUN ls android-sdk-linux/build-tools/34.0.0/
+
+FROM ubuntu:latest
 ARG BUILD_TOOLS
 
-COPY --from=builder /android-sdk-linux /android-sdk-linux
-RUN ln -s /android-sdk-linux/build-tools/${BUILD_TOOLS}/apksigner /usr/local/bin/apksigner
+ENV TZ=Etc/UTC
+ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install --no-install-recommends \
+RUN apt-get update && apt-get -y install --no-install-recommends \
     default-jdk-headless git python3-pip python3-wheel python3-setuptools python3-venv tzdata && \
     apt-get install -y --no-install-recommends $(apt-cache depends fdroidserver | grep -Fv -e java -e jdk -e '<' | awk '/Depends:/{print$2}') && \
     rm -rf /var/lib/apt/lists/*
 
-RUN pip3 install --upgrade babel pip setuptools s3cmd
-
 RUN git clone --depth 1 https://gitlab.com/fdroid/fdroidserver.git \
     && cd fdroidserver \
     && pip3 install --no-binary python-vagrant -e . \
     && python3 setup.py compile_catalog build \
     && python3 setup.py install
 
-ADD src/update_repo.sh /
+COPY --from=builder /android-sdk-linux/build-tools/${BUILD_TOOLS} /opt/android-sdk
 
-ENV UPDATE_WAIT=10
+ADD src/update_repo.sh /
 
 ENTRYPOINT [ "/update_repo.sh" ]

src/update_repo.sh

 #!/bin/bash
-SOURCE_PATH=/tmp/fdroid
-GIT_PATH=$SOURCE_PATH/git/fdroid-repo-config
-WORKDIR=$SOURCE_PATH/work
-TARGET_PATH=/repo
-REPO_PATH=$SOURCE_PATH/work/repo
-S3_PATH=$SOURCE_PATH/s3
-
-mkdir -p $SOURCE_PATH
-mkdir -p $WORKDIR
-mkdir -p $REPO_PATH
-mkdir -p $S3_PATH
-cd $WORKDIR
-while true; do
-  rsync -rctv --exclude=".*" $GIT_PATH/ $WORKDIR/
-  s3cmd sync --preserve s3://releases/quasseldroid-ng/ $S3_PATH/
-  rsync -rctv $S3_PATH/*-release.apk $REPO_PATH/
-  /fdroidserver/fdroid update --use-date-from-apk
-  /fdroidserver/fdroid signindex
-  /fdroidserver/fdroid deploy
-  rsync -rctv $REPO_PATH/ $TARGET_PATH/
-  sleep $UPDATE_WAIT
-done
+PATH=$PATH:/opt/android-sdk
+mkdir -p /workdir/repo/
+rsync -rctv --exclude=".*" /metadata/* /workdir/
+rsync -rctv /builds/*.apk /workdir/repo/
+/fdroidserver/fdroid update --use-date-from-apk
+/fdroidserver/fdroid signindex
+/fdroidserver/fdroid deploy