Base on new registry.gitlab.com/fdroid/fdroidserver:buildserver image
This commit is contained in:
parent
a27b529728
commit
93ef3f8264
1 changed files with 8 additions and 7 deletions
15
Dockerfile
15
Dockerfile
|
@ -1,23 +1,24 @@
|
||||||
FROM registry.gitlab.com/fdroid/ci-images-base
|
FROM registry.gitlab.com/fdroid/fdroidserver:buildserver
|
||||||
|
|
||||||
COPY signing-key.asc /
|
COPY signing-key.asc /
|
||||||
|
|
||||||
RUN gpg --import /signing-key.asc
|
RUN gpg --import /signing-key.asc
|
||||||
|
|
||||||
RUN python3 -m pip install --upgrade pip wheel setuptools \
|
RUN . /etc/profile.d/bsenv.sh \
|
||||||
&& python3 -m pip install git+https://gitlab.com/fdroid/fdroidserver.git
|
&& git clone --depth 1 https://gitlab.com/fdroid/fdroidserver.git "${fdroidserver}"
|
||||||
|
|
||||||
# Install additional utilities required by actual builds (list subject to future expansion)
|
# Install additional utilities required by actual builds (list subject to future expansion)
|
||||||
# build-tools 32.0.0 is needed for a good apksigner
|
# 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 \
|
patch \
|
||||||
autoconf libtool pkg-config \
|
autoconf libtool pkg-config \
|
||||||
gradle ant \
|
ant \
|
||||||
&& echo y | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;32.0.0" \
|
&& echo y | sdkmanager "build-tools;32.0.0" \
|
||||||
&& apt-get clean && rm -rf /var/lib/apt/lists/*
|
&& apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
VOLUME ["/repo"]
|
VOLUME ["/repo"]
|
||||||
WORKDIR /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"]
|
CMD ["--help"]
|
||||||
|
|
Loading…
Reference in a new issue