Change in docker-playground[master]: cgit: Don't depend on unmaintained upstream; work directly with debian

[laforge]

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/20416 )


Change subject: cgit: Don't depend on unmaintained upstream; work directly with debian
......................................................................

cgit: Don't depend on unmaintained upstream; work directly with debian

Change-Id: Ifa98f77c24298265e39313b679944d649e25ddde
---
M cgit/Dockerfile
A cgit/config/apache.conf
A cgit/config/cgitrc
3 files changed, 80 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/16/20416/1

diff --git a/cgit/Dockerfile b/cgit/Dockerfile
index 4cf494a..084614e 100644
--- a/cgit/Dockerfile
+++ b/cgit/Dockerfile
@@ -1,4 +1,27 @@
-FROM	ankitrgadiya/cgit:debian-nginx
+# from https://github.com/ankitrgadiya/docker-cgit/blob/master/debian-apache/Dockerfile
+################################################################################
+FROM debian:latest
+
+# Install packages
+RUN apt-get update && apt-get install \
+		git \
+		cgit \
+		apache2 \
+		highlight \
+		-y
+
+# Copy configurations
+COPY config/cgitrc /etc/cgitrc
+COPY config/apache.conf /etc/apache2/sites-available/git.conf
+
+# Enable configuration
+RUN a2dissite 000-default.conf && a2ensite git.conf
+RUN a2enmod cgi
+RUN a2disconf cgit
+
+# Server
+EXPOSE 80
+CMD ["apachectl", "-DFOREGROUND"]
 
 # This adds the Osmocom specific syntax highlighting + redmine/gerrit integration
 
@@ -10,6 +33,9 @@
 
 RUN	mkdir -p /usr/local/lib/cgit/filters
 
+# osmocom additions
+################################################################################
+
 COPY	osmo-commit-filter.py /usr/local/lib/cgit/filters/osmo-commit-filter.py
 COPY	syntax-highlighting.py /usr/local/lib/cgit/filters/syntax-highlighting.py
 
diff --git a/cgit/config/apache.conf b/cgit/config/apache.conf
new file mode 100644
index 0000000..e6ad722
--- /dev/null
+++ b/cgit/config/apache.conf
@@ -0,0 +1,18 @@
+<VirtualHost *:80>
+	ServerName locahost
+	# ServerAdmin webmaster at localhost
+
+	DocumentRoot "/usr/share/cgit"
+
+	<Directory "/usr/lib/cgit/">
+		AllowOverride None
+		Require all granted
+	</Directory>
+
+	Alias /cgit-css "/usr/share/cgit/"
+	ScriptAlias / "/usr/lib/cgit/cgit.cgi"
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/cgit/config/cgitrc b/cgit/config/cgitrc
new file mode 100644
index 0000000..1acc934
--- /dev/null
+++ b/cgit/config/cgitrc
@@ -0,0 +1,35 @@
+# CGIT config
+virtual-root=/
+
+css=/cgit-css/cgit.css
+logo=/cgit-css/cgit.png
+footer=
+
+source-filter=/usr/lib/cgit/filters/syntax-highlighting.sh
+root-title=Repositories
+root-desc=
+noplainemail=1
+
+# clone-prefix=http://example.com
+
+# Enable snapshots
+snapshots=tar.gz zip
+
+# Disable owner index
+enable-index-owner=0
+
+mimetype.git=image/git
+mimetype.html=text/html
+mimetype.jpg=image/jpeg
+mimetype.jpeg=image/jpeg
+mimetype.pdf=application/pdf
+mimetype.png=image/png
+mimetype.svg=image/svg+xml
+
+# Caching
+cache-dynamic-ttl=60
+cache-static-ttl=44640
+cache-root-ttl=6
+cache-repo-ttl=120
+
+scan-path=/git

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20416
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ifa98f77c24298265e39313b679944d649e25ddde
Gerrit-Change-Number: 20416
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201003/79386c04/attachment.htm>