Merge branch 'Unrud-master-patch-00366' into 'master'

Base on new fdroidserver:buildserver image

Closes #17 and #15

See merge request fdroid/docker-executable-fdroidserver!14
This commit is contained in:
Torsten Grote 2023-04-27 17:57:22 +00:00
commit 23d0a61e90

View file

@ -1,23 +1,24 @@
FROM registry.gitlab.com/fdroid/ci-images-base
FROM registry.gitlab.com/fdroid/fdroidserver:buildserver
COPY signing-key.asc /
RUN gpg --import /signing-key.asc
RUN python3 -m pip install --upgrade pip wheel setuptools \
&& python3 -m pip install git+https://gitlab.com/fdroid/fdroidserver.git
RUN . /etc/profile.d/bsenv.sh \
&& git clone --depth 1 https://gitlab.com/fdroid/fdroidserver.git "${fdroidserver}"
# Install additional utilities required by actual builds (list subject to future expansion)
# build-tools 32.0.0 is needed for a good apksigner
RUN apt-get update && apt-get install --yes \
RUN . /etc/profile.d/bsenv.sh \
&& apt-get update && apt-get install --yes \
patch \
autoconf libtool pkg-config \
gradle ant \
&& echo y | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;32.0.0" \
ant \
&& echo y | sdkmanager "build-tools;32.0.0" \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
VOLUME ["/repo"]
WORKDIR /repo
ENTRYPOINT ["/usr/local/bin/fdroid"]
ENTRYPOINT ["sh", "-c", ". /etc/profile.d/bsenv.sh && GRADLE_USER_HOME=${home_vagrant}/.gradle ${fdroidserver}/fdroid \"$@\"", "-s"]
CMD ["--help"]