From 4f064f0aa21095b80fae9c10cb0631f7c467394d Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sun, 16 Oct 2022 00:55:57 +0200 Subject: frontend: use normal Alpine image instead of nginx I've had a problem with the nginx:1-alpine image switching Alpine versions, so I'm fixing the version at least. --- docker/frontend/Dockerfile | 4 ++-- docker/frontend/etc/nginx/conf.d/default.conf | 20 -------------------- docker/frontend/etc/nginx/http.d/default.conf | 20 ++++++++++++++++++++ 3 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 docker/frontend/etc/nginx/conf.d/default.conf create mode 100644 docker/frontend/etc/nginx/http.d/default.conf (limited to 'docker') diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index 528ace2..ef76fc6 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1-alpine AS base +FROM alpine:3.16 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 python3 spawn-fcgi tini && \ +RUN apk add --no-cache cgit dash fcgiwrap nginx 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/conf.d/default.conf b/docker/frontend/etc/nginx/conf.d/default.conf deleted file mode 100644 index dc27e85..0000000 --- a/docker/frontend/etc/nginx/conf.d/default.conf +++ /dev/null @@ -1,20 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - server_name _; - - location / { - include fastcgi_params; - fastcgi_pass unix:/run/fcgiwrap.sock; - - fastcgi_param SCRIPT_FILENAME /usr/share/webapps/cgit/cgit.cgi; - - # This looks stupid. Can I substitute any variable for $fastcgi_path_info? - fastcgi_split_path_info ^(/?)(.+)$; - fastcgi_param PATH_INFO $fastcgi_path_info; - } - - location /cgit/ { - alias /usr/share/webapps/cgit/; - } -} diff --git a/docker/frontend/etc/nginx/http.d/default.conf b/docker/frontend/etc/nginx/http.d/default.conf new file mode 100644 index 0000000..dc27e85 --- /dev/null +++ b/docker/frontend/etc/nginx/http.d/default.conf @@ -0,0 +1,20 @@ +server { + listen 80 default_server; + listen [::]:80 default_server; + server_name _; + + location / { + include fastcgi_params; + fastcgi_pass unix:/run/fcgiwrap.sock; + + fastcgi_param SCRIPT_FILENAME /usr/share/webapps/cgit/cgit.cgi; + + # This looks stupid. Can I substitute any variable for $fastcgi_path_info? + fastcgi_split_path_info ^(/?)(.+)$; + fastcgi_param PATH_INFO $fastcgi_path_info; + } + + location /cgit/ { + alias /usr/share/webapps/cgit/; + } +} -- cgit v1.2.3