Merge pull request #198 from JonathanTreffler/JonathanTreffler-patch-2

Fix installation

Dockerfile.ubuntu20

@@ -19,7 +19,7 @@ RUN apt-get update && \
     curl -O https://dl.winehq.org/wine-builds/winehq.key && \
     apt-key add winehq.key && \
     add-apt-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main' && \
-    apt-get install -y winehq-stable=9.0* && \
+    apt-get install -y winehq-stable=10.0* && \
     apt-get install -y winetricks && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y locales && \
     sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
@@ -29,4 +29,4 @@ RUN apt-get update && \
 EXPOSE 5900
 
 COPY rootfs/ /
-RUN chmod +x /startapp.sh
+RUN chmod +x /startapp.sh

Dockerfile.ubuntu22

@@ -14,12 +14,12 @@ ENV WINEDEBUG -all
 ENV DISPLAY=:0
 
 RUN apt-get update && \
-    apt-get install -y curl software-properties-common gnupg2 winbind xvfb && \
+    apt-get install -y curl software-properties-common gnupg2 winbind xvfb 7zip cabextract && \
     dpkg --add-architecture i386 && \
     curl -O https://dl.winehq.org/wine-builds/winehq.key && \
     apt-key add winehq.key && \
     add-apt-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ jammy main' && \
-    apt-get install -y winehq-stable=9.0* && \
+    apt-get install -y winehq-stable=10.0* && \
     apt-get install -y winetricks && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y locales && \
     sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
@@ -29,4 +29,4 @@ RUN apt-get update && \
 EXPOSE 5900
 
 COPY rootfs/ /
-RUN chmod +x /startapp.sh
+RUN chmod +x /startapp.sh

README.md

@@ -33,7 +33,7 @@ It runs the Backblaze client and starts a virtual X server and a VNC server with
          * [Certificates](#certificates)
          * [VNC Password](#vnc-password)
          * [DH Parameters](#dh-parameters)
-      * **[Installation](#installation)**
+      * **[Installation Guide](#installation-guide)**
       * [Additional Information](#additional-information)
       * [Credits](#credits)
 
@@ -74,7 +74,7 @@ Here are the main components of this image:
 |-----|-------------|
 | latest | Latest stable version of the image based on ubuntu 22 |
 | ubuntu22 | Latest stable version of the image based on ubuntu 22 |
-| ubuntu20 | Latest stable version of the image based on ubuntu 20 |
+| ubuntu20 | Latest stable version of the image based on ubuntu 20 **(Not recommended anymore)** |
 | ubuntu18 | Latest stable version of the image based on ubuntu 18 **(End of Life - unmaintained)** |
 | v1.x | Versioned stable releases based on ubuntu 22 |
 | main | Automatic build of the main branch (may be unstable) based on ubuntu 22 |
@@ -273,7 +273,8 @@ container.
 [DH key-exchange]: https://en.wikipedia.org/wiki/Diffie%E2%80%93Hellman_key_exchange
 [OpenSSL Wiki]: https://wiki.openssl.org/index.php/Diffie_Hellman
 
-## Installation:
+## Installation Guide:
+1. Understand, that this docker is a volunteer project, not a commercial product. Some thinkering is to be expected, community based solution finding is encouraged in the issues. If something does not work: look for an open issue about the topic, if there isn't create one. If there is one read through it to see if somebody has found a workaround/fix. If you are a developer I highly encourage you to turn your fix into a Pull Request to allow others to benefit from it.
 1. Check for yourself if using this docker complies with the Backblaze [terms of service](https://www.backblaze.com/company/terms.html)
 1. Modify the following for your setup (in terms of [ports](#ports), [volumes](#volumes) and [environment variables](#environment-variables)) and run it
    

rootfs/startapp.sh

@@ -24,6 +24,7 @@ log_message() {
 if [ ! -f "${WINEPREFIX}system.reg" ]; then
     echo "WINE: Wine not initialized, initializing"
     wineboot -i
+    WINETRICKS_ACCEPT_EULA=1 winetricks -q -f dotnet48
     log_message "WINE: Initialization done"
 fi
 
@@ -82,10 +83,7 @@ fetch_and_install() {
         curl -A "$custom_user_agent" -L "$pinned_bz_version_url" --output "install_backblaze.exe" || handle_error "INSTALLER: error downloading from $pinned_bz_version_url"
     fi
     log_message "INSTALLER: Starting install_backblaze.exe"
-    if [ -f "${WINEPREFIX}drive_c/Program Files (x86)/Backblaze/bzbui.exe" ]; then
-        WINEARCH="$WINEARCH" WINEPREFIX="$WINEPREFIX" wine64 "install_backblaze.exe" -nogui || handle_error "INSTALLER: Failed to install Backblaze"
-    else
-        WINEARCH="$WINEARCH" WINEPREFIX="$WINEPREFIX" wine64 "install_backblaze.exe" || handle_error "INSTALLER: Failed to install Backblaze"
+    WINEARCH="$WINEARCH" WINEPREFIX="$WINEPREFIX" wine64 "install_backblaze.exe" || handle_error "INSTALLER: Failed to install Backblaze"
     fi
 
 }