Skip to content

Commit

Permalink
bash change prefix; lf default autoquit; curl add zstd
Browse files Browse the repository at this point in the history
Signed-off-by: ladyrick <ladyrick@qq.com>
  • Loading branch information
ladyrick committed Jun 28, 2024
1 parent 36c2574 commit 294f8f8
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
6 changes: 0 additions & 6 deletions download/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
FROM static-tools:build-base-amd64
ARG proxy=

RUN all_proxy=$proxy curl -sL 'https://github.com/gokcehan/lf/releases/download/r31/lf-linux-amd64.tar.gz' | tar xzvf - \
&& ARCH=amd64 /collect.sh lf

RUN all_proxy=$proxy curl -sL 'https://github.com/gokcehan/lf/releases/download/r31/lf-linux-arm64.tar.gz' | tar xzvf - \
&& ARCH=arm64v8 /collect.sh lf

RUN all_proxy=$proxy curl -sL 'https://github.com/antonmedv/walk/releases/download/v1.7.0/walk_linux_amd64' -o walk \
&& ARCH=amd64 /collect.sh walk

Expand Down
4 changes: 2 additions & 2 deletions tools/bash/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ ARG arch=amd64
FROM static-tools:build-base-$arch
ARG proxy=

RUN apk add ncurses-dev ncurses-static readline-dev readline-static
RUN apk add ncurses-dev ncurses-static readline-dev readline-static gettext

# https://ftp.gnu.org/gnu/bash/
RUN curl -sL https://ftp.gnu.org/gnu/bash/bash-5.2.21.tar.gz | tar zxvf - \
&& cd bash-* \
&& sed -i 's/bash_cv_func_strtoimax = yes/bash_cv_func_strtoimax = no/' m4/strtoimax.m4 \
&& autoconf -f && ./configure --enable-static-link --without-bash-malloc \
&& autoconf -f && ./configure --enable-static-link --without-bash-malloc --prefix=/usr \
&& make -j4 && /collect.sh bash
2 changes: 1 addition & 1 deletion tools/curl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG arch=amd64
FROM static-tools:build-base-$arch
ARG proxy=

RUN apk add openssl-dev nghttp2-dev nghttp2-static libssh2-dev libssh2-static openssl-libs-static zlib-static zlib-dev
RUN apk add openssl-dev nghttp2-dev nghttp2-static libssh2-dev libssh2-static openssl-libs-static zlib-static zlib-dev zstd-static zstd-dev

# https://github.com/curl/curl/releases/latest
RUN all_proxy=$proxy curl -sL https://github.com/curl/curl/releases/download/curl-8_5_0/curl-8.5.0.tar.xz | tar xJvf - \
Expand Down
12 changes: 12 additions & 0 deletions tools/lf/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ARG arch=amd64
FROM static-tools:build-base-$arch
ARG proxy=

RUN apk add go

# https://github.com/gokcehan/lf/releases
RUN all_proxy=$proxy curl -sL https://github.com/gokcehan/lf/archive/refs/tags/r32.tar.gz | tar zxvf -

RUN cd lf-* \
&& sed -i 's/autoquit = false/autoquit = true/g' opts.go \
&& HTTPS_PROXY=$proxy CGO_ENABLED=0 go build && /collect.sh lf

0 comments on commit 294f8f8

Please sign in to comment.