Updated gitweb configs

diff --git a/compose.yml b/compose.yml
index 133959681938188542ea44f9a1649e33c6d49092..acc10ac3c0f784a20bbaf7702111baad01927dbe 100644 (file)
--- a/compose.yml
+++ b/compose.yml
@@ -61,24 +61,27 @@ services:
       - NET_ADMIN
     restart: always
 
-  repos:
-    container_name: repos
+  gitolite:
+    container_name: gitolite
     image: jgiannuzzi/gitolite
     env_file: ./git/env
     volumes:
-      - ./git/.gitolite.rc:/etc/gitolite/gitolite.rc:ro
-      - ./git/:/var/lib/git/
-      - ./git/.ssh/keys/:/etc/ssh/keys/
+      - ./git/gitolite.rc:/etc/gitolite/gitolite.rc:ro
+      - ./git/ssh/keys/:/etc/ssh/keys/
+      - ./git/repos/:/var/lib/git/repositories/
+      - ./git/projects.list:/var/lib/git/projects.list
     ports:
       - "22:22"
 
   gitweb:
     container_name: gitweb
-    image: rockstorm/gitweb
+    image: moncheeta/gitweb
     depends_on:
-      - repos
+      - gitolite
     volumes:
-      - ./git/:/srv/git/:ro
+      - ./git/gitweb.conf:/etc/gitweb.conf:ro
+      - ./git/repos/:/srv/git/repositories/:ro
+      - ./git/projects.list:/srv/git/projects.list:ro
     expose:
       - "80"
     networks:

diff --git a/git/.gitignore b/git/.gitignore
index f2bfc382e1c9c06ac39a3854bea99081f72b3833..524813ec129537f06cf8600a3d7b08805057d6b6 100644 (file)
--- a/git/.gitignore
+++ b/git/.gitignore
@@ -1,4 +1,3 @@
-/.gitolite
+/ssh/
+/repos/
 /projects.list
-/.ssh/
-/repositories/

diff --git a/git/Dockerfile b/git/Dockerfile
new file mode 100644 (file)
index 0000000..1f84679
--- /dev/null
+++ b/git/Dockerfile
@@ -0,0 +1,4 @@
+FROM rockstorm/gitweb
+
+RUN    apk --no-cache --update add \
+       highlight

diff --git a/git/.gitolite.rc b/git/gitolite.rc
similarity index 100%
rename from git/.gitolite.rc
rename to git/gitolite.rc

diff --git a/git/gitweb.conf b/git/gitweb.conf
new file mode 100644 (file)
index 0000000..2e09b9d
--- /dev/null
+++ b/git/gitweb.conf
@@ -0,0 +1,6 @@
+our $site_name = "prime8.dev >> repos";
+
+our $project_root = "/srv/git/repositories/";
+our $projects_list = "/srv/git/projects.list";
+
+$feature{"highlight"}{"default"} = [1];