lasers
/
libreddit
mirror of https://github.com/spikecodes/libreddit
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Dockerfile healthchecks

This commit is contained in:
spikecodes 2021-04-09 22:38:13 -07:00
parent 6ce82c36fb
commit 93ed1c6f0c
No known key found for this signature in database
GPG Key ID: 004CECFF9B463BCB
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Dockerfile
View File

@ -1,15 +1,11 @@
#################################################################################################### ####################################################################################################
## Builder ## Builder
#################################################################################################### ####################################################################################################
FROM rust:latest AS builder FROM rust:alpine AS builder
RUN rustup target add x86_64-unknown-linux-musl RUN apk add --no-cache musl-dev
RUN apt update && apt install -y musl-tools musl-dev
RUN update-ca-certificates
RUN adduser --home /nonexistent --no-create-home --disabled-password libreddit WORKDIR /libreddit
WORKDIR /usr/src/libreddit
COPY . . COPY . .
@ -18,26 +14,23 @@ RUN cargo build --target x86_64-unknown-linux-musl --release
#################################################################################################### ####################################################################################################
## Final image ## Final image
#################################################################################################### ####################################################################################################
FROM scratch FROM alpine:latest
# Import user information from builder.
COPY --from=builder /etc/passwd /etc/passwd
COPY --from=builder /etc/group /etc/group
# Import ca-certificates from builder # Import ca-certificates from builder
COPY --from=builder /usr/share/ca-certificates /usr/share/ca-certificates COPY --from=builder /usr/share/ca-certificates /usr/share/ca-certificates
COPY --from=builder /etc/ssl/certs /etc/ssl/certs COPY --from=builder /etc/ssl/certs /etc/ssl/certs
# Copy our build # Copy our build
COPY --from=builder /usr/src/libreddit/target/x86_64-unknown-linux-musl/release/libreddit /usr/local/bin/libreddit COPY --from=builder /libreddit/target/x86_64-unknown-linux-musl/release/libreddit /usr/local/bin/libreddit
# Use an unprivileged user. # Use an unprivileged user.
RUN adduser --home /nonexistent --no-create-home --disabled-password libreddit
USER libreddit USER libreddit
# Tell Docker to expose port 8080 # Tell Docker to expose port 8080
EXPOSE 8080 EXPOSE 8080
# Run a healthcheck every minute to make sure Libreddit is functional # Run a healthcheck every minute to make sure Libreddit is functional
HEALTHCHECK --interval=1m --timeout=3s CMD curl -f http://localhost:8080/settings || exit 1 HEALTHCHECK --interval=1m --timeout=3s CMD wget --spider --q http://localhost:8080/settings || exit 1
CMD ["libreddit"] CMD ["libreddit"]

4
Dockerfile.arm64
View File

@ -16,8 +16,6 @@ RUN cargo install --path .
#################################################################################################### ####################################################################################################
FROM alpine:latest FROM alpine:latest
RUN apk add --no-cache curl
# Copy our build # Copy our build
COPY --from=builder /usr/local/cargo/bin/libreddit /usr/local/bin/libreddit COPY --from=builder /usr/local/cargo/bin/libreddit /usr/local/bin/libreddit
@ -29,6 +27,6 @@ USER libreddit
EXPOSE 8080 EXPOSE 8080
# Run a healthcheck every minute to make sure Libreddit is functional # Run a healthcheck every minute to make sure Libreddit is functional
HEALTHCHECK --interval=1m --timeout=3s CMD curl -f http://localhost:8080/settings || exit 1 HEALTHCHECK --interval=1m --timeout=3s CMD wget --spider --q http://localhost:8080/settings || exit 1
CMD ["libreddit"] CMD ["libreddit"]