Merge pull request #136 from scottyhardy/bugfix/rdp_black_screen

Bugfix/rdp black screen

Dockerfile

@@ -15,7 +15,6 @@ RUN apt-get update \
         p7zip \
         pulseaudio \
         pulseaudio-utils \
-        software-properties-common \
         sudo \
         tzdata \
         unzip \
@@ -27,9 +26,11 @@ RUN apt-get update \
 
 # Install wine
 ARG WINE_BRANCH="stable"
-RUN wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends software-properties-common \
+    && wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
     && apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu/ $(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2) main" \
     && dpkg --add-architecture i386 \
+    && apt-get remove -y software-properties-common systemd* \
     && apt-get update \
     && DEBIAN_FRONTEND="noninteractive" apt-get install -y --install-recommends winehq-${WINE_BRANCH} \
     && rm -rf /var/lib/apt/lists/*

Dockerfile.build_from_source

@@ -24,7 +24,7 @@ RUN ../wine-source/configure
 
 FROM build-config AS builder
 
-RUN make
+RUN make -j "$(nproc)"
 RUN mkdir -p /wine-dirs/wine-install \
    && make install DESTDIR=/wine-dirs/wine-install
 
@@ -43,7 +43,6 @@ RUN apt-get update \
         p7zip \
         pulseaudio \
         pulseaudio-utils \
-        software-properties-common \
         sudo \
         tzdata \
         unzip \
@@ -60,13 +59,6 @@ COPY pulse-client.conf /root/pulse/client.conf
 COPY entrypoint.sh /usr/bin/entrypoint
 
 
-# Build the final image
-FROM main-base
-
-COPY --from=builder /wine-dirs/wine-install/ /
-ENTRYPOINT ["/usr/bin/entrypoint"]
-
-
 # Checkpoint builds are used in CI to circumvent 6hr time-out on Github workflow jobs
 FROM build-config AS ci-builder
 COPY entrypoint_ci_builder.sh /usr/bin/entrypoint
@@ -78,3 +70,10 @@ FROM main-base as ci-final
 
 COPY wine-build/wine-install/ /
 ENTRYPOINT ["/usr/bin/entrypoint"]
+
+
+# Build the final image
+FROM main-base
+
+COPY --from=builder /wine-dirs/wine-install/ /
+ENTRYPOINT ["/usr/bin/entrypoint"]

entrypoint_ci_builder.sh

@@ -5,7 +5,7 @@
 # workflows
 
 build () {
-        make
+        make -j "$(nproc)"
         make install DESTDIR=/wine-dirs/wine-install
 }