diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2022-10-16 00:55:57 +0200 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2022-10-16 01:19:20 +0200 |
| commit | 4f064f0aa21095b80fae9c10cb0631f7c467394d (patch) | |
| tree | 014e248b39a1dcb245712d71bcb2134d5f898332 | |
| parent | docker: upgrade base images (diff) | |
| download | cgitize-4f064f0aa21095b80fae9c10cb0631f7c467394d.tar.gz cgitize-4f064f0aa21095b80fae9c10cb0631f7c467394d.zip | |
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.
| -rw-r--r-- | docker/frontend/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/frontend/etc/nginx/http.d/default.conf (renamed from docker/frontend/etc/nginx/conf.d/default.conf) | 0 |
2 files changed, 2 insertions, 2 deletions
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/http.d/default.conf index dc27e85..dc27e85 100644 --- a/docker/frontend/etc/nginx/conf.d/default.conf +++ b/docker/frontend/etc/nginx/http.d/default.conf |