mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-04 02:00:11 +02:00
Merge branch 'buildserver-docker-apt-mark-manual' into 'master'
Dockerfile: apt-mark manual fdroidserver dependencies See merge request fdroid/fdroidserver!1213
This commit is contained in:
commit
41266f2ac3
@ -35,12 +35,12 @@ RUN useradd --create-home -s /bin/bash vagrant && echo -n 'vagrant:vagrant' | ch
|
|||||||
# 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,
|
# Ensure fdroidserver's dependencies are marked manual before purging
|
||||||
# otherwise, all its dependencies get purged.
|
# 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 \
|
||||||
&& apt-get install apt-transport-https ca-certificates \
|
&& apt-get install ca-certificates \
|
||||||
&& sed -i 's,http:,https:,' /etc/apt/sources.list \
|
&& sed -i 's,http:,https:,' /etc/apt/sources.list \
|
||||||
&& apt-get upgrade \
|
&& apt-get upgrade \
|
||||||
&& apt-get dist-upgrade \
|
&& apt-get dist-upgrade \
|
||||||
@ -57,9 +57,8 @@ 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-mark manual `apt-cache depends fdroidserver | sed -nE 's,^[| ]*Depends: ([a-z0-9 -]+),\1,p'` \
|
||||||
&& 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