aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/docker
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2022-12-03 09:50:12 +0100
committerEgor Tensin <Egor.Tensin@gmail.com>2022-12-03 10:03:09 +0100
commit0dbd4c12488bd365a86e4726b2ae689b2da86a7c (patch)
treec1c543aca8916cd93ce23900ba9a8c1f48529fb0 /docker
parentv4.0.3 (diff)
downloadcgitize-0dbd4c12488bd365a86e4726b2ae689b2da86a7c.tar.gz
cgitize-0dbd4c12488bd365a86e4726b2ae689b2da86a7c.zip
frontend: fix /mnt/cgitize being inaccessible to nginx
I've had problems with doing "FROM nginx" instead of "FROM alpine" in the past, but hopefully fixing a version is enough to prevent them.
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/entrypoint.sh5
-rw-r--r--docker/frontend/Dockerfile4
-rw-r--r--docker/frontend/etc/nginx/conf.d/default.conf (renamed from docker/frontend/etc/nginx/http.d/default.conf)0
3 files changed, 7 insertions, 2 deletions
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 61ecd1e..4ca1304 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -14,6 +14,11 @@ secure_repo_dir() {
local dir
dir="$( /get_output_dir.py -- "$cfg_path" )"
chmod -- o-rwx "$dir"
+
+ # This is required so that nginx can access the directory.
+ # nginx uses a fixed UID:
+ # https://github.com/nginxinc/docker-nginx/blob/4785a604aa40e0b0a69047a61e28781a2b0c2069/mainline/alpine-slim/Dockerfile#L16
+ chown -- :101 "$dir"
}
schedule_to_cron() {
diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile
index 38e5382..7254115 100644
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17 AS base
+FROM nginx:1.23-alpine AS base
FROM base AS builder
@@ -22,7 +22,7 @@ RUN apk add --no-cache py3-pip && \
FROM base
-RUN apk add --no-cache cgit dash fcgiwrap nginx python3 spawn-fcgi tini && \
+RUN apk add --no-cache cgit dash fcgiwrap python3 spawn-fcgi tini && \
# Replace the theme with the one I like better:
grep -q -F -- "style='pastie'" /usr/lib/cgit/filters/syntax-highlighting.py && \
sed -i -e "s/style='pastie'/style='vs'/" -- /usr/lib/cgit/filters/syntax-highlighting.py
diff --git a/docker/frontend/etc/nginx/http.d/default.conf b/docker/frontend/etc/nginx/conf.d/default.conf
index dc27e85..dc27e85 100644
--- a/docker/frontend/etc/nginx/http.d/default.conf
+++ b/docker/frontend/etc/nginx/conf.d/default.conf