Re-add unprivileged user to Dockerfile

New alpine-based Dockerfile with healthcheck
Fix server.rs function name
2021-04-01 12:09:08 -07:00 · 2021-03-31 13:05:22 -07:00 · 2021-03-31 13:03:44 -07:00 · 2021-03-31 13:03:18 -07:00 · 2021-03-27 20:11:05 +00:00 · 2021-03-27 13:03:13 -07:00
6 changed files with 30 additions and 14 deletions
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@ -34,13 +34,18 @@ jobs:
          echo "::set-output name=version::$(cargo metadata --format-version 1 --no-deps | jq .packages[0].version -r | sed 's/^/v/')"
          echo "::set-output name=tag::${GITHUB_REF#refs/*/}"
          
+      - name: Calculate SHA512 checksum
+        run: sha512sum target/release/libreddit > libreddit.sha512
+        
      - name: Release
        uses: softprops/action-gh-release@v1
        with:
          tag_name: ${{ steps.version.outputs.version }}
          name: ${{ steps.version.outputs.version }} - NAME
          draft: true
-          files: target/release/libreddit
+          files: |
+            target/release/libreddit
+            libreddit.sha512
          body: |
            - CHANGES

--- 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.8.1"
+version = "0.8.4"
 authors = ["spikecodes <19519553+spikecodes@users.noreply.github.com>"]
 edition = "2018"

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

-
-FROM debian:buster-slim
-
-RUN apt-get update && apt-get install -y libcurl4 && rm -rf /var/lib/apt/lists/*
+FROM alpine:latest
+RUN apk add --no-cache curl
 COPY --from=builder /usr/local/cargo/bin/libreddit /usr/local/bin/libreddit
-RUN useradd --system --user-group --home-dir /nonexistent --no-create-home --shell /usr/sbin/nologin libreddit
+RUN adduser --system --home /nonexistent --no-create-home --disabled-password libreddit
 USER libreddit
-
 EXPOSE 8080
+HEALTHCHECK --interval=5m --timeout=3s CMD curl -f http://localhost:8080/settings || exit 1

 CMD ["libreddit"]
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -0,0 +1,13 @@
+version: "3.8"
+
+services:
+  web:
+    build: .
+    restart: always
+    container_name: "libreddit"
+    ports:
+      - 8080:8080
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/settings"]
+      interval: 5m
+      timeout: 3s
--- a/src/server.rs
+++ b/src/server.rs
@ -171,9 +171,9 @@ impl Server {
 							parammed.set_params(found.params().to_owned());

 							// Run the route's function
-							let yeet = (found.handler().to_owned().to_owned())(parammed);
+							let func = (found.handler().to_owned().to_owned())(parammed);
 							async move {
-								let res: Result<Response<Body>, String> = yeet.await;
+								let res: Result<Response<Body>, String> = func.await;
 								// Add default headers to response
 								res.map(|mut response| {
 									response.headers_mut().extend(headers);
--- a/src/settings.rs
+++ b/src/settings.rs
@ -50,7 +50,7 @@ pub async fn set(req: Request<Body>) -> Result<Response<Body>, String> {

 	let mut res = redirect("/settings".to_string());

-	let names = vec!["theme", "front_page", "layout", "wide", "comment_sort", "post_sort", "show_nsfw", "subscriptions"];
+	let names = vec!["theme", "front_page", "layout", "wide", "comment_sort", "post_sort", "show_nsfw"];

 	for name in names {
 		match form.get(name) {
Author	SHA1	Message	Date
spikecodes	c23d2dc50b	Re-add unprivileged user to Dockerfile	2021-04-01 12:09:08 -07:00
spikecodes	46dbd88d91	New alpine-based Dockerfile with healthcheck	2021-03-31 13:05:22 -07:00
spikecodes	f0f484288e	Fix server.rs function name	2021-03-31 13:03:44 -07:00
spikecodes	90d39b121f	Example docker-compose	2021-03-31 13:03:18 -07:00
Spike	44dee302c9	Publish SHA512 checksums for future releases	2021-03-27 20:11:05 +00:00
spikecodes	c7f9386c01	Fix #169	2021-03-27 13:03:13 -07:00