Merge branch 'release/2.0.4.3_beta'

# Conflicts: # Updates/build_version.txt # changelog.txt
2018-11-28 11:49:38 +01:00
parent e020f8209c 3e32883f7d
commit 8651bb30a9
3 changed files with 3 additions and 2 deletions
@@ -3,6 +3,7 @@ FROM ubuntu:latest
 # Source build packages locally
 ARG DOCKER_BUILD_PROXY
 ENV DOCKER_BUILD_PROXY $DOCKER_BUILD_PROXY
+ENV DEBIAN_FRONTEND noninteractive

 # Install common build tools
 RUN set -uex; \
@@ -7,7 +7,7 @@ ENV DOCKER_BUILD_PROXY $DOCKER_BUILD_PROXY
 # Install common build tools
 RUN dnf -y install deltarpm
 RUN dnf -y upgrade
-RUN dnf -y install @"Minimal Install" @buildsys-build yum-utils rpm-sign gnupg rpmdevtools
+RUN dnf -y install @"Minimal Install" @buildsys-build yum-utils rpm-sign gnupg rpmdevtools --allowerasing

 # Install mono things
 RUN dnf -y install mono-devel gnome-sharp-devel dos2unix git nuget
@@ -1 +1 @@
-4
+4