diff --git a/.github/workflows/container-image-buildah.yml b/.github/workflows/container-image-buildah.yml index ba7fb8a..e9e7567 100644 --- a/.github/workflows/container-image-buildah.yml +++ b/.github/workflows/container-image-buildah.yml @@ -52,7 +52,7 @@ jobs: - name: Sanitize Platforms id: platforms run: | - platforms="${{ inputs.platforms == '' && 'linux/amd64' || inputs.platforms }}" + platforms="${{ inputs.platforms == '' && 'linux/amd64,linux/arm64' || inputs.platforms }}" archs="$( sed -e 's#linux/##g' <<< $platforms )" echo "platforms=$platforms" >> $GITHUB_OUTPUT echo "archs=$archs" >> $GITHUB_OUTPUT diff --git a/Dockerfile b/Dockerfile index 63e2c23..2ad40f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,15 @@ # Build stage -FROM rust:1.72-alpine3.18 AS cargo-build +FROM rust:1.72.1-bookworm AS cargo-build -RUN apk add --no-cache musl-dev pkgconfig openssl-dev +RUN apt-get update +RUN apt-get install -y libgcc-12-dev libc6-dev pkg-config libssl-dev WORKDIR /src/websocat ENV RUSTFLAGS='-Ctarget-feature=-crt-static' COPY Cargo.toml Cargo.toml -ARG CARGO_OPTS="--features=workaround1,seqpacket,prometheus_peer,prometheus/process,crypto_peer" +# ARG CARGO_OPTS="--features=workaround1,seqpacket,prometheus_peer,prometheus/process,crypto_peer" +ARG CARGO_OPTS="--features=ssl,workaround1,seqpacket,unix_stdio,prometheus_peer,prometheus/process,crypto_peer" RUN mkdir src/ &&\ echo "fn main() {println!(\"if you see this, the build broke\")}" > src/main.rs && \ @@ -19,9 +21,12 @@ RUN cargo build --release $CARGO_OPTS && \ strip target/release/websocat # Final stage -FROM alpine:3.18 +FROM debian:bookworm -RUN apk add --no-cache libgcc +RUN apt-get update +RUN apt-get install -y libssl3 +RUN apt-get clean && \ + rm -rf /var/lib/apt/lists/* WORKDIR / COPY --from=cargo-build /src/websocat/target/release/websocat /usr/local/bin/