diff --git a/podman-lazyvim/Dockerfile b/podman-lazyvim/Dockerfile index 8755cb6..fd16adb 100644 --- a/podman-lazyvim/Dockerfile +++ b/podman-lazyvim/Dockerfile @@ -1,10 +1,10 @@ -FROM ubuntu:latest +FROM docker.io/ubuntu:latest ARG USERNAME="jgrafton" ARG UID="503" ARG GID="20" -ARG ARCH="aarch64" -ARG NEOARCH="arm64" +ARG ARCH="amd64" +ARG NEOARCH="x86_64" ARG NEOVIM_VERSION="v0.11.5" ARG NVM_VERSION="v0.40.3" @@ -14,8 +14,9 @@ ARG RIPGREP_VERSION="15.1.0" ARG RUST_VERSION="1.91.1" # ubuntu / debian packages +RUN echo 'APT::Cache-Start "1000000000";' >> /etc/apt/apt.conf RUN apt update -y -RUN apt install -y curl git tar build-essential openssl libssl-dev libzstd-dev zlib1g-dev unzip +RUN apt install -y curl git tar build-essential openssl libssl-dev libzstd-dev zlib1g-dev unzip ripgrep fzf # create user #RUN addgroup --gid ${GID} ${USERNAME} @@ -44,12 +45,12 @@ RUN cd /opt/build/Python-${PYTHON_VERSION}; make -j 8 RUN cd /opt/build/Python-${PYTHON_VERSION}; make install # ripgrep -RUN curl -L https://github.com/BurntSushi/ripgrep/releases/download/${RIPGREP_VERSION}/ripgrep-${RIPGREP_VERSION}-${ARCH}-unknown-linux-gnu.tar.gz -o /opt/build/ripgrep-${RIPGREP_VERSION}-${ARCH}-unknown-linux-gnu.tar.gz -RUN cd /opt/build; tar -xvf ripgrep-${RIPGREP_VERSION}-${ARCH}-unknown-linux-gnu.tar.gz -RUN cp /opt/build/ripgrep-${RIPGREP_VERSION}-${ARCH}-unknown-linux-gnu/rg /usr/bin +#RUN curl -L https://github.com/BurntSushi/ripgrep/releases/download/${RIPGREP_VERSION}/ripgrep-${RIPGREP_VERSION}-${ARCH}-unknown-linux-gnu.tar.gz -o /opt/build/ripgrep-${RIPGREP_VERSION}-${ARCH}-unknown-linux-gnu.tar.gz +#RUN cd /opt/build; tar -xvf ripgrep-${RIPGREP_VERSION}-${ARCH}-unknown-linux-gnu.tar.gz +#RUN cp /opt/build/ripgrep-${RIPGREP_VERSION}-${ARCH}-unknown-linux-gnu/rg /usr/bin # rust -RUN curl -L https://static.rust-lang.org/dist/rust-${RUST_VERSION}-${ARCH}-unknown-linux-gnu.tar.xz -o /opt/build/rust-${RUST_VERSION}.tar.xz +RUN curl -L https://static.rust-lang.org/dist/rust-${RUST_VERSION}-${NEOARCH}-unknown-linux-gnu.tar.xz -o /opt/build/rust-${RUST_VERSION}.tar.xz RUN cd /opt/build; tar xvf rust-${RUST_VERSION}.tar.xz -RUN cd /opt/build/rust-${RUST_VERSION}-${ARCH}-unknown-linux-gnu; ./install.sh +RUN cd /opt/build/rust-${RUST_VERSION}-${NEOARCH}-unknown-linux-gnu; ./install.sh