From ba8820fde82abf9953a9b16868afa7ff3f987ffd Mon Sep 17 00:00:00 2001 From: Emil Lindfors Date: Tue, 25 Feb 2025 20:39:51 +0100 Subject: [PATCH] Fix Docker build issues on Windows and non-ARM architectures --- .devcontainer/Dockerfile | 7 ++++--- .gitattributes | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 .gitattributes diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 132946e42..5c1b5d1e3 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -42,9 +42,10 @@ RUN mkdir -p /workspace /home/node/.claude && \ WORKDIR /workspace -RUN wget https://github.com/dandavison/delta/releases/download/0.18.2/git-delta_0.18.2_arm64.deb && \ - sudo dpkg -i git-delta_0.18.2_arm64.deb && \ - rm git-delta_0.18.2_arm64.deb +RUN ARCH=$(dpkg --print-architecture) && \ + wget "https://github.com/dandavison/delta/releases/download/0.18.2/git-delta_0.18.2_${ARCH}.deb" && \ + sudo dpkg -i "git-delta_0.18.2_${ARCH}.deb" && \ + rm "git-delta_0.18.2_${ARCH}.deb" # Set up non-root user USER node diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..819e86aa3 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +* text=auto eol=lf +*.sh text eol=lf \ No newline at end of file