diff --git a/Dockerfile.alpine b/Dockerfile.alpine deleted file mode 100644 index 11351ac..0000000 --- a/Dockerfile.alpine +++ /dev/null @@ -1,26 +0,0 @@ -FROM ekidd/rust-musl-builder:1.57.0 AS builder - -WORKDIR /home/rust/src - -# Cache build deps -RUN USER=rust cargo init -COPY --chown=rust:rust Cargo.toml Cargo.lock ./ -RUN cargo build --locked --release && \ - rm src/*.rs - -COPY --chown=rust:rust ./src ./src -RUN USER=rust touch ./src/main.rs -# hadolint ignore=DL3059 -RUN cargo build --release - -FROM alpine:3 -# hadolint ignore=DL3018 -RUN apk --no-cache add ca-certificates -COPY --from=builder \ - /home/rust/src/target/x86_64-unknown-linux-musl/release/vaultwarden_ldap \ - /usr/local/bin/ - -COPY alpine_deprecation.sh /usr/local/bin/alpine_deprecation.sh -ENTRYPOINT ["/usr/local/bin/alpine_deprecation.sh"] - -CMD ["/usr/local/bin/vaultwarden_ldap"] diff --git a/Makefile b/Makefile index 4be376b..08725ba 100644 --- a/Makefile +++ b/Makefile @@ -85,12 +85,8 @@ clean: rm -f ./target .PHONY: docker-build-all -docker-build-all: docker-build docker-build-alpine +docker-build-all: docker-build .PHONY: docker-build docker-build: docker build -f ./Dockerfile -t $(DOCKER_TAG) . - -.PHONY: docker-build-alpine -docker-build-alpine: - docker build -f ./Dockerfile.alpine -t $(DOCKER_TAG):alpine . diff --git a/alpine_deprecation.sh b/alpine_deprecation.sh deleted file mode 100755 index cbb8844..0000000 --- a/alpine_deprecation.sh +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/sh - -echo "" -echo "################################################################################" -echo "WARNING: The Alpine images are deprecated and will not recieve continued updates" -echo "Please use the non-Alpine images for the latest updates and features" -echo "################################################################################" -echo "" - -exec "$@"