Docker updates

Author: mmastrac

.dockerignore

@@ -1,5 +1 @@
 *
-!target/aarch64-unknown-linux-musl/release/stylus
-!target/arm-unknown-linux-musleabi/release/stylus
-!target/arm-unknown-linux-musleabihf/release/stylus
-!target/x86_64-unknown-linux-musl/release/stylus

build.sh

@@ -1,15 +1,31 @@
 #!/bin/bash
 set -xeuf -o pipefail
-cargo clean
-cargo install cross
-cross build --release --target arm-unknown-linux-musleabi
-cross build --release --target arm-unknown-linux-musleabihf
-cross build --release --target aarch64-unknown-linux-musl
-cross build --release --target x86_64-unknown-linux-musl
-
-docker build --no-cache --platform linux/arm/v6 --build-arg BUILDPLATFORM=arm32v6 --build-arg RUSTPLATFORM=arm-unknown-linux-musleabi -t mmastrac/stylus:latest-arm -f docker/Dockerfile .
-docker build --no-cache --platform linux/arm64 --build-arg BUILDPLATFORM=arm64v8 --build-arg RUSTPLATFORM=aarch64-unknown-linux-musl -t mmastrac/stylus:latest-arm64 -f docker/Dockerfile .
-docker build --no-cache --platform linux/amd64 --build-arg BUILDPLATFORM=amd64 --build-arg RUSTPLATFORM=x86_64-unknown-linux-musl -t mmastrac/stylus:latest-x86_64 -f docker/Dockerfile .
+if [ "$#" != "1" ]; then
+    echo "Usage: $0 <version>"
+    exit 1
+fi
+
+VERSION="$1"
+echo "Building Docker container for $VERSION..."
+
+docker build --no-cache --platform linux/arm/v6 \
+    --build-arg VERSION=$VERSION \
+    --build-arg BINARYPLATFORM=linux_arm \
+    --build-arg BUILDPLATFORM=arm32v6 \
+    --build-arg RUSTPLATFORM=arm-unknown-linux-musleabi \
+    -t mmastrac/stylus:latest-arm -f docker/Dockerfile .
+docker build --no-cache --platform linux/arm64 \
+    --build-arg VERSION=$VERSION \
+    --build-arg BINARYPLATFORM=linux_arm64 \
+    --build-arg BUILDPLATFORM=arm64v8 \
+    --build-arg RUSTPLATFORM=aarch64-unknown-linux-musl \
+    -t mmastrac/stylus:latest-arm64 -f docker/Dockerfile .
+docker build --no-cache --platform linux/amd64 \
+    --build-arg VERSION=$VERSION \
+    --build-arg BINARYPLATFORM=linux_amd64 \
+    --build-arg BUILDPLATFORM=amd64 \
+    --build-arg RUSTPLATFORM=x86_64-unknown-linux-musl \
+    -t mmastrac/stylus:latest-x86_64 -f docker/Dockerfile .
 
 docker push mmastrac/stylus:latest-arm
 docker push mmastrac/stylus:latest-arm64
@@ -28,8 +44,6 @@ docker manifest annotate --os linux --arch amd64 mmastrac/stylus:latest mmastrac
 
 docker manifest push mmastrac/stylus:latest
 
-VERSION=`cargo run -- --version | cut -d' ' -f2`
-
 rm -rf ~/.docker/manifests/docker.io_mmastrac_stylus-$VERSION
 docker manifest create mmastrac/stylus:$VERSION \
     mmastrac/stylus:latest-arm \

docker/Dockerfile

@@ -1,11 +1,24 @@
 ARG BUILDPLATFORM
 FROM ${BUILDPLATFORM}/alpine:latest
+ARG VERSION
 ARG RUSTPLATFORM
+ARG BINARYPLATFORM
+ARG PUPVERSION=0.4.0
 VOLUME /srv
 EXPOSE 8000/tcp
-# Our useful set of tools
+
+# Our useful set of tools from the Alpine repository
 RUN apk update && apk upgrade && apk add jq curl netcat-openbsd bash openssh-client net-snmp-tools tini
-COPY target/${RUSTPLATFORM}/release/stylus /usr/local/bin/stylus
+
+# Install pup via curl
+RUN curl -fL https://github.com/ericchiang/pup/releases/download/v${PUPVERSION}/pup_v${PUPVERSION}_${BINARYPLATFORM}.zip \
+    | unzip -p - > /usr/local/bin/pup \
+    && chmod a+x /usr/local/bin/pup
+
+# Install stylus via curl
+RUN curl -fL https://github.com/mmastrac/stylus/releases/download/${VERSION}/stylus_${BINARYPLATFORM} > /usr/local/bin/stylus \
+    && chmod a+x /usr/local/bin/stylus
+
 ENV FORCE_CONTAINER_LISTEN_ADDR=0.0.0.0 FORCE_CONTAINER_PATH=/srv/config.yaml FORCE_CONTAINER_PORT=8000
 CMD []