From 6027c50e89c0cb889fb5dd9f11863cefd55c2a83 Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 27 Sep 2020 01:00:25 +0100 Subject: [PATCH 01/24] Add vlc --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7772302..6f4da34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,8 @@ FROM jlesage/baseimage-gui:ubuntu-18.04 +RUN echo "deb http://us.archive.ubuntu.com/ubuntu/ bionic main" >> /etc/apt/sources.list +RUN > /var/lib/dpkg/statoverride + # Set environment variables ENV APP_NAME="Tor Browser" \ TOR_VERSION=9.5.4 \ @@ -13,7 +16,7 @@ RUN install_app_icon.sh "https://github.com/DomiStyle/docker-tor-browser/raw/mas # Add wget and Tor browser dependencies RUN apt-get update && \ - apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 && \ + apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 pulseaudio vlc && \ rm -rf /var/lib/apt/lists/* # Set working directory @@ -38,3 +41,4 @@ COPY browser-cfg /browser-cfg # Add start script COPY startapp.sh /startapp.sh + From abc3f0d5eb0616d8720ea43de88f184d7960a875 Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 18 Oct 2020 02:41:43 +0100 Subject: [PATCH 02/24] simple builder --- build.bat | 1 + build.sh | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 build.bat create mode 100755 build.sh diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..4d4b873 --- /dev/null +++ b/build.bat @@ -0,0 +1 @@ +docker build -t domistyle/tor-browser . diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..1e1725a --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# + +docker build -t domistyle/tor-browser . + From 2fcfe2e3cd6e392c5b82433b00885e93a4f7f1d6 Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 27 Sep 2020 01:00:25 +0100 Subject: [PATCH 03/24] Add vlc --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f377940..9c58b79 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,8 @@ FROM jlesage/baseimage-gui:ubuntu-18.04 +RUN echo "deb http://us.archive.ubuntu.com/ubuntu/ bionic main" >> /etc/apt/sources.list +RUN > /var/lib/dpkg/statoverride + # Set environment variables ENV APP_NAME="Tor Browser" \ TOR_VERSION=10.0.1 \ @@ -13,7 +16,7 @@ RUN install_app_icon.sh "https://github.com/DomiStyle/docker-tor-browser/raw/mas # Add wget and Tor browser dependencies RUN apt-get update && \ - apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 && \ + apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 pulseaudio vlc && \ rm -rf /var/lib/apt/lists/* # Set working directory @@ -38,3 +41,4 @@ COPY browser-cfg /browser-cfg # Add start script COPY startapp.sh /startapp.sh + From d79b00628582e8a4b74f22fe230551b9042fded6 Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 18 Oct 2020 02:41:43 +0100 Subject: [PATCH 04/24] simple builder --- build.bat | 1 + build.sh | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 build.bat create mode 100755 build.sh diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..4d4b873 --- /dev/null +++ b/build.bat @@ -0,0 +1 @@ +docker build -t domistyle/tor-browser . diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..1e1725a --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# + +docker build -t domistyle/tor-browser . + From 4542980ec5747f7885e08c0c9b7b56e24a1d9d17 Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 27 Sep 2020 01:00:25 +0100 Subject: [PATCH 05/24] Add vlc --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 467a243..4e86954 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,8 @@ FROM jlesage/baseimage-gui:ubuntu-18.04 +RUN echo "deb http://us.archive.ubuntu.com/ubuntu/ bionic main" >> /etc/apt/sources.list +RUN > /var/lib/dpkg/statoverride + # Set environment variables ENV APP_NAME="Tor Browser" \ TOR_VERSION=10.0.2 \ @@ -13,7 +16,7 @@ RUN install_app_icon.sh "https://github.com/DomiStyle/docker-tor-browser/raw/mas # Add wget and Tor browser dependencies RUN apt-get update && \ - apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 && \ + apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 pulseaudio vlc && \ rm -rf /var/lib/apt/lists/* # Set working directory @@ -38,3 +41,4 @@ COPY browser-cfg /browser-cfg # Add start script COPY startapp.sh /startapp.sh + From be90a6bdf24dd3425eafc986b2a9f2c912cfa0dc Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 18 Oct 2020 02:41:43 +0100 Subject: [PATCH 06/24] simple builder --- build.bat | 1 + build.sh | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 build.bat create mode 100755 build.sh diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..4d4b873 --- /dev/null +++ b/build.bat @@ -0,0 +1 @@ +docker build -t domistyle/tor-browser . diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..1e1725a --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# + +docker build -t domistyle/tor-browser . + From b71b34e8f2e4181da29e26b7d912750c6aad3aeb Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 27 Sep 2020 01:00:25 +0100 Subject: [PATCH 07/24] Add vlc --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5c5aa39..e50fad4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,8 @@ FROM jlesage/baseimage-gui:ubuntu-18.04 +RUN echo "deb http://us.archive.ubuntu.com/ubuntu/ bionic main" >> /etc/apt/sources.list +RUN > /var/lib/dpkg/statoverride + # Set environment variables ENV APP_NAME="Tor Browser" \ TOR_VERSION=10.0.4 \ @@ -13,7 +16,7 @@ RUN install_app_icon.sh "https://github.com/DomiStyle/docker-tor-browser/raw/mas # Add wget and Tor browser dependencies RUN apt-get update && \ - apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 && \ + apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 pulseaudio vlc && \ rm -rf /var/lib/apt/lists/* # Set working directory @@ -38,3 +41,4 @@ COPY browser-cfg /browser-cfg # Add start script COPY startapp.sh /startapp.sh + From d3f55947fe3527131ac6e36e5c87bdba8cbe63fa Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 18 Oct 2020 02:41:43 +0100 Subject: [PATCH 08/24] simple builder --- build.bat | 1 + build.sh | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 build.bat create mode 100755 build.sh diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..4d4b873 --- /dev/null +++ b/build.bat @@ -0,0 +1 @@ +docker build -t domistyle/tor-browser . diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..1e1725a --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# + +docker build -t domistyle/tor-browser . + From be5a842688301545f702822d004b4e2ff477e55e Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 27 Sep 2020 01:00:25 +0100 Subject: [PATCH 09/24] Add vlc --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8b71c59..976100e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,8 @@ FROM jlesage/baseimage-gui:ubuntu-18.04 +RUN echo "deb http://us.archive.ubuntu.com/ubuntu/ bionic main" >> /etc/apt/sources.list +RUN > /var/lib/dpkg/statoverride + # Set environment variables ENV APP_NAME="Tor Browser" \ TOR_VERSION=10.0.5 \ @@ -13,7 +16,7 @@ RUN install_app_icon.sh "https://github.com/DomiStyle/docker-tor-browser/raw/mas # Add wget and Tor browser dependencies RUN apt-get update && \ - apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 && \ + apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 pulseaudio vlc && \ rm -rf /var/lib/apt/lists/* # Set working directory @@ -38,3 +41,4 @@ COPY browser-cfg /browser-cfg # Add start script COPY startapp.sh /startapp.sh + From c5f94e2aa8eda912b8006c5e19f1cf76b369992b Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 18 Oct 2020 02:41:43 +0100 Subject: [PATCH 10/24] simple builder --- build.bat | 1 + build.sh | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 build.bat create mode 100755 build.sh diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..4d4b873 --- /dev/null +++ b/build.bat @@ -0,0 +1 @@ +docker build -t domistyle/tor-browser . diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..1e1725a --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# + +docker build -t domistyle/tor-browser . + From 05a472dfcd9d92e8cca486cf04c59d675080f643 Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 27 Sep 2020 01:00:25 +0100 Subject: [PATCH 11/24] Add vlc --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fa56043..7eb2bde 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,8 @@ FROM jlesage/baseimage-gui:ubuntu-18.04 +RUN echo "deb http://us.archive.ubuntu.com/ubuntu/ bionic main" >> /etc/apt/sources.list +RUN > /var/lib/dpkg/statoverride + # Set environment variables ENV APP_NAME="Tor Browser" \ TOR_VERSION=10.0.6 \ @@ -13,7 +16,7 @@ RUN install_app_icon.sh "https://github.com/DomiStyle/docker-tor-browser/raw/mas # Add wget and Tor browser dependencies RUN apt-get update && \ - apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 && \ + apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 pulseaudio vlc && \ rm -rf /var/lib/apt/lists/* # Set working directory @@ -38,3 +41,4 @@ COPY browser-cfg /browser-cfg # Add start script COPY startapp.sh /startapp.sh + From ffc44c286e286067f8d5e2c409b120d5496612bf Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 18 Oct 2020 02:41:43 +0100 Subject: [PATCH 12/24] simple builder --- build.bat | 1 + build.sh | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 build.bat create mode 100755 build.sh diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..4d4b873 --- /dev/null +++ b/build.bat @@ -0,0 +1 @@ +docker build -t domistyle/tor-browser . diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..1e1725a --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# + +docker build -t domistyle/tor-browser . + From 7dd8e04d0a5e00c80f6bc90dce0f58b65a212e2c Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 27 Sep 2020 01:00:25 +0100 Subject: [PATCH 13/24] Add vlc --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2458f16..e7911aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,8 @@ FROM jlesage/baseimage-gui:ubuntu-18.04 +RUN echo "deb http://us.archive.ubuntu.com/ubuntu/ bionic main" >> /etc/apt/sources.list +RUN > /var/lib/dpkg/statoverride + # Set environment variables ENV TOR_VERSION=10.0.6 ENV APP_NAME="Tor Browser ${TOR_VERSION}" \ @@ -13,7 +16,7 @@ RUN install_app_icon.sh "https://github.com/DomiStyle/docker-tor-browser/raw/mas # Add wget and Tor browser dependencies RUN apt-get update && \ - apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 && \ + apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 pulseaudio vlc && \ rm -rf /var/lib/apt/lists/* # Set working directory @@ -38,3 +41,4 @@ COPY browser-cfg /browser-cfg # Add start script COPY startapp.sh /startapp.sh + From 6c9620ac297d0a968556dfde2e462bfe95264af1 Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 18 Oct 2020 02:41:43 +0100 Subject: [PATCH 14/24] simple builder --- build.bat | 1 + build.sh | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 build.bat create mode 100755 build.sh diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..4d4b873 --- /dev/null +++ b/build.bat @@ -0,0 +1 @@ +docker build -t domistyle/tor-browser . diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..1e1725a --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# + +docker build -t domistyle/tor-browser . + From e2bb8022cde43030cfa49a6bbc4642d985946642 Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 27 Sep 2020 01:00:25 +0100 Subject: [PATCH 15/24] Add vlc --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 34bcaa9..a27a9e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,8 @@ FROM jlesage/baseimage-gui:ubuntu-18.04 +RUN echo "deb http://us.archive.ubuntu.com/ubuntu/ bionic main" >> /etc/apt/sources.list +RUN > /var/lib/dpkg/statoverride + # Set environment variables ENV TOR_VERSION=10.0.7 ENV APP_NAME="Tor Browser ${TOR_VERSION}" \ @@ -13,7 +16,7 @@ RUN install_app_icon.sh "https://github.com/DomiStyle/docker-tor-browser/raw/mas # Add wget and Tor browser dependencies RUN apt-get update && \ - apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 && \ + apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 pulseaudio vlc && \ rm -rf /var/lib/apt/lists/* # Set working directory @@ -38,3 +41,4 @@ COPY browser-cfg /browser-cfg # Add start script COPY startapp.sh /startapp.sh + From 7bbf302afd375381000eb20dcf3f1c2951717f1d Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 18 Oct 2020 02:41:43 +0100 Subject: [PATCH 16/24] simple builder --- build.bat | 1 + build.sh | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 build.bat create mode 100755 build.sh diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..4d4b873 --- /dev/null +++ b/build.bat @@ -0,0 +1 @@ +docker build -t domistyle/tor-browser . diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..1e1725a --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# + +docker build -t domistyle/tor-browser . + From 1dd8d5cf03a8b023eb85543040a2d599c07cb06e Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 27 Sep 2020 01:00:25 +0100 Subject: [PATCH 17/24] Add vlc --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 22c0b37..4e2f964 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,8 @@ FROM jlesage/baseimage-gui:ubuntu-18.04 +RUN echo "deb http://us.archive.ubuntu.com/ubuntu/ bionic main" >> /etc/apt/sources.list +RUN > /var/lib/dpkg/statoverride + # Set environment variables ENV TOR_VERSION=10.0.10 ENV APP_NAME="Tor Browser ${TOR_VERSION}" \ @@ -13,7 +16,7 @@ RUN install_app_icon.sh "https://github.com/DomiStyle/docker-tor-browser/raw/mas # Add wget and Tor browser dependencies RUN apt-get update && \ - apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 && \ + apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 pulseaudio vlc && \ rm -rf /var/lib/apt/lists/* # Set working directory @@ -38,3 +41,4 @@ COPY browser-cfg /browser-cfg # Add start script COPY startapp.sh /startapp.sh + From c331eeca9c412b316a8b01b8c18e08c662a05fed Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 18 Oct 2020 02:41:43 +0100 Subject: [PATCH 18/24] simple builder --- build.bat | 1 + build.sh | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 build.bat create mode 100755 build.sh diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..4d4b873 --- /dev/null +++ b/build.bat @@ -0,0 +1 @@ +docker build -t domistyle/tor-browser . diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..1e1725a --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# + +docker build -t domistyle/tor-browser . + From 86d0937599df70c6fc61f4a87ac0aad774ca86aa Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 27 Sep 2020 01:00:25 +0100 Subject: [PATCH 19/24] Add vlc --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 00b0fa7..6119c69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,8 @@ FROM jlesage/baseimage-gui:ubuntu-18.04 +RUN echo "deb http://us.archive.ubuntu.com/ubuntu/ bionic main" >> /etc/apt/sources.list +RUN > /var/lib/dpkg/statoverride + # Set environment variables ENV TOR_VERSION=10.0.12 ENV APP_NAME="Tor Browser ${TOR_VERSION}" \ @@ -13,7 +16,7 @@ RUN install_app_icon.sh "https://github.com/DomiStyle/docker-tor-browser/raw/mas # Add wget and Tor browser dependencies RUN apt-get update && \ - apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 && \ + apt-get install -y wget gpg libdbus-glib-1-2 libgtk-3-0 pulseaudio vlc && \ rm -rf /var/lib/apt/lists/* # Set working directory @@ -38,3 +41,4 @@ COPY browser-cfg /browser-cfg # Add start script COPY startapp.sh /startapp.sh + From 091431b906bedf65484effbe188d9a0a0ae7e087 Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Sun, 18 Oct 2020 02:41:43 +0100 Subject: [PATCH 20/24] simple builder --- build.bat | 1 + build.sh | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 build.bat create mode 100755 build.sh diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..4d4b873 --- /dev/null +++ b/build.bat @@ -0,0 +1 @@ +docker build -t domistyle/tor-browser . diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..1e1725a --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# + +docker build -t domistyle/tor-browser . + From cc8575b74321fb4a7965a37c169ecf1495a43846 Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Wed, 1 Sep 2021 18:38:06 +0100 Subject: [PATCH 21/24] rename .gitlab-ci.yml to not do anthing --- .gitlab-ci.yml => _.gitlab-ci.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .gitlab-ci.yml => _.gitlab-ci.yml (100%) diff --git a/.gitlab-ci.yml b/_.gitlab-ci.yml similarity index 100% rename from .gitlab-ci.yml rename to _.gitlab-ci.yml From b42f46cc765895f65f14e491a63725bcf22057db Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Mon, 27 Mar 2023 21:10:01 +0100 Subject: [PATCH 22/24] Update to 12.0.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eacd9c7..55488aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM jlesage/baseimage-gui:ubuntu-20.04-v4 AS builder ARG LOCALE="en-US" -ENV TOR_VERSION_X64="x86_64-12.0.4" +ENV TOR_VERSION_X64="12.0.4" ENV TOR_VERSION_ARM64="12.0.3" # automatic; passed in by Docker buildx From 28c8e595ce763b496be2bb03a0435b12337fa3b8 Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Tue, 28 Mar 2023 00:44:00 +0100 Subject: [PATCH 23/24] Add VLC and pulse cfg --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 55488aa..1183d81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM jlesage/baseimage-gui:ubuntu-20.04-v4 AS builder ARG LOCALE="en-US" ENV TOR_VERSION_X64="12.0.4" -ENV TOR_VERSION_ARM64="12.0.3" +ENV TOR_VERSION_ARM64="12.0.4" # automatic; passed in by Docker buildx ARG TARGETARCH @@ -88,9 +88,7 @@ RUN apt-get update \ file \ libdbus-glib-1-2 \ libgtk-3-0 \ - libx11-xcb1 \ - libxt6 \ - libasound2 \ + vlc xclip vim \ && rm -rf /var/lib/apt/lists/* COPY --from=builder /app /app @@ -99,6 +97,7 @@ COPY --from=builder /opt/noVNC/index.html /opt/noVNC/index.html COPY browser-cfg /browser-cfg COPY startapp.sh /startapp.sh +COPY run/pulse-client.conf /etc/pulse/client.conf EXPOSE 5800 EXPOSE 5900 From 4bf177ed7cba8ba9a824f5309c5b2e7707c26de1 Mon Sep 17 00:00:00 2001 From: David Newcomb Date: Tue, 28 Mar 2023 00:51:48 +0100 Subject: [PATCH 24/24] Working on MacOS --- run/.gitignore | 2 + run/audio.sh | 12 ++++ run/pulse-client.any-tcp.conf | 9 +++ run/pulse-client.linux-native.conf | 9 +++ run/tor | 99 ++++++++++++++++++++++++++++++ run/tor.opts.default.sh | 28 +++++++++ 6 files changed, 159 insertions(+) create mode 100644 run/.gitignore create mode 100755 run/audio.sh create mode 100644 run/pulse-client.any-tcp.conf create mode 100644 run/pulse-client.linux-native.conf create mode 100755 run/tor create mode 100644 run/tor.opts.default.sh diff --git a/run/.gitignore b/run/.gitignore new file mode 100644 index 0000000..42134f6 --- /dev/null +++ b/run/.gitignore @@ -0,0 +1,2 @@ +pulse-client.conf +tor.opts.sh diff --git a/run/audio.sh b/run/audio.sh new file mode 100755 index 0000000..3b0626a --- /dev/null +++ b/run/audio.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +# +# Starts Pulse Audio server: +# listening on default port (4713) +# allowing anonymous connections + +DEBUG="-v" +DEBUG="" + +echo "Starting Pulse Audio" +pulseaudio $DEBUG --load="module-native-protocol-tcp auth-anonymous=1" --exit-idle-time=-1 --use-pid-file=1 + diff --git a/run/pulse-client.any-tcp.conf b/run/pulse-client.any-tcp.conf new file mode 100644 index 0000000..3b5a6bd --- /dev/null +++ b/run/pulse-client.any-tcp.conf @@ -0,0 +1,9 @@ +# Works on everything +default-server = tcp:host.docker.internal + +# Prevent a server running in the container +autospawn = no +daemon-binary = /bin/true + +# Prevent the use of shared memory +enable-shm = false diff --git a/run/pulse-client.linux-native.conf b/run/pulse-client.linux-native.conf new file mode 100644 index 0000000..e88d0fc --- /dev/null +++ b/run/pulse-client.linux-native.conf @@ -0,0 +1,9 @@ +# Linux to Linux works, couldn't get Mac to work, won't work on Windows +default-server = unix:/run/user/1000/pulse/native + +# Prevent a server running in the container +autospawn = no +daemon-binary = /bin/true + +# Prevent the use of shared memory +enable-shm = false diff --git a/run/tor b/run/tor new file mode 100755 index 0000000..46cf636 --- /dev/null +++ b/run/tor @@ -0,0 +1,99 @@ +#!/bin/bash +# set -x +# +# $HOME/Development/git/docker-tor-browser +# + +# https://stackoverflow.com/a/4774063/1700121 +RUN="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" + +DN=/dev/null +PA_PID="$HOME/.config/pulse/`hostname`-runtime/pid" + +. $RUN/tor.opts.default.sh + +if [ -f $RUN/tor.opts.sh ] +then + . $RUN/tor.opts.sh +fi + +docker ps > /dev/null +if [ $? -ne 0 ] +then + + echo "Docker not running" + exit 1 +fi + +if [ ! -z "$SHARED_LOCAL_FOLDER" -a ! -d "$SHARED_LOCAL_FOLDER" ] +then + echo "Can not find $SHARED_LOCAL_FOLDER" + exit 1 +fi + +PLAT=$(uname) +EXTERNAL_PORT_PULSEAUDIO=4713 +PARAMS=() +PARAMS+=("-d") # +PARAMS+=("--shm-size=2g") # +PARAMS+=("--add-host host.docker.internal:$HOST_IP") # +PARAMS+=("-p 127.0.0.1:$EXTERNAL_PORT_VNC:5800") # +PARAMS+=("-p 127.0.0.1:$EXTERNAL_PORT_PULSEAUDIO:4713") # +PARAMS+=("-e DISPLAY_WIDTH=$DISPLAY_WIDTH") # +PARAMS+=("-e DISPLAY_HEIGHT=$DISPLAY_HEIGHT") # +if [ ! -z "$SHARED_LOCAL_FOLDER" ] +then + PARAMS+=("-v $SHARED_LOCAL_FOLDER:/app/host") # +fi +if [ "$PLAT" = "Linux" ] +then + PARAMS+=("-v /run/user/1000/pulse:/run/user/1000/pulse") # + USE_NATIVE_PA="1" +else + USE_NATIVE_PA="0" +fi + + +DOCKER_INSTANCE_ID=$(docker run ${PARAMS[*]} "$DOCKER_IMAGE_TAG") + +IMAGE_ID=${DOCKER_INSTANCE_ID:0:12} + +echo "" +echo "http://localhost:$EXTERNAL_PORT_VNC/" +echo "" +echo "Full Id: $DOCKER_INSTANCE_ID" +echo "" +echo "# docker kill $IMAGE_ID" +echo "IMAGE_ID=$IMAGE_ID" + +echo "docker exec -it $IMAGE_ID /bin/bash" +echo "setclip 'file:///app/host/home.html'" + +docker ps --format "{{.ID}} {{.Image}} {{.Status}}" +echo "" + +if [ "$USE_NATIVE_PA" = "1" ] +then + echo "Using native pulse audio" +else + $RUN/audio.sh & +fi + +echo "" +echo "" +echo "Starting shell...." +echo "" +echo "" +docker exec -it $IMAGE_ID /bin/bash +echo "" +echo "Waiting for docker to end..." +docker wait $IMAGE_ID + +if [ "$USE_NATIVE_PA" != "1" ] +then + PID=`cat $PA_PID` + echo "Killing PA (pid=$PID)" + kill $PID +fi + +echo "Terminated" diff --git a/run/tor.opts.default.sh b/run/tor.opts.default.sh new file mode 100644 index 0000000..04d9020 --- /dev/null +++ b/run/tor.opts.default.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +# PulseAudio process file location +PA_PID="$HOME/.config/pulse/`hostname`-runtime/pid" + +# VNC port exposed +EXTERNAL_PORT_VNC=5801 + +# PulseAudio port exposed +EXTERNAL_PORT_PULASE_AUDIO=4000 + +# Width of display +DISPLAY_WIDTH=1426 + +# Height of display +DISPLAY_HEIGHT=897 + +# Local folder to map inside VM, appears as /app/host +SHARED_LOCAL_FOLDER="host" + +# Docker Image +DOCKER_IMAGE_TAG="davidnewcomb/tor-browser" + +# PulseAudio needs the IP of your host to connect +# Darwin +#HOST_IP=$(ifconfig | grep broadcast | awk '{print $2}') +# Linux +#HOST_IP=$(hostname -I | awk '{print $1}')