commit daf942d42a7be3ee431f3aae21c1b07fb27dd904
parent 853b8e1d7b9eeba21a21cdb835b89f0362c98ff9
Author: Andreas Gruhler <andreas.gruhler@adfinis.com>
Date: Thu, 29 Aug 2024 09:24:25 +0200
feat(stagit): header patch
Diffstat:
2 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/docker/docker-git/Dockerfile b/docker/docker-git/Dockerfile
@@ -15,13 +15,22 @@ COPY docker/favicon.png /opt/stagit/
COPY docker/logo.png /opt/stagit/
COPY docker/create.sh /opt/stagit/
COPY docker/example_post-receive.sh /opt/stagit/
+COPY docker/header-patch.diff /opt/stagit/
+
+# Patch header
+RUN git config --global user.email "docker@in0rdr.ch"
+RUN git config --global user.name "Docker build"
+RUN cd /opt/stagit && git am header-patch.diff
+
+# Build stagit
RUN cd /opt/stagit && make && make install
# Prepare git repo and stagit volumes
RUN mkdir -p /srv/git
+RUN mkdir -p /var/www/localhost/htdocs
+RUN chown -R apache: /var/www/localhost/htdocs/ /srv/git/
VOLUME /srv/git
VOLUME /var/www/localhost/htdocs
-RUN chown -R apache: /var/www/localhost/htdocs/ /srv/git/
EXPOSE 443/tcp
diff --git a/docker/docker-git/docker/header-patch.diff b/docker/docker-git/docker/header-patch.diff
@@ -0,0 +1,32 @@
+From 12edc8c6c72e06b6e92be0947b6c6a68b3708b8a Mon Sep 17 00:00:00 2001
+From: Andreas Gruhler <andreas.gruhler@adfinis.com>
+Date: Thu, 29 Aug 2024 09:22:24 +0200
+Subject: [PATCH] feat: add pr link
+
+---
+ stagit-index.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/stagit-index.c b/stagit-index.c
+index 6402296..4cf5cd3 100644
+--- a/stagit-index.c
++++ b/stagit-index.c
+@@ -13,6 +13,7 @@ static git_repository *repo;
+ static const char *relpath = "";
+
+ static char description[255] = "Repositories";
++static char prlink[255] = " | Pull-requests at https://pr.in0rdr.ch";
+ static char *name = "";
+ static char owner[255];
+
+@@ -107,6 +108,7 @@ writeheader(FILE *fp)
+ fprintf(fp, "<table>\n<tr><td><img src=\"%slogo.png\" alt=\"\" width=\"32\" height=\"32\" /></td>\n"
+ "<td><span class=\"desc\">", relpath);
+ xmlencode(fp, description, strlen(description));
++ xmlencode(fp, prlink, strlen(prlink));
+ fputs("</span></td></tr><tr><td></td><td>\n"
+ "</td></tr>\n</table>\n<hr/>\n<div id=\"content\">\n"
+ "<table id=\"index\"><thead>\n"
+--
+2.44.1
+