Use alpine only for ARM builds

Set correct Dockerfile for ARM builds
Revert ARM Dockerfile
2021-04-09 18:59:04 -07:00 · 2021-04-09 18:27:12 -07:00 · 2021-04-09 17:05:20 -07:00 · 2021-04-09 16:38:44 -07:00 · 2021-04-09 15:50:43 -07:00 · 2021-04-09 15:24:47 -07:00
7 changed files with 81 additions and 19 deletions
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@ -1,4 +1,4 @@
-name: Docker Multi-Architecture Build
+name: Docker ARM Build

 on:
  push:
@ -30,7 +30,7 @@ jobs:
        uses: docker/build-push-action@v2
        with:
          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
+          file: ./Dockerfile.arm64
+          platforms: linux/arm64
          push: true
          tags: spikecodes/libreddit:latest
--- a/Cargo.toml
+++ b/Cargo.toml
@ -3,7 +3,7 @@ name = "libreddit"
 description = " Alternative private front-end to Reddit"
 license = "AGPL-3.0"
 repository = "https://github.com/spikecodes/libreddit"
-version = "0.10.0"
+version = "0.10.1"
 authors = ["spikecodes <19519553+spikecodes@users.noreply.github.com>"]
 edition = "2018"

--- a/48
+++ b/48
@ -1,15 +1,43 @@
-FROM rust:alpine as builder
-WORKDIR /usr/src/libreddit
-COPY . .
-RUN apk add --no-cache g++
-RUN cargo install --path .
+####################################################################################################
+## Builder
+####################################################################################################
+FROM rust:latest AS builder

-FROM alpine:latest
-RUN apk add --no-cache curl
-COPY --from=builder /usr/local/cargo/bin/libreddit /usr/local/bin/libreddit
-RUN adduser --system --home /nonexistent --no-create-home --disabled-password libreddit
+RUN rustup target add x86_64-unknown-linux-musl
+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 /usr/src/libreddit
+
+COPY . .
+
+RUN cargo build --target x86_64-unknown-linux-musl --release
+
+####################################################################################################
+## Final image
+####################################################################################################
+FROM scratch
+
+# Import user information from builder.
+COPY --from=builder /etc/passwd /etc/passwd
+COPY --from=builder /etc/group /etc/group
+
+# Import ca-certificates from builder
+COPY --from=builder /usr/share/ca-certificates /usr/share/ca-certificates
+COPY --from=builder /etc/ssl/certs /etc/ssl/certs
+
+# Copy our build
+COPY --from=builder /usr/src/libreddit/target/x86_64-unknown-linux-musl/release/libreddit /usr/local/bin/libreddit
+
+# Use an unprivileged user.
 USER libreddit
+
+# Tell Docker to expose port 8080
 EXPOSE 8080
-HEALTHCHECK --interval=5m --timeout=3s CMD curl -f http://localhost:8080/settings || exit 1
+
+# 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

 CMD ["libreddit"]
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@ -0,0 +1,34 @@
+####################################################################################################
+## Builder
+####################################################################################################
+FROM rust:alpine AS builder
+
+RUN apk add --no-cache g++
+
+WORKDIR /usr/src/libreddit
+
+COPY . .
+
+RUN cargo install --path .
+
+####################################################################################################
+## Final image
+####################################################################################################
+FROM alpine:latest
+
+RUN apk add --no-cache curl
+
+# Copy our build
+COPY --from=builder /usr/local/cargo/bin/libreddit /usr/local/bin/libreddit
+
+# Use an unprivileged user.
+RUN adduser --home /nonexistent --no-create-home --disabled-password libreddit
+USER libreddit
+
+# Tell Docker to expose port 8080
+EXPOSE 8080
+
+# 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
+
+CMD ["libreddit"]
--- a/src/client.rs
+++ b/src/client.rs
@ -7,7 +7,7 @@ use std::{result::Result, str::FromStr};
 use crate::server::RequestExt;

 pub async fn proxy(req: Request<Body>, format: &str) -> Result<Response<Body>, String> {
-	let mut url = format.to_string();
+	let mut url = format!("{}?{}", format, req.uri().query().unwrap_or_default());

 	for (name, value) in req.params().iter() {
 		url = url.replace(&format!("{{{}}}", name), value);
--- a/src/main.rs
+++ b/src/main.rs
@ -164,7 +164,7 @@ async fn main() {
 	app.at("/img/:id").get(|r| proxy(r, "https://i.redd.it/{id}").boxed());
 	app.at("/thumb/:point/:id").get(|r| proxy(r, "https://{point}.thumbs.redditmedia.com/{id}").boxed());
 	app.at("/emoji/:id/:name").get(|r| proxy(r, "https://emoji.redditmedia.com/{id}/{name}").boxed());
-	app.at("/preview/:loc/:id/:query").get(|r| proxy(r, "https://{loc}view.redd.it/{id}?{query}").boxed());
+	app.at("/preview/:loc/:id").get(|r| proxy(r, "https://{loc}view.redd.it/{id}").boxed());
 	app.at("/style/*path").get(|r| proxy(r, "https://styles.redditmedia.com/{path}").boxed());
 	app.at("/static/*path").get(|r| proxy(r, "https://www.redditstatic.com/{path}").boxed());

--- a/src/utils.rs
+++ b/src/utils.rs
@ -431,8 +431,8 @@ pub fn format_url(url: &str) -> String {
 					"a.thumbs.redditmedia.com" => capture(r"https://a\.thumbs\.redditmedia\.com/(.*)", "/thumb/a/", 1),
 					"b.thumbs.redditmedia.com" => capture(r"https://b\.thumbs\.redditmedia\.com/(.*)", "/thumb/b/", 1),
 					"emoji.redditmedia.com" => capture(r"https://emoji\.redditmedia\.com/(.*)/(.*)", "/emoji/", 2),
-					"preview.redd.it" => capture(r"https://preview\.redd\.it/(.*)\?(.*)", "/preview/pre/", 2),
-					"external-preview.redd.it" => capture(r"https://external\-preview\.redd\.it/(.*)\?(.*)", "/preview/external-pre/", 2),
+					"preview.redd.it" => capture(r"https://preview\.redd\.it/(.*)", "/preview/pre/", 1),
+					"external-preview.redd.it" => capture(r"https://external\-preview\.redd\.it/(.*)", "/preview/external-pre/", 1),
 					"styles.redditmedia.com" => capture(r"https://styles\.redditmedia\.com/(.*)", "/style/", 1),
 					"www.redditstatic.com" => capture(r"https://www\.redditstatic\.com/(.*)", "/static/", 1),
 					_ => String::new(),
Author	SHA1	Message	Date
spikecodes	6ce82c36fb	Use alpine only for ARM builds	2021-04-09 18:59:04 -07:00
spikecodes	2974d92e30	Set correct Dockerfile for ARM builds	2021-04-09 18:27:12 -07:00
spikecodes	34dfcb2512	Revert ARM Dockerfile	2021-04-09 17:05:20 -07:00
spikecodes	6b42e97bda	Test rust:alpine in ARM Dockerfile	2021-04-09 16:38:44 -07:00
spikecodes	49bfe4d27c	Create dockerfile for arm64	2021-04-09 15:50:43 -07:00
spikecodes	c8965ae51b	Switch Docker base image to "scratch"	2021-04-09 15:24:47 -07:00
spikecodes	0b64a52a63	Switch Docker builds in GitHub Actions to only ARM	2021-04-09 15:07:07 -07:00
spikecodes	a18db1e2b7	Properly pass preview queries to media proxy	2021-04-08 22:26:03 -07:00