From c19359ce03cd191c78b4cefbfd96a53731c458d7 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <mail@justjanne.de>
Date: Sat, 23 Nov 2024 14:10:07 +0100
Subject: [PATCH] feat: update fdroid
---
.gitignore | 3 +--
Dockerfile | 44 +++++++++++---------------------------------
src/apksigner.sh | 2 --
src/update_repo.sh | 7 +++----
4 files changed, 15 insertions(+), 41 deletions(-)
delete mode 100755 src/apksigner.sh
diff --git a/.gitignore b/.gitignore
index 56d2087..57f1cb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/build.sh
-/deploy.sh
+/.idea/
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 24bf86b..fcbd014 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,41 +1,19 @@
-ARG BUILD_TOOLS=34.0.0
-
-FROM openjdk:8-jdk as builder
-ARG BUILD_TOOLS
-
-RUN apt-get --quiet update --yes && \
- apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1
-RUN wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && \
- unzip -q android-sdk.zip -d android-sdk-linux && \
- rm android-sdk.zip
-RUN mkdir android-sdk-linux/licenses && \
- printf "8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > android-sdk-linux/licenses/android-sdk-license && \
- printf "84831b9409646a918e30573bab4c9c91346d8abd" > android-sdk-linux/licenses/android-sdk-preview-license
-RUN android-sdk-linux/tools/bin/sdkmanager --update > /dev/null
-RUN android-sdk-linux/tools/bin/sdkmanager \
- "build-tools;${BUILD_TOOLS}" \
- > /dev/null
-
-RUN ls android-sdk-linux/build-tools/34.0.0/
-
FROM ubuntu:latest
-ARG BUILD_TOOLS
ENV TZ=Etc/UTC
ENV DEBIAN_FRONTEND=noninteractive
-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 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
-
-COPY --from=builder /android-sdk-linux/build-tools/${BUILD_TOOLS} /opt/android-sdk
+ADD src/fdroid.asc /usr/share/keyrings/fdroid.asc
+ADD src/fdroid.list /etc/apt/sources.list.d/fdroid.list
+
+RUN apt-get update \
+ && apt-get update \
+ && apt-get -y install --no-install-recommends \
+ rsync \
+ tzdata \
+ fdroidserver \
+ && rm -rf /var/lib/apt/lists/* \
+ && apt-get clean
ADD src/update_repo.sh /
diff --git a/src/apksigner.sh b/src/apksigner.sh
deleted file mode 100755
index 170bc6e..0000000
--- a/src/apksigner.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec java -jar /usr/share/apksigner/apksigner.jar
diff --git a/src/update_repo.sh b/src/update_repo.sh
index 110e099..ff039f0 100755
--- a/src/update_repo.sh
+++ b/src/update_repo.sh
@@ -1,8 +1,7 @@
#!/bin/bash
-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
+fdroid update --use-date-from-apk
+fdroid signindex
+fdroid deploy
--
GitLab