Compare commits

..

2 Commits

Author SHA1 Message Date
992257a8b1 indent fuck brain not working 2024-04-04 23:01:12 +13:00
d49d32fbc6 embed images 2024-04-04 22:59:20 +13:00
3 changed files with 7 additions and 38 deletions

View File

@ -1,28 +1,16 @@
FROM rust:1.77.1-buster AS builder
WORKDIR /app
COPY ./ ./
RUN cargo build --release
FROM debian:stable
FROM alpine:3.19
ARG TARGET
RUN apt-get update
RUN apt-get install -y ca-certificates wget
RUN apk add --no-cache curl
RUN apt-get clean -y; \
rm -rf /var/lib/apt/lists/* /var/cache/apt/*
COPY --from=builder /app/target/release/ /usr/local/bin
RUN curl -L https://github.com/redlib-org/redlib/releases/latest/download/redlib-${TARGET}.tar.gz | \
tar xz -C /usr/local/bin/
RUN adduser --home /nonexistent --no-create-home --disabled-password redlib
USER redlib
# Tell Docker to expose port 808
# Tell Docker to expose port 8080
EXPOSE 8080
# Run a healthcheck every minute to make sure redlib is functional

View File

@ -1,20 +0,0 @@
FROM alpine:3.19
ARG TARGET
RUN apk add --no-cache curl
RUN curl -L https://github.com/redlib-org/redlib/releases/latest/download/redlib-${TARGET}.tar.gz | \
tar xz -C /usr/local/bin/
RUN adduser --home /nonexistent --no-create-home --disabled-password redlib
USER redlib
# Tell Docker to expose port 8080
EXPOSE 8080
# Run a healthcheck every minute to make sure redlib is functional
HEALTHCHECK --interval=1m --timeout=3s CMD wget --spider --q http://localhost:8080/settings || exit 1
CMD ["redlib"]

View File

@ -883,7 +883,8 @@ pub fn rewrite_urls(input_text: &str) -> String {
let text1 =
// Rewrite Reddit links to Redlib
REDDIT_REGEX.replace_all(input_text, r#"href="/"#)
.to_string();
.to_string()
.replace("a href=\"https://preview.redd.it", "img src=\"https://preview.redd.it");
let text1 = REDDIT_EMOJI_REGEX
.replace_all(&text1, format_url(REDDIT_EMOJI_REGEX.find(&text1).map(|x| x.as_str()).unwrap_or_default()))
.to_string()