Update images to more maintained ones

diff --git a/compose.yml b/compose.yml
index 20a9a7080d9a6eae7756011c2b221db363e6f7b3..53535856aca2b2d239b882cb3ae035a9af1c1909 100644 (file)
--- a/compose.yml
+++ b/compose.yml
@@ -63,20 +63,21 @@ services:
 
   repos:
     container_name: repos
-    image: jgiannuzzi/gitolite
+    image: elsdoerfer/gitolite
     env_file: ./git/env
     volumes:
-      - ./git/:/var/lib/git/
+      - ./git/repos/:/home/git/repositories/
+      - ./git/ssh/:/etc/ssh/
     ports:
       - "22:22"
 
   gitweb:
     container_name: gitweb
-    image: mlan/gitweb
+    image: rockstorm/gitweb
     depends_on:
       - repos
     volumes:
-      - ./git/:/var/lib/git/:ro
+      - ./git/repos/:/srv/git/:ro
     expose:
       - "80"
     networks:

diff --git a/git/.gitignore b/git/.gitignore
index 83acbaba7770818cd761e7b380cedf42d0e7436e..f7a121f933a87e8d383e8fce2c7af75391c1d566 100644 (file)
--- a/git/.gitignore
+++ b/git/.gitignore
@@ -1,4 +1,2 @@
-/.gitolite
-/.gitolite.rc
-/.ssh/
-/repositories/
+/ssh/*
+/repos/*

diff --git a/git/env b/git/env
index 915a1079db5980283c1b0105ac14eb4abcd72817..81dfe6eeff1fad594f1c198cd1da033cf7261c26 100644 (file)
--- a/git/env
+++ b/git/env
@@ -1,2 +1 @@
-SSH_KEY_NAME="moncheeta"
 SSH_KEY="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCbhuxFr7zO5fcvLMP8dt1SQAQ1uEw0rJCeFI7o5JFULA4w1dB9yc9FotnVwxRroXpBHxmH7jTFsuCXjHj5CQFDnDb0Vq6iVrtj4WEWBg4N+juA347pmKPLVnyEofpjIHHFSj4b4U/ozk/xEfekNrAxrjhMYcREXQsMI168MNupCEqrqWAyDygokKTicwEX0YNCX2ig5Obs9dUj/nbaWL9/kWgOejuAzQd9guncC0r6Oc8yce+FHjqFpd6tApCLF1IN0KNBfj2k24WEU9JuovwwZ+mbFvKTeZF0O9aXlvuVlrKIS6yfn6Srh22GQJMEhcDMypO8t3AnsKli6vM6J7iUWJuksLf9fOty2ZfJghMOlUHYVcAaXPn2ESReNjSJfHtNOsvIlXsXMznFnTK2WL0115aF0th9Ivxn+t/9onOj6iQALgIYiRSM9tg7zKu1+vglZmU1CKsdzXGGP5P/UVeQFkxjUsYEjEebInfbIl6I246HpLLQIwkqGm/21Ge5hLAEiKYtasoFyRqcc1pWhwj96TMw096pWGrZg89CO8P0U9INhWfHbogT4c07reZpZuSH745thufYQ0CtgJQOlCTQdyilHyZL3d6yDoITNycqMIklnNPRDB9Po5tdD6qzDg7p//OurYx3d5FkhMby6H8/B/79E0+ASh3so5TRP6hiOw== damian@prime8.dev"