Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Update fdroid docker compose config

Leendert de Borst5d96c44ea96b
diff --git a/apps/mobile-app/android/fdroid/docker-compose.yml b/apps/mobile-app/android/fdroid/docker-compose.yml
index 903eefbbc..3985e118e 100644
--- a/apps/mobile-app/android/fdroid/docker-compose.yml
+++ b/apps/mobile-app/android/fdroid/docker-compose.yml
@@ -7,11 +7,11 @@ services:
entrypoint: ["/bin/bash"]
stdin_open: true # equivalent to -i
tty: true # equivalent to -t
+ # Run as vagrant user (UID 1000, GID 1000)
+ user: "1000:1000"
volumes:
- - ./fdroidserver:/home/vagrant/fdroidserver:Z
- - ./fdroiddata:/build:z
- # Overwrite the net.aliasvault.app.yml file with the local one which forces build to use latest commit from main branch
- - ./net.aliasvault.app.yml:/build/metadata/net.aliasvault.app.yml
+ # Overwrite the net.aliasvault.app.yml file with the local one which forces build to use latest com>
+ - ./net.aliasvault.app.yml:/net.aliasvault.app.yml
# Add build script to the container
- ./scripts/build.sh:/build.sh:Z
# Increase memory limits for Gradle builds
diff --git a/apps/mobile-app/android/fdroid/scripts/build.sh b/apps/mobile-app/android/fdroid/scripts/build.sh
index a600d7fe6..7df37dbd9 100755
--- a/apps/mobile-app/android/fdroid/scripts/build.sh
+++ b/apps/mobile-app/android/fdroid/scripts/build.sh
@@ -1,19 +1,26 @@
#! /bin/bash
source /etc/profile.d/bsenv.sh
export GRADLE_USER_HOME=$home_vagrant/.gradle
-export fdroid="sudo --preserve-env --user vagrant
- env PATH=$fdroidserver:$PATH
- env PYTHONPATH=$fdroidserver:$fdroidserver/examples
- env PYTHONUNBUFFERED=true
- env TERM=$TERM
- env HOME=$home_vagrant
- fdroid"
-# Go to build directory
-cd build
+# Set up environment for fdroid (no sudo needed, we're already vagrant user)
+export PATH=$fdroidserver:$PATH
+export PYTHONPATH=$fdroidserver:$fdroidserver/examples
+export PYTHONUNBUFFERED=true
+export HOME=$home_vagrant
+
+# Clone dirs
+git clone https://gitlab.com/fdroid/fdroidserver.git --depth 1 /home/vagrant/fdroidserver
+git clone https://gitlab.com/fdroid/fdroiddata.git --depth 1 /home/vagrant/build
+
+# Overwrite metatdata for on-demand main branch build
+cp -R net.aliasvault.app.yml /home/vagrant/build/metadata/net.aliasvault.app.yml
+
+# go to build
+cd /home/vagrant/build
+
# Fetch dependent libraries (if any)
-$fdroid fetchsrclibs net.aliasvault.app --verbose
+fdroid fetchsrclibs net.aliasvault.app --verbose
# Format build receipe
-$fdroid rewritemeta net.aliasvault.app
+fdroid rewritemeta net.aliasvault.app
# Build app and scan for any binary files that are prohibited
-$fdroid build --verbose --latest --scan-binary --on-server --no-tarball net.aliasvault.app
+fdroid build --verbose --latest --scan-binary --on-server --no-tarball net.aliasvault.app
\ No newline at end of file