diff --git a/.gitignore b/.gitignore index 4a1e2dc..fe55e49 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,9 @@ +# Docker docker/build docker/cache + +# OS +.DS_Store + +# App +.*.swp \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index cf53612..2e58104 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,11 @@ -FROM ubuntu:rolling AS deps -RUN export DEBIAN_FRONTEND=noninteractive \ - && apt-get update \ - && apt-get upgrade -y \ - && apt-get install -y fio \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* +# Use an official base image +FROM alpine:latest AS deps +RUN apk update && \ + apk upgrade && \ + apk add --no-cache bash fio linux-firmware-none lsblk FROM deps -COPY diskmark.sh /usr/bin/diskmark +COPY diskmark.sh /usr/local/bin/diskmark VOLUME /disk WORKDIR /disk ENV TARGET="/disk" diff --git a/diskmark.sh b/diskmark.sh index 3f63448..b147646 100755 --- a/diskmark.sh +++ b/diskmark.sh @@ -317,7 +317,7 @@ if [ $WARMUP -eq 1 ]; then else FILESOURCE=/dev/urandom fi - dd if="$FILESOURCE" of="$TARGET/.diskmark.tmp" bs="$BYTESIZE" count=1 oflag=direct + dd if="$FILESOURCE" of="$TARGET/.diskmark.tmp" bs="$BYTESIZE" count=1 oflag=direct iflag=fullblock fi for ((i = 0; i < ${#NAME[@]}; i++)); do