From a02c3558e3c123dd9428110b60ba357e5d99adfe Mon Sep 17 00:00:00 2001 From: Fred Date: Sun, 17 Mar 2024 15:08:59 -0700 Subject: [PATCH 1/5] Update misc.bash the url for downloading golang has changed. --- scripts/misc.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/misc.bash b/scripts/misc.bash index 70929888..6f4a8c89 100644 --- a/scripts/misc.bash +++ b/scripts/misc.bash @@ -54,7 +54,8 @@ function install_golang() { GOARCH=$(uname -m) [[ $GOARCH == aarch64 ]] && GOARCH=arm64 [[ $GOARCH == x86_64 ]] && GOARCH=amd64 - url=https://dl.google.com/go/go"$version".linux-"$GOARCH".tar.gz + #url=https://dl.google.com/go/go"$version".linux-"$GOARCH".tar.gz + https://go.dev/dl/go"$version".8.linux-"$GOARCH".tar.gz echo "Installing Golang ($url)... to $GOROOT" curl -L \ -o go.tar.gz \ From 5bb9cd7080e2b42068309e78ba3f8d6875a9ce9e Mon Sep 17 00:00:00 2001 From: Fred Date: Sun, 17 Mar 2024 15:12:21 -0700 Subject: [PATCH 2/5] Update Dockerfile browsh.xpi is missing. Added wget command to download the most recent browsh.xpi from the browsh release page and then move it to the right directory --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 21bf845d..805e35af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,6 +31,8 @@ ENV BASE=$GOPATH/src/browsh/interfacer ADD interfacer $BASE WORKDIR $BASE RUN /build/ctl.sh install_golang $BASE +RUN wget -P "$BASE" "https://github.com/browsh-org/browsh/releases/download/v1.8.3/browsh-1.8.3.xpi" +RUN mv "$BASE/browsh-1.8.3.xpi" "$BASE/src/browsh/browsh.xpi" RUN /build/ctl.sh build_browsh_binary $BASE ########################### From 20f4bba5e2a6862587b5587162c0d6fa31ab51a4 Mon Sep 17 00:00:00 2001 From: Fred Date: Sun, 17 Mar 2024 15:12:43 -0700 Subject: [PATCH 3/5] Update Dockerfile added wget to the list of libraries --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 805e35af..3fc99354 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,7 @@ FROM bitnami/minideb:bullseye as build RUN install_packages \ curl \ + wget\ ca-certificates \ git \ autoconf \ From 2b4054f4cffd04924ce51c24ab96c36ba468af5e Mon Sep 17 00:00:00 2001 From: Fred Date: Sun, 17 Mar 2024 15:15:31 -0700 Subject: [PATCH 4/5] Update Dockerfile it fails to added list of hosts to /etc/hosts in place, complaining hosts are "read-only". Instead of changing during the image, I changed the host during the run. --- Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3fc99354..d3aaebf9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,9 +59,12 @@ RUN install_packages \ # Block ads, etc. This includes porn just because this image is also used on the # public SSH demo: `ssh brow.sh`. -RUN curl \ - -o /etc/hosts \ - https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews-gambling-porn-social/hosts +#RUN curl \ +# -o /etc/hosts \ +# https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews-gambling-porn-social/hosts + +RUN echo 'curl -o /etc/hosts https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews-gambling-porn-social/hosts' >> /entrypoint.sh +RUN chmod +x /entrypoint.sh # Don't use root RUN useradd -m user --home /app @@ -80,5 +83,6 @@ RUN TERM=xterm script \ >/dev/null & \ sleep 10 +ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/app/bin/browsh"] From 6eccf97b61077fb6bd1277310a287e24ad51ff33 Mon Sep 17 00:00:00 2001 From: Fred Date: Sun, 17 Mar 2024 17:03:07 -0700 Subject: [PATCH 5/5] Update misc.bash fix a typo --- scripts/misc.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/misc.bash b/scripts/misc.bash index 6f4a8c89..3638bf16 100644 --- a/scripts/misc.bash +++ b/scripts/misc.bash @@ -55,7 +55,7 @@ function install_golang() { [[ $GOARCH == aarch64 ]] && GOARCH=arm64 [[ $GOARCH == x86_64 ]] && GOARCH=amd64 #url=https://dl.google.com/go/go"$version".linux-"$GOARCH".tar.gz - https://go.dev/dl/go"$version".8.linux-"$GOARCH".tar.gz + url=https://go.dev/dl/go"$version".8.linux-"$GOARCH".tar.gz echo "Installing Golang ($url)... to $GOROOT" curl -L \ -o go.tar.gz \