diff options
Diffstat (limited to 'docker/armv6')
| -rw-r--r-- | docker/armv6/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/armv6/Dockerfile.alpine | 4 | ||||
| -rw-r--r-- | docker/armv6/Dockerfile.buildkit | 10 | ||||
| -rw-r--r-- | docker/armv6/Dockerfile.buildkit.alpine | 9 |
4 files changed, 4 insertions, 24 deletions
diff --git a/docker/armv6/Dockerfile b/docker/armv6/Dockerfile index 4a64b70f..d8643de7 100644 --- a/docker/armv6/Dockerfile +++ b/docker/armv6/Dockerfile @@ -2,7 +2,6 @@ # This file was generated using a Jinja2 template. # Please make your changes in `Dockerfile.j2` and then `make` the individual Dockerfiles. - # Using multistage build: # https://docs.docker.com/develop/develop-images/multistage-build/ # https://whitfin.io/speeding-up-rust-docker-builds/ @@ -27,7 +26,7 @@ FROM vaultwarden/web-vault@sha256:aa6ba791911a815ea570ec2ddc59992481c6ba8fbb65eed4f7074b463430d3ee as vault ########################## BUILD IMAGE ########################## -FROM rust:1.68.1-bullseye as build +FROM rust:1.68.2-bullseye as build # Build time options to avoid dpkg warnings and help with reproducible builds. ENV DEBIAN_FRONTEND=noninteractive \ @@ -48,7 +47,6 @@ RUN dpkg --add-architecture armel \ --no-install-recommends \ gcc-arm-linux-gnueabi \ libc6-dev:armel \ - libcap2-bin \ libmariadb-dev:armel \ libmariadb-dev-compat:armel \ libmariadb3:armel \ @@ -98,7 +96,6 @@ RUN touch src/main.rs # your actual source files being built RUN cargo build --features ${DB} --release --target=arm-unknown-linux-gnueabi - ######################## RUNTIME IMAGE ######################## # Create a new stage with a minimal image # because we already have a binary built diff --git a/docker/armv6/Dockerfile.alpine b/docker/armv6/Dockerfile.alpine index 285186ce..d896dce3 100644 --- a/docker/armv6/Dockerfile.alpine +++ b/docker/armv6/Dockerfile.alpine @@ -2,7 +2,6 @@ # This file was generated using a Jinja2 template. # Please make your changes in `Dockerfile.j2` and then `make` the individual Dockerfiles. - # Using multistage build: # https://docs.docker.com/develop/develop-images/multistage-build/ # https://whitfin.io/speeding-up-rust-docker-builds/ @@ -27,7 +26,7 @@ FROM vaultwarden/web-vault@sha256:aa6ba791911a815ea570ec2ddc59992481c6ba8fbb65eed4f7074b463430d3ee as vault ########################## BUILD IMAGE ########################## -FROM blackdex/rust-musl:arm-musleabi-stable-1.68.1 as build +FROM blackdex/rust-musl:arm-musleabi-stable-1.68.2 as build # Build time options to avoid dpkg warnings and help with reproducible builds. ENV DEBIAN_FRONTEND=noninteractive \ @@ -76,7 +75,6 @@ RUN touch src/main.rs # your actual source files being built RUN cargo build --features ${DB} --release --target=arm-unknown-linux-musleabi - ######################## RUNTIME IMAGE ######################## # Create a new stage with a minimal image # because we already have a binary built diff --git a/docker/armv6/Dockerfile.buildkit b/docker/armv6/Dockerfile.buildkit index fc167477..784ea895 100644 --- a/docker/armv6/Dockerfile.buildkit +++ b/docker/armv6/Dockerfile.buildkit @@ -2,7 +2,6 @@ # This file was generated using a Jinja2 template. # Please make your changes in `Dockerfile.j2` and then `make` the individual Dockerfiles. - # Using multistage build: # https://docs.docker.com/develop/develop-images/multistage-build/ # https://whitfin.io/speeding-up-rust-docker-builds/ @@ -27,7 +26,7 @@ FROM vaultwarden/web-vault@sha256:aa6ba791911a815ea570ec2ddc59992481c6ba8fbb65eed4f7074b463430d3ee as vault ########################## BUILD IMAGE ########################## -FROM rust:1.68.1-bullseye as build +FROM rust:1.68.2-bullseye as build # Build time options to avoid dpkg warnings and help with reproducible builds. ENV DEBIAN_FRONTEND=noninteractive \ @@ -48,7 +47,6 @@ RUN dpkg --add-architecture armel \ --no-install-recommends \ gcc-arm-linux-gnueabi \ libc6-dev:armel \ - libcap2-bin \ libmariadb-dev:armel \ libmariadb-dev-compat:armel \ libmariadb3:armel \ @@ -98,12 +96,6 @@ RUN touch src/main.rs # your actual source files being built RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry cargo build --features ${DB} --release --target=arm-unknown-linux-gnueabi -# Add the `cap_net_bind_service` capability to allow listening on -# privileged (< 1024) ports even when running as a non-root user. -# This is only done if building with BuildKit; with the legacy -# builder, the `COPY` instruction doesn't carry over capabilities. -RUN setcap cap_net_bind_service=+ep target/arm-unknown-linux-gnueabi/release/vaultwarden - ######################## RUNTIME IMAGE ######################## # Create a new stage with a minimal image # because we already have a binary built diff --git a/docker/armv6/Dockerfile.buildkit.alpine b/docker/armv6/Dockerfile.buildkit.alpine index 161d8828..e2f75b7e 100644 --- a/docker/armv6/Dockerfile.buildkit.alpine +++ b/docker/armv6/Dockerfile.buildkit.alpine @@ -2,7 +2,6 @@ # This file was generated using a Jinja2 template. # Please make your changes in `Dockerfile.j2` and then `make` the individual Dockerfiles. - # Using multistage build: # https://docs.docker.com/develop/develop-images/multistage-build/ # https://whitfin.io/speeding-up-rust-docker-builds/ @@ -27,7 +26,7 @@ FROM vaultwarden/web-vault@sha256:aa6ba791911a815ea570ec2ddc59992481c6ba8fbb65eed4f7074b463430d3ee as vault ########################## BUILD IMAGE ########################## -FROM blackdex/rust-musl:arm-musleabi-stable-1.68.1 as build +FROM blackdex/rust-musl:arm-musleabi-stable-1.68.2 as build # Build time options to avoid dpkg warnings and help with reproducible builds. ENV DEBIAN_FRONTEND=noninteractive \ @@ -76,12 +75,6 @@ RUN touch src/main.rs # your actual source files being built RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry cargo build --features ${DB} --release --target=arm-unknown-linux-musleabi -# Add the `cap_net_bind_service` capability to allow listening on -# privileged (< 1024) ports even when running as a non-root user. -# This is only done if building with BuildKit; with the legacy -# builder, the `COPY` instruction doesn't carry over capabilities. -RUN setcap cap_net_bind_service=+ep target/arm-unknown-linux-musleabi/release/vaultwarden - ######################## RUNTIME IMAGE ######################## # Create a new stage with a minimal image # because we already have a binary built |