From fc6eb118499d15a8afb056b4f4b9064655e078ec Mon Sep 17 00:00:00 2001 From: Ruakij Date: Wed, 23 Nov 2022 19:54:23 +0100 Subject: [PATCH 1/3] Change rust-image-tag for better multiarch-compatability --- tools/bandwhich/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bandwhich/Dockerfile b/tools/bandwhich/Dockerfile index 04a16f4..ddb99a6 100644 --- a/tools/bandwhich/Dockerfile +++ b/tools/bandwhich/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /app # ---- Build ---- -FROM rust:alpine AS build +FROM rust:1.65.0-slim AS build WORKDIR /build # Install packages RUN apk add --no-cache make libc-dev build-base From a5ef65e47f60fa7c12630f90569e38150a05a059 Mon Sep 17 00:00:00 2001 From: Ruakij Date: Wed, 23 Nov 2022 20:03:37 +0100 Subject: [PATCH 2/3] Switch script-header to bash --- scripts/build.sh | 2 +- scripts/utils/prepare.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 10ff367..0d363c9 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash scriptPath_file=$(dirname "${BASH_SOURCE[0]}") scriptPath_folder=$(realpath "${scriptPath_file}") diff --git a/scripts/utils/prepare.sh b/scripts/utils/prepare.sh index 417c069..5a618c6 100755 --- a/scripts/utils/prepare.sh +++ b/scripts/utils/prepare.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # --- VARIABLES --- # Load variables From 64113e95148f29485d2b5c49e6f687e4b09526b1 Mon Sep 17 00:00:00 2001 From: Ruakij Date: Wed, 23 Nov 2022 21:13:59 +0100 Subject: [PATCH 3/3] Fix using wrong packet-manager --- tools/bandwhich/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bandwhich/Dockerfile b/tools/bandwhich/Dockerfile index ddb99a6..4ff7cc8 100644 --- a/tools/bandwhich/Dockerfile +++ b/tools/bandwhich/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /app FROM rust:1.65.0-slim AS build WORKDIR /build # Install packages -RUN apk add --no-cache make libc-dev build-base +RUN apt update && apt install -y make # Copy sources ADD .build/repository/ . # Update dependencies and Compile