diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index d7e85cc..f5b70f5 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -16,7 +16,7 @@ jobs: matrix: include: - platform: linux - docker_image: gitea.staspast.click/stas/rust-node-builder:custom + docker_image: gitea.staspast.click/stas/rust-node-builder:v1 target: x86_64-unknown-linux-gnu artifact_name: rlogg-linux-x86_64 binary_extension: "" diff --git a/docker/build-linux-image.sh b/docker/build-linux-image.sh index a5c0c9b..45614d2 100755 --- a/docker/build-linux-image.sh +++ b/docker/build-linux-image.sh @@ -1 +1 @@ -docker build -t gitea.staspast.click/stas/rust-node-builder:custom -f linux-build.Dockerfile . && docker push gitea.staspast.click/stas/rust-node-builder:custom \ No newline at end of file +docker build -t gitea.staspast.click/stas/rust-node-builder:v1 -f linux-build.Dockerfile . && docker push gitea.staspast.click/stas/rust-node-builder:v1 \ No newline at end of file diff --git a/docker/linux-build.Dockerfile b/docker/linux-build.Dockerfile index 830b626..49c828a 100644 --- a/docker/linux-build.Dockerfile +++ b/docker/linux-build.Dockerfile @@ -1,10 +1,15 @@ FROM rust:latest +# Install GNU tar and ensure it's used instead of BusyBox tar RUN apt-get update && \ apt-get install -y --no-install-recommends \ nodejs \ npm \ tar \ gzip \ - && rm -rf /var/lib/apt/lists/* \ - && rm -f /bin/tar \ - && ln -s /usr/bin/tar /bin/tar \ No newline at end of file + && rm -rf /var/lib/apt/lists/* && \ + # Check if /bin/tar is BusyBox and replace it with GNU tar + if /bin/tar --version 2>&1 | grep -q "BusyBox"; then \ + cp /usr/bin/tar /bin/tar.gnu && \ + rm -f /bin/tar && \ + mv /bin/tar.gnu /bin/tar; \ + fi \ No newline at end of file