Allow repo to use makefile to reduce need to run rebuild

Dockerfile

 FROM registry.gitlab.com/fdroid/docker-executable-fdroidserver:latest
 
-RUN apt-get update && apt-get -y install python-pip
+RUN apt-get update && \
+    apt-get -y install --no-install-recommends \
+      python-pip \
+      python-wheel \
+      python-setuptools \
+      apksigner
 
 RUN pip install s3cmd
 
 ADD update_repo.sh /
+ADD Makefile /
+
+ENV UPDATE_WAIT=10
 
 ENTRYPOINT [ "/update_repo.sh" ]

Makefile

+.PHONY: build
+$(REPO_PATH)/index.jar: $(REPO_PATH)
+	fdroid update --use-date-from-apk
+	fdroid server update
+
+$(REPO_PATH): s3
+	rsync -rlpcgoDv $(S3_PATH)/*-release.apk $(REPO_PATH)/
+
+.PHONY: s3
+s3:
+	s3cmd sync --preserve s3://releases/quasseldroid-ng/ $(S3_PATH)/

build.sh

@@ -2,8 +2,6 @@
 IMAGE=k8r.eu/justjanne/fdroid-repo
 TAGS=$(git describe --always --tags HEAD)
 
-docker build -t $IMAGE:$TAGS .
+docker build --pull -t $IMAGE:$TAGS .
 docker tag $IMAGE:$TAGS $IMAGE:latest
 echo Successfully tagged $IMAGE:latest
-docker push $IMAGE:$TAGS
-docker push $IMAGE:latest

push.sh

+#!/bin/sh
+IMAGE=k8r.eu/justjanne/fdroid-repo
+TAGS=$(git describe --always --tags HEAD)
+
+docker push $IMAGE:$TAGS
+docker push $IMAGE:latest
+echo Successfully pushed $IMAGE:$TAGS as $IMAGE:latest

update_repo.sh

 #!/bin/sh
 SOURCE_PATH=/tmp/fdroid
+REPO_PATH=$SOURCE_PATH/repo/
+S3_PATH=$SOURCE_PATH/s3/
+
+mkdir -p $SOURCE_PATH/
+cp /Makefile $SOURCE_PATH/
 
 cd $SOURCE_PATH
-mkdir -p $SOURCE_PATH/repo/
+mkdir -p $REPO_PATH
+mkdir -p $S3_PATH
 while true; do
-  s3cmd sync --preserve $APP $SOURCE_PATH/repo/
-  rm -rf $SOURCE_PATH/repo/*-latest.apk
-  fdroid update && fdroid server update
+  make
   sleep $UPDATE_WAIT
 done