From ce5dafc27093473d3ec554e43039ef26cced185b Mon Sep 17 00:00:00 2001 From: Chomtana Date: Mon, 29 Jan 2024 23:12:34 +0700 Subject: [PATCH 1/2] fix: upgrade lz4 and go --- docker/dockerfiles/Dockerfile.bedrock-init | 4 ++-- scripts/utils.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/dockerfiles/Dockerfile.bedrock-init b/docker/dockerfiles/Dockerfile.bedrock-init index e92d405..91822d9 100644 --- a/docker/dockerfiles/Dockerfile.bedrock-init +++ b/docker/dockerfiles/Dockerfile.bedrock-init @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:23.10 # Disable prompts during package installation. ARG DEBIAN_FRONTEND=noninteractive @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt install -y curl wget git rsync build-essential openssl python3 python3-pip aria2 zstd lz4 # Install Go. -RUN curl -sSL https://golang.org/dl/go1.19.5.linux-amd64.tar.gz | tar -v -C /usr/local -xz +RUN curl -sSL https://golang.org/dl/go1.21.6.linux-amd64.tar.gz | tar -v -C /usr/local -xz RUN cp /usr/local/go/bin/go /usr/bin/go # Install Foundry. diff --git a/scripts/utils.sh b/scripts/utils.sh index 1473c89..3128954 100755 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -24,7 +24,7 @@ function extractzst() { # loc: Location to extract to. function extractlz4() { mkdir -p $2 - tar --use-compress-program=lz4 -xf $1 -C $2 + tar --use-compress-program="lz4 --no-crc" -xf $1 -C $2 } # download: Downloads a file and provides basic progress percentages. From 12cadf6766691a9fed899bddb05257c8e61adbf8 Mon Sep 17 00:00:00 2001 From: Chomtana Date: Mon, 29 Jan 2024 23:19:09 +0700 Subject: [PATCH 2/2] fix: remove qtorrent due to error: externally-managed-environment --- docker/dockerfiles/Dockerfile.bedrock-init | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker/dockerfiles/Dockerfile.bedrock-init b/docker/dockerfiles/Dockerfile.bedrock-init index 91822d9..9e1e617 100644 --- a/docker/dockerfiles/Dockerfile.bedrock-init +++ b/docker/dockerfiles/Dockerfile.bedrock-init @@ -14,6 +14,3 @@ RUN cp /usr/local/go/bin/go /usr/bin/go RUN curl -L https://foundry.paradigm.xyz | bash RUN /root/.foundry/bin/foundryup RUN rsync -a /root/.foundry/bin/ /usr/bin/ - -# Install Python packages. -RUN pip3 install qbittorrent-api