diff options
Diffstat (limited to 'src/cgit')
| -rw-r--r-- | src/cgit/Dockerfile | 4 | ||||
| -rw-r--r-- | src/cgit/VERSION | 2 | ||||
| -rwxr-xr-x | src/cgit/bin/entrypoint.sh | 11 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/cgit/Dockerfile b/src/cgit/Dockerfile index 45b5521..9c3b8e5 100644 --- a/src/cgit/Dockerfile +++ b/src/cgit/Dockerfile @@ -2,7 +2,9 @@ FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.2 SHELL ["/bin/bash", "-c"] RUN APT_OPTS="--no-install-recommends --install-suggests --yes" install_deb cgit uwsgi nginx-light \ && mkdir -p /run/uwsgi \ - && chown www-data:www-data /run/uwsgi + && chown www-data:www-data /run/uwsgi \ + && addgroup --gid 998 git \ + && usermod -a -G git www-data COPY etc/uwsgi/cgit.ini /etc/uwsgi/cgit.ini COPY bin/entrypoint.sh /usr/bin/entrypoint.sh ENTRYPOINT ["/usr/bin/entrypoint.sh"] diff --git a/src/cgit/VERSION b/src/cgit/VERSION index a00f35a..45c7a58 100644 --- a/src/cgit/VERSION +++ b/src/cgit/VERSION @@ -1 +1 @@ -v0.0.1-alpha +v0.0.1 diff --git a/src/cgit/bin/entrypoint.sh b/src/cgit/bin/entrypoint.sh index bdd6edc..a402e55 100755 --- a/src/cgit/bin/entrypoint.sh +++ b/src/cgit/bin/entrypoint.sh @@ -13,6 +13,9 @@ server { expires 30d; } location / { + try_files \$uri @cgit; + } + location @cgit { gzip off; include uwsgi_params; uwsgi_modifier1 9; @@ -38,8 +41,10 @@ enable-commit-graph=1 enable-log-filecount=1 enable-log-linecount=1 -css=cgit.css -logo=cgit.png +css=/cgit.css +logo=/cgit.png +virtual-root=/ +robots=nofollow project-list=/var/lib/git/projects.list @@ -47,5 +52,5 @@ scan-path=/var/lib/git/repositories EOF -uwsgi --daemonize true --ini /etc/uwsgi/cgit.ini > /dev/stdout 2> /dev/stderr < /dev/null & +uwsgi --daemonize --ini /etc/uwsgi/cgit.ini > /dev/stdout 2> /dev/stderr < /dev/null & nginx -c /etc/nginx/nginx.conf -g "daemon off;" |