mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-04 02:00:11 +02:00
Merge branch 'keep-fdroidserver-dependencies' into 'master'
buildserver: prevent fdroidserver deps from being purged in Docker See merge request fdroid/fdroidserver!1204
This commit is contained in:
commit
98437d88d0
@ -28,11 +28,15 @@ LABEL org.opencontainers.image.revision=$GIT_REV_PARSE_HEAD
|
|||||||
# setup 'vagrant' user for compatibility
|
# setup 'vagrant' user for compatibility
|
||||||
RUN useradd --create-home -s /bin/bash vagrant && echo -n 'vagrant:vagrant' | chpasswd
|
RUN useradd --create-home -s /bin/bash vagrant && echo -n 'vagrant:vagrant' | chpasswd
|
||||||
|
|
||||||
# the provision scripts must be run in the same order as in Vagrantfile
|
# The provision scripts must be run in the same order as in Vagrantfile
|
||||||
# - vagrant needs openssh-client iproute2 ssh sudo
|
# - vagrant needs openssh-client iproute2 ssh sudo
|
||||||
# - ansible needs python3
|
# - ansible needs python3
|
||||||
|
#
|
||||||
# Debian Docker images will soon default to HTTPS for apt sources, so force it.
|
# Debian Docker images will soon default to HTTPS for apt sources, so force it.
|
||||||
# https://github.com/debuerreotype/docker-debian-artifacts/issues/15
|
# https://github.com/debuerreotype/docker-debian-artifacts/issues/15
|
||||||
|
#
|
||||||
|
# Ensure fdroidserver is installed before purging unneeded packages,
|
||||||
|
# otherwise, all its dependencies get purged.
|
||||||
RUN printf "path-exclude=/usr/share/locale/*\npath-exclude=/usr/share/man/*\npath-exclude=/usr/share/doc/*\npath-include=/usr/share/doc/*/copyright\n" >/etc/dpkg/dpkg.cfg.d/01_nodoc \
|
RUN printf "path-exclude=/usr/share/locale/*\npath-exclude=/usr/share/man/*\npath-exclude=/usr/share/doc/*\npath-include=/usr/share/doc/*/copyright\n" >/etc/dpkg/dpkg.cfg.d/01_nodoc \
|
||||||
&& mkdir -p /usr/share/man/man1 \
|
&& mkdir -p /usr/share/man/man1 \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
@ -53,7 +57,9 @@ RUN printf "path-exclude=/usr/share/locale/*\npath-exclude=/usr/share/man/*\npat
|
|||||||
&& bash /opt/buildserver/provision-gradle \
|
&& bash /opt/buildserver/provision-gradle \
|
||||||
&& bash /opt/buildserver/provision-buildserverid $GIT_REV_PARSE_HEAD \
|
&& bash /opt/buildserver/provision-buildserverid $GIT_REV_PARSE_HEAD \
|
||||||
&& rm -rf /vagrant/cache \
|
&& rm -rf /vagrant/cache \
|
||||||
|
&& apt-get install fdroidserver \
|
||||||
&& apt-get autoremove --purge \
|
&& apt-get autoremove --purge \
|
||||||
|
&& apt-get purge fdroidserver \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user