diff options
| author | onelin <oscar@nelin.dk> | 2026-07-19 21:48:45 +0000 |
|---|---|---|
| committer | onelin <oscar@nelin.dk> | 2026-07-19 21:48:45 +0000 |
| commit | d365839954c5e25f57751720fbb24602e996d015 (patch) | |
| tree | 0d9b287e12beee95aba90a67b9bdbd53d6a87a49 | |
| parent | 3bc7ee6bafea2443e7f4aba8cfd94a5c7dadabe6 (diff) | |
| -rw-r--r-- | gitolite/Dockerfile | 2 | ||||
| -rw-r--r-- | gitolite/cgit/Dockerfile | 50 | ||||
| -rw-r--r-- | gitolite/cgit/cgitrc | 2 | ||||
| -rw-r--r-- | gitolite/cgit/include.html | 3 |
4 files changed, 6 insertions, 51 deletions
diff --git a/gitolite/Dockerfile b/gitolite/Dockerfile index cdb1c7a..4e6e5a9 100644 --- a/gitolite/Dockerfile +++ b/gitolite/Dockerfile @@ -49,6 +49,8 @@ RUN sed "s/\$DOMAIN/$DOMAIN/g" /nginx.conf > /etc/nginx/http.d/default.conf \ RUN addgroup nginx www-data +RUN mkdir -p /usr/share/cgit/ +COPY cgit/include.html /usr/share/cgit/include.html COPY cgit/about.html /var/www/htdocs/cgit/ COPY cgit/cgit.png /var/www/htdocs/cgit/logo.png COPY cgit/favicon.ico /var/www/htdocs/cgit/ diff --git a/gitolite/cgit/Dockerfile b/gitolite/cgit/Dockerfile deleted file mode 100644 index 0c41144..0000000 --- a/gitolite/cgit/Dockerfile +++ /dev/null @@ -1,50 +0,0 @@ -FROM nginx:1.29.7-alpine-slim AS build - -RUN set -x \ - && apk add --no-cache gcc make curl linux-headers musl-dev zlib-dev libressl-dev libintl musl-libintl - -RUN wget 'https://git.zx2c4.com/cgit/snapshot/cgit-1.3.tar.xz' \ - && tar -xvf cgit-1.3.tar.xz - -WORKDIR /cgit-1.3 -RUN make get-git \ - && DESTDIR=pkg NO_REGEX=NeedsStartEnd make install - -WORKDIR /cgit-1.3/pkg -RUN tar -czvf cgit-1.3.tar.gz . - - -FROM nginx:1.29.7-alpine-slim -COPY --from=build /cgit-1.3/pkg/cgit-1.3.tar.gz /cgit-1.3.tar.gz - -ARG DOMAIN=localhost - -RUN set -x \ - && apk add --no-cache fcgiwrap py3-pygments \ - && tar -xvf /cgit-1.3.tar.gz - -RUN apk update && apk update - -COPY 40-fcgiwrap.sh /docker-entrypoint.d/ -RUN chmod +x /docker-entrypoint.d/40-fcgiwrap.sh - -COPY cgitrc /etc/ - -COPY nginx.conf / -RUN sed "s/\$DOMAIN/$DOMAIN/g" /nginx.conf > /etc/nginx/conf.d/default.conf -RUN rm /nginx.conf - -RUN addgroup nginx www-data - -COPY about.html /var/www/htdocs/cgit/ -COPY cgit.png /var/www/htdocs/cgit/logo.png -COPY favicon.ico /var/www/htdocs/cgit/ - -COPY css_variable_colors.sh / -COPY everforest.css /var/www/htdocs/cgit/ -RUN sh css_variable_colors.sh - -#RUN sed -i -Ee 's/pid\s+.*;/pid \/tmp\/nginx.pid;/' /etc/nginx/nginx.conf -#RUN sed -i -Ee 's/error_log\s+.*;/error_log \/dev\/stdout;/' /etc/nginx/nginx.conf -# -#USER nginx diff --git a/gitolite/cgit/cgitrc b/gitolite/cgit/cgitrc index e399f79..8c952e2 100644 --- a/gitolite/cgit/cgitrc +++ b/gitolite/cgit/cgitrc @@ -6,7 +6,7 @@ enable-http-clone=1 virtual-root=/ # Extra <head> -head-include=/usr/lib/cgit/include.html +head-include=/usr/share/cgit/include.html # Enable us "ignoring" specific repositories enable-git-config=1 diff --git a/gitolite/cgit/include.html b/gitolite/cgit/include.html new file mode 100644 index 0000000..14ba5dd --- /dev/null +++ b/gitolite/cgit/include.html @@ -0,0 +1,3 @@ +<meta charset="utf-8"> +<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> +<meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src *"> |