diff --git a/Config/F-DroidRepo/Dockerfile b/Config/F-DroidRepo/Dockerfile index 1d1a056..bf33be2 100644 --- a/Config/F-DroidRepo/Dockerfile +++ b/Config/F-DroidRepo/Dockerfile @@ -8,9 +8,9 @@ FROM debian:trixie-slim # Setup # ARG REPO -ENV REPO="$REPO" +ENV REPO="/root/fdroid" ARG WEBROOT -ENV WEBROOT="$WEBROOT" +ENV WEBROOT="/var/www/html" USER root RUN mkdir -pv "$REPO" @@ -19,9 +19,9 @@ WORKDIR "$REPO" # Install Packages# # https://f-droid.org/en/docs/Installing_the_Server_and_Repo_Tools/#debianubuntumintetc -RUN apt-get update && apt-get install sudo bash curl git vim nginx +RUN apt-get update && apt-get install -y sudo bash curl git vim nginx COPY files/debian-backports.sources /etc/apt/sources.list.d/ -RUN apt-get update && apt-get install -t trixie-backports fdroidserver +RUN apt-get update && apt-get install -y -t trixie-backports fdroidserver # Generate F-Droid Repo # diff --git a/Config/F-DroidRepo/docker-compose.example.yml b/Config/F-DroidRepo/docker-compose.example.yml index 5481fb4..e4e3f8b 100644 --- a/Config/F-DroidRepo/docker-compose.example.yml +++ b/Config/F-DroidRepo/docker-compose.example.yml @@ -8,13 +8,13 @@ services: build: context: ./ network: host - args: - WEBROOT: ${WEBROOT} - REPO: ${REPO} + #args: + # WEBROOT: "/var/www/html" + # REPO: "/root/fdroid" restart: always environment: - - WEBROOT=/var/www/html - - REPO=/root/fdroid + - WEBROOT="/var/www/html" + - REPO="/root/fdroid" - FILE0=$FILE0 - FILE1=$FILE1 - FILE2=$FILE2 diff --git a/Config/F-DroidRepo/example.env b/Config/F-DroidRepo/example.env index 679cdd1..9074af3 100644 --- a/Config/F-DroidRepo/example.env +++ b/Config/F-DroidRepo/example.env @@ -11,7 +11,6 @@ MEM=0.25G ## Repo Settings ## -REPO="/var/www/html/fdroid/repo" REPO_NAME="Hyperling's Apps" REPO_LINK="https://fdroid.hyperling.com"