Readme Updated, Docker Compose Improved

Dockerfile

@@ -3,25 +3,17 @@ FROM jlesage/baseimage-gui:ubuntu-22.04-v4 AS builder
 
 ARG LOCALE="en-US"
 
-ENV TOR_VERSION_X64="13.0.13"
-ENV TOR_VERSION_ARM64="13.0.9"
+ENV WATERFOX_VERSION_X64="5.7.2"
+ENV WATERFOX_VERSION_ARM64="5.7.2"
 
-# automatic; passed in by Docker buildx
 ARG TARGETARCH
 # x64 Tor Browser official build
-ENV TOR_BINARY_X64="https://www.torproject.org/dist/torbrowser/${TOR_VERSION_X64}/tor-browser-linux64-${TOR_VERSION_X64}_ALL.tar.xz"
-ENV TOR_SIGNATURE_X64="https://www.torproject.org/dist/torbrowser/${TOR_VERSION_X64}/tor-browser-linux64-${TOR_VERSION_X64}_ALL.tar.xz.asc"
-ENV TOR_GPG_KEY_X64="https://openpgpkey.torproject.org/.well-known/openpgpkey/torproject.org/hu/kounek7zrdx745qydx6p59t9mqjpuhdf"
-ENV TOR_FINGERPRINT_X64="0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290"
+ENV WATERFOX_BINARY="https://cdn1.waterfox.net/waterfox/releases/6.5.2/Linux_x86_64/waterfox-6.5.2.tar.bz2"
+ENV WATERFOX_GPG_KEY="https://download.opensuse.org/repositories/home:/hawkeye116477:/waterfox:/build-depends/xUbuntu_22.04/Release.gpg"
 # arm64 Tor Browser unofficial build
-ENV TOR_BINARY_ARM64="https://sourceforge.net/projects/tor-browser-ports/files/${TOR_VERSION_ARM64}/tor-browser-linux-arm64-${TOR_VERSION_ARM64}_ALL.tar.xz"
-ENV TOR_SIGNATURE_ARM64="https://sourceforge.net/projects/tor-browser-ports/files/${TOR_VERSION_ARM64}/tor-browser-linux-arm64-${TOR_VERSION_ARM64}_ALL.tar.xz.asc"
-ENV TOR_GPG_KEY_ARM64="https://h-lindholm.net/pubkey"
-ENV TOR_FINGERPRINT_ARM64="0x24F141A3B988B6C350B937586AF15D1E45FDCEC9"
-
 # Generate Tor onion favicons
-ENV ONION_ICON_URL="https://raw.githubusercontent.com/DomiStyle/docker-tor-browser/master/icon.png"
-RUN install_app_icon.sh "${ONION_ICON_URL}"
+ENV WATERFOX_ICON_URL="https://raw.githubusercontent.com/DomiStyle/docker-tor-browser/master/icon.png"
+RUN install_app_icon.sh "${WATERFOX_ICON_URL}"
 
 ARG DEBIAN_FRONTEND="noninteractive"
 RUN apt-get update \
@@ -37,39 +29,30 @@ WORKDIR /app
 
 # Download Tor Browser
 RUN if [ "$TARGETARCH" = "amd64" ]; then \
-      curl -sSLO "${TOR_BINARY_X64}" && \
-      curl -sSLO "${TOR_SIGNATURE_X64}"; \
-    elif [ "$TARGETARCH" = "arm64" ]; then \
-      curl -sSLO "${TOR_BINARY_ARM64}" && \
-      curl -sSLO "${TOR_SIGNATURE_ARM64}"; \
+      curl -sSLO "${WATERFOX_BINARY}" 
     else \
       echo "CRITICAL: Architecture '${TARGETARCH}' not in [amd64, arm64]" && \
       exit 1; \
     fi
 
 # Verify GPG signature of the Tor Browser binary
 RUN if [ "$TARGETARCH" = "amd64" ]; then \
-      curl -sSL "${TOR_GPG_KEY_X64}" | gpg --import - && \
-      gpg --output ./tor.keyring --export "${TOR_FINGERPRINT_X64}" && \
-      gpgv --keyring ./tor.keyring "${TOR_SIGNATURE_X64##*/}" "${TOR_BINARY_X64##*/}"; \
-    elif [ "$TARGETARCH" = "arm64" ]; then \
-      curl -sSL "${TOR_GPG_KEY_ARM64}" | gpg --import - && \
-      gpg --output ./tor.keyring --export "${TOR_FINGERPRINT_ARM64}" && \
-      gpgv --keyring ./tor.keyring "${TOR_SIGNATURE_ARM64##*/}" "${TOR_BINARY_ARM64##*/}"; \
+      curl -fsSL "${ WATERFOX_GPG_KEY}" |  sudo gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/home_hawkeye116477_waterfox.gpg > /dev/null gpg --import - && \
+      curl -fsSL https://download.opensuse.org/repositories/home:hawkeye116477:waterfox/xUbuntu_22.04/Release.key | 
+      echo 'deb http://download.opensuse.org/repositories/home:/hawkeye116477:/waterfox/xUbuntu_22.04/ /' | sudo tee /etc/apt/sources.list.d/home:hawkeye116477:waterfox.list
+# automatic; passed in by Docker buildx
+
     else \
       echo "CRITICAL: Architecture '${TARGETARCH}' not in [amd64, arm64]" && \
       exit 1; \
     fi
 
 # Install Tor Browser
 RUN if [ "$TARGETARCH" = "amd64" ]; then \
-      tar --strip 1 -xvJf "${TOR_BINARY_X64##*/}" && \
-      chown -R "${USER_ID}":"${GROUP_ID}" /app && \
-      rm "${TOR_BINARY_X64##*/}" "${TOR_SIGNATURE_X64##*/}"; \
-    elif [ "$TARGETARCH" = "arm64" ]; then \
-      tar --strip 1 -xvJf "${TOR_BINARY_ARM64##*/}" && \
+      tar --strip 1 -xf "${WATERFOX_BINARY##*/}" && \
       chown -R "${USER_ID}":"${GROUP_ID}" /app && \
-      rm "${TOR_BINARY_ARM64##*/}" "${TOR_SIGNATURE_ARM64##*/}"; \
+      rm "${WATERFOX_BINARY##*/}" \
+    elif [ "$TARGETARCH" = "arm64" ]; then \      
     else \
       echo "CRITICAL: Architecture '${TARGETARCH}' not in [amd64, arm64]" && \
       exit 1; \
@@ -78,7 +61,7 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \
 ### Final image
 FROM jlesage/baseimage-gui:ubuntu-22.04-v4
 
-ENV APP_NAME="Tor Browser"
+ENV APP_NAME= "Waterfox Browser"
 
 ENV show_output=1
 

README.md

@@ -1,4 +1,32 @@
-# Tor browser
+# Tor
+<p align="center">
+  <img width="300px" src="https://upload.wikimedia.org/wikipedia/commons/8/8f/Tor_project_logo_hq.png">
+</p
+
+# Table of Contents
+
+<details><summary>Docker</summary>
+
+- [Docker Compose Script](#Docker-Compose-Script)
+- [Docker Container Commands](#Docker-Container-Commands)
+- [Docker Installation](#How-to-install-Docker)
+
+</details>
+
+<details><summary>Configuration</summary>
+
+- [Platform configuration](#Platform-configuration)
+- [Browser configuration](#Browser-configuration)
+
+</details>
+
+<details><summary>Others</summary>
+
+- [Volumes](#Volumes)
+- [Port](#Port)
+- [Issues And limitations](#Issues-And-limitations)
+
+</details>
 
 ![](https://github.com/DomiStyle/docker-tor-browser/raw/master/screenshot.png)
 *Tor browser running inside of Firefox*
@@ -13,7 +41,7 @@ Both amd64 and arm64 container runtimes are supported, but only the amd64 image
 
 # Usage
 
-See the docker-compose [here](https://github.com/DomiStyle/docker-tor-browser/blob/master/docker-compose.yml) or use this command:
+See the docker-compose [here](https://github.com/DomiStyle/docker-tor-browser/blob/master/docker-compose.yml) or use this command
 
     docker run -d -p 5800:5800 domistyle/tor-browser
 
@@ -45,14 +73,78 @@ cp mozilla.cfg.template mozilla.cfg
 ## Volumes
 
 It is not recommended to add persistent volumes to your Tor Browser. We do not support any issues that arise from persistent volumes.
+# Docker Compose Script
+```yaml
+version: '3.9'
+
+services:
+  tor:
+    image: domistyle/tor-browser
+    container_name: tor
+    restart: unless-stopped
+    ports:
+      - 5800:5800
+      - 5900:5900
+    environment:
+      DISPLAY_WIDTH: 1920
+      DISPLAY_HEIGHT: 1080
+      KEEP_APP_RUNNING: 1
+      TZ: Europe/Vienna
+```
+
+# Docker Container Commands
+ To install tor browser using docker compose, copy and paste the command in your terminal
+```bash
+docker compose up
+```
+To stop the docker container do
+```bash
+docker stop tor
+```
+To start the container again, put the following command below and paste it in your terminal 
+```bash
+docker start tor
+```
+To remove the container you can do 
+```bash
+docker compose down
+```
+or you can do this
+``` 
+docker rm tor
+```
+# How to install Docker
+First update all your packages by doing
+```bash
+sudo apt update
+```
+After you update all your packages then it is time to install docker.io by doing 
+```bash
+sudo apt install -y docker.io
+```
+To add systemctl to docker do this
+```bash
+sudo systemctl enable docker --now
+```
+To verify that you docker put the following command below
+```bash
+docker
+```
+To use docker without doing sudo every time do this
+```bash
+sudo usermod -aG docker $USER
+```
+
 
-## Ports
+## Port
 
 | Port       | Description                                  |
 |------------|----------------------------------------------|
 | `5800` | Provides a web interface to access the Tor browser |
-| `5900` | Provides direct access to the VNC server |
+| `5900` | Provides direct access to the NoVNC server |
 
-## Issues & limitations
+## Issues And limitations
 
 * shm_size might need to be set to 2GB or more if you experience crashes
+### Github user who updated this markdown:
+[GitXpresso](https://github.com/GitXpresso)

docker-compose.yml

@@ -3,7 +3,8 @@ version: '3.9'
 services:
   tor:
     image: domistyle/tor-browser
-    restart: always
+    container_name: tor
+    restart: unless-stopped
     ports:
       - 5800:5800
       - 5900:5900

links/readme.md

@@ -0,0 +1,50 @@
+# /repositories/home:/hawkeye116477:/waterfox/xUbuntu_24.10 - openSUSE Download
+
+> https://download.opensuse.org/repositories/home:/hawkeye116477:/waterfox/xUbuntu_24.10
+
+/repositories/home:/hawkeye116477:/waterfox/xUbuntu\_24.10 - openSUSE Download
+===============  
+
+ [![Image 3: openSUSE icon](https://static.opensuse.org/favicon.svg) Download](https://download.opensuse.org/)
+
+*   [Shortcuts](https://download.opensuse.org/repositories/home:/hawkeye116477:/waterfox/xUbuntu_24.10#)
+
+    [debug](https://download.opensuse.org/debug/) [distribution](https://download.opensuse.org/distribution/) [factory](https://download.opensuse.org/factory/) [ports](https://download.opensuse.org/ports/) [repositories](https://download.opensuse.org/repositories/) [source](https://download.opensuse.org/source/) [tumbleweed](https://download.opensuse.org/tumbleweed/) [update](https://download.opensuse.org/update/)
+
+
+*    [![Image 4: openSUSE logo](https://download.opensuse.org/asset/f8027e92e2/logo.svg) MirrorCache](https://download.opensuse.org/repositories/home:/hawkeye116477:/waterfox/xUbuntu_24.10#)
+
+    [Mirrors](https://download.opensuse.org/app/server) [Packages](https://download.opensuse.org/app/package) [Projects](https://download.opensuse.org/app/project) [Efficiency](https://download.opensuse.org/app/efficiency) [Statistics](https://download.opensuse.org/rest/stat)
+
+    ### User menu
+
+    [Log in](https://download.opensuse.org/login)
+
+*   [Reports](https://download.opensuse.org/repositories/home:/hawkeye116477:/waterfox/xUbuntu_24.10#)
+    *   [All Mirrors](https://download.opensuse.org/report/mirrors)
+    *   [15.4 Mirrors](https://download.opensuse.org/report/mirrors/154)
+    *   [15.5 Mirrors](https://download.opensuse.org/report/mirrors/155)
+    *   [TW Mirrors](https://download.opensuse.org/report/mirrors/tumbleweed)
+    *   [Build Service Mirrors](https://download.opensuse.org/report/mirrors/repositories)
+    *   [Downloads/project](https://download.opensuse.org/report/download?group=project)
+    *   [Downloads/mirror](https://download.opensuse.org/report/download?group=mirror)
+    *   [Downloads/OS](https://download.opensuse.org/report/download?group=os)
+    *   [Downloads/country](https://download.opensuse.org/report/download?group=country)
+    *   [Downloads/arch](https://download.opensuse.org/report/download?group=arch)
+    *   [Downloads/type](https://download.opensuse.org/report/download?group=type)
+
+1.  [^](https://download.opensuse.org/)
+2.  [repositories](https://download.opensuse.org/repositories/)
+3.  [home:](https://download.opensuse.org/repositories/home:/)
+4.  [hawkeye116477:](https://download.opensuse.org/repositories/home:/hawkeye116477:/)
+5.  [waterfox](https://download.opensuse.org/repositories/home:/hawkeye116477:/waterfox/)
+6.  [xUbuntu\_24.10](https://download.opensuse.org/app/folder/10389792)
+
+| Name | Last Modified | Size |
+| --- | --- | --- |
+
+DB was [synched](https://download.opensuse.org/app/folder/10389792) : 2024-12-13T18:36:17
+
+© 2021-2024 SUSE LLC., openSUSE contributors
+
+[Legal notice](https://en.opensuse.org/Imprint) [Source code](https://github.com/openSUSE/MirrorCache) [Report issue](https://github.com/openSUSE/MirrorCache/issues/new) MirrorCache 1.089