diff --git a/.woodpecker.yml b/.woodpecker.yml index 1a96c2c66..d25f41015 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -147,6 +147,11 @@ steps: - cargo clippy --workspace --tests --all-targets -- -D warnings when: *slow_check_paths + docker_check: + image: docker/dockerfile:1.11 + commands: + - docker build --check . -f docker/Dockerfile + cargo_build: image: *rust_image environment: diff --git a/docker/Dockerfile b/docker/Dockerfile index 9701b4ad6..ffb13d86b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,6 @@ -# syntax=docker/dockerfile:1.10 -ARG RUST_VERSION=1.81 +# syntax=docker/dockerfile:1.9 +# check=skip=FromPlatformFlagConstDisallowed +ARG RUST_VERSION=1.80 ARG CARGO_BUILD_FEATURES=default ARG RUST_RELEASE_MODE=debug @@ -38,12 +39,6 @@ RUN --mount=type=cache,target=/lemmy/target set -ex; \ cargo clean --release; \ cargo build --features "${CARGO_BUILD_FEATURES}" --release; \ mv target/"${RUST_RELEASE_MODE}"/lemmy_server ./lemmy_server; \ - # - # Compress the binary with upx - wget https://github.com/upx/upx/releases/download/v4.2.4/upx-4.2.4-amd64_linux.tar.xz; \ - tar -xvf upx-4.2.4-amd64_linux.tar.xz; \ - cp upx-4.2.4-amd64_linux/upx /usr/bin; \ - upx --best --lzma lemmy_server; \ fi # ARM64 builder @@ -77,14 +72,9 @@ RUN --mount=type=cache,target=./target,uid=10001,gid=10001 set -ex; \ cargo clean --release; \ cargo build --features "${CARGO_BUILD_FEATURES}" --release; \ mv "./target/$CARGO_BUILD_TARGET/$RUST_RELEASE_MODE/lemmy_server" /home/lemmy/lemmy_server; \ - # - # Compress the binary with upx - wget https://github.com/upx/upx/releases/download/v4.2.4/upx-4.2.4-arm64_linux.tar.xz; \ - tar -xvf upx-4.2.4-arm64_linux.tar.xz; \ - cp upx-4.2.4-arm64_linux/upx /usr/bin; \ - upx --best --lzma /home/lemmy/lemmy_server; \ fi + # amd64 base runner FROM ${AMD_RUNNER_IMAGE} AS runner-linux-amd64